From 714583336df1368114c76406570a33837faf481f Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Thu, 20 Mar 2008 12:40:56 +0000
Subject: - Update to 2.2 - Use bsd.pyqt.mk

Submitted by:	Danny Pansters <danny@ricin.com> (maintainer via private mail)
---
 devel/py-qt4-qscintilla2/Makefile | 23 +++++++++++++----------
 devel/py-qt4-qscintilla2/distinfo |  6 +++---
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'devel/py-qt4-qscintilla2')

diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index fea98d69d748..d44256c68143 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -5,22 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	qscintilla2
-PORTVERSION=	2.1
+PORTVERSION=	${QSCI2_VERSION}
 PORTREVISION=	# zero
 PORTEPOCH=	1
+
 CATEGORIES=	devel
-MASTER_SITES=	http://www.riverbankcomputing.com/Downloads/QScintilla2/ \
-		http://freebsd.ricin.com/ports/distfiles/
+MASTER_SITES=	${MASTER_SITES_QSCI2}
+
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
-DISTNAME=	QScintilla-1.73-gpl-${PORTVERSION}
+DISTNAME=	${QSCI2_DISTNAME}
 
-MAINTAINER=	danny@ricin.com
+MAINTAINER=	${PYQT_MAINTAINER}
 COMMENT=	Python bindings for QScintilla2 (PyQt4), QSci module
 
-LIB_DEPENDS=	qscintilla2.2:${PORTSDIR}/devel/qscintilla2
-BUILD_DEPENDS=	${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip \
-		${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
+LIB_DEPENDS=	qscintilla2.3:${PORTSDIR}/devel/qscintilla2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 HAS_CONFIGURE=	yes
@@ -35,10 +36,12 @@ OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 ARGS=		-p 4 -d ${PYTHON_SITELIBDIR}/PyQt4
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
-PYVER=		`python -c "import sys; print sys.version[:3]"`
 
+.include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.pre.mk>
 
+PYVER!=		${PYTHON_CMD} -c "import sys; print sys.version[:3]"
+
 .if defined(WITH_DEBUG)
 ARGS+=		-u
 .endif
diff --git a/devel/py-qt4-qscintilla2/distinfo b/devel/py-qt4-qscintilla2/distinfo
index 5c34b20dfe46..08d8cdb3e0d0 100644
--- a/devel/py-qt4-qscintilla2/distinfo
+++ b/devel/py-qt4-qscintilla2/distinfo
@@ -1,3 +1,3 @@
-MD5 (QScintilla-1.73-gpl-2.1.tar.gz) = 13049717628391ca4db43f7ede0eeeb4
-SHA256 (QScintilla-1.73-gpl-2.1.tar.gz) = 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86
-SIZE (QScintilla-1.73-gpl-2.1.tar.gz) = 1866929
+MD5 (QScintilla-gpl-2.2.tar.gz) = a6056c444494f3f849020d241f86c286
+SHA256 (QScintilla-gpl-2.2.tar.gz) = 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
+SIZE (QScintilla-gpl-2.2.tar.gz) = 1873664
-- 
cgit