KDE/FreeBSD team presents:

 SIP 4.14.3
 QScintilla 2.7
 PyQt 4.9.6

The area51 repository features commits by jhale and myself.

Changes:
- Trim Makefile header
- Convert to new option framework

4 files changed, 31 insertions, 50 deletions

diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile
index e15c29a556ec..1435dec56ced 100644
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	py-qt4-multimedia
-# Date created:		2010-01-10
-# Whom:			Dima Panov <fluffy@FreeBSD.org>
-#
+# Created by: Dima Panov <fluffy@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	multimedia
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@@ -24,46 +19,42 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	multimedia qmake_build
 
-OPTIONS=	API	"Install Phonon API for QScintilla2" on
+OPTIONS_DEFINE=	API
+OPTIONS_DEFAULT=API
+API_DESC=	Install QtMultimedia API for QScintilla2
 
-PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
+PATCHDIR=	${.CURDIR}/../../devel/py-qt4-core/files
 OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
-CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
 ARGS=		-b ${PREFIX}/bin \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
 		-q ${QMAKE} \
 		--confirm-license \
 		--sipdir ${SIPDIR} \
-		--enable QtMultimedia
+		--enable QtMultimedia \
+		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 
-.if defined(WITH_DEBUG)
-ARGS+=		--debug --trace
-.endif
-
-.include "../../devel/py-sip/files/bsd.pyqt.mk"
+.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_API)
+.if empty(PORT_OPTIONS:MAPI)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS+=	qscintilla2:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
 
+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
 
-post-configure:
-	${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\
-		-e 's|CC = cc|CC = ${CC}|'\
-		-e 's|CXX = c++|CXX = ${CXX}|'\
-		-e 's|LINK = c++|LINK = ${CXX}|'\
-		${WRKSRC}/QtMultimedia/Makefile
-
 .include <bsd.port.mk>
diff --git a/multimedia/py-qt4-multimedia/pkg-descr b/multimedia/py-qt4-multimedia/pkg-descr
index a90e1638e76f..1b26756197e0 100644
--- a/multimedia/py-qt4-multimedia/pkg-descr
+++ b/multimedia/py-qt4-multimedia/pkg-descr
@@ -1,4 +1,4 @@
-PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+PyQt4 is a set of Python bindings for Digia's Qt4 application framework.
 This package provides the QtMultimedia module.
 
 WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/
diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile
index 21c794444d86..996e06f8eb1a 100644
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	py-qt4-phonon
-# Date created:		2009-02-13
-# Whom:			Max Brazhnikov <makc@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	phonon
 PORTVERSION=	${PYQT4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia devel python
 MASTER_SITES=	${MASTER_SITES_PYQT4}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt4-
@@ -24,46 +18,42 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	phonon qmake_build
 
-OPTIONS=	API	"Install Phonon API for QScintilla2" on
+OPTIONS_DEFINE=	API
+OPTIONS_DEFAULT=API
+API_DESC=	Install Phonon API for QScintilla2
 
-PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
+PATCHDIR=	${.CURDIR}/../../devel/py-qt4-core/files
 OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
-CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
 ARGS=		-b ${PREFIX}/bin \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
 		-q ${QMAKE} \
 		--confirm-license \
 		--sipdir ${SIPDIR} \
-		--enable phonon
+		--enable phonon \
+		CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 
-.if defined(WITH_DEBUG)
-ARGS+=		--debug --trace
-.endif
-
-.include "../../devel/py-sip/files/bsd.pyqt.mk"
+.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_API)
+.if empty(PORT_OPTIONS:MAPI)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
 .else
-LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS+=	qscintilla2:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
 
+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
 
-post-configure:
-	${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\
-		-e 's|CC = cc|CC = ${CC}|'\
-		-e 's|CXX = c++|CXX = ${CXX}|'\
-		-e 's|LINK = c++|LINK = ${CXX}|'\
-		${WRKSRC}/phonon/Makefile
-
 .include <bsd.port.mk>
diff --git a/multimedia/py-qt4-phonon/pkg-descr b/multimedia/py-qt4-phonon/pkg-descr
index 9c9ca1b19169..22c637459aa1 100644
--- a/multimedia/py-qt4-phonon/pkg-descr
+++ b/multimedia/py-qt4-phonon/pkg-descr
@@ -1,4 +1,4 @@
-PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework.
+PyQt4 is a set of Python bindings for Digia's Qt4 application framework.
 This package provides the Phonon module.
 
 WWW:	http://www.riverbankcomputing.co.uk/software/pyqt/