Merge changes from area51 repository (SVN commit 8197 by avilla):

- Remove SIPFILES option, some ports (e.g., pykde4) require the files to be installed. - Remove DEBUG and TRACING options, and merge them under WITH_DEBUG.
svn path=/head/; revision=298789
2012-06-09 00:41:21 +00:00 · 2012-06-09 00:41:21 +00:00 · 99b882c241 · 2021-03-31 03:12:20 +00:00
commit 99b882c241
parent 59cb6c5ffa
41 changed files with 782 additions and 1009 deletions
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@ -24,28 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	sql qmake_build

-OPTIONS=	API		"Install QtSql API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtSql SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtSql API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
+		--enable QtSql
+
+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -54,17 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif
-ARGS+=		--enable QtSql

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/databases/py-qt4-sql/pkg-plist
+++ b/databases/py-qt4-sql/pkg-plist
@ -1,18 +1,18 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtSql.so
-%%SIP%%share/py-sip/QtSql/QtSqlmod.sip
-%%SIP%%share/py-sip/QtSql/qsql.sip
-%%SIP%%share/py-sip/QtSql/qsqldatabase.sip
-%%SIP%%share/py-sip/QtSql/qsqldriver.sip
-%%SIP%%share/py-sip/QtSql/qsqlerror.sip
-%%SIP%%share/py-sip/QtSql/qsqlfield.sip
-%%SIP%%share/py-sip/QtSql/qsqlindex.sip
-%%SIP%%share/py-sip/QtSql/qsqlquery.sip
-%%SIP%%share/py-sip/QtSql/qsqlquerymodel.sip
-%%SIP%%share/py-sip/QtSql/qsqlrecord.sip
-%%SIP%%share/py-sip/QtSql/qsqlrelationaldelegate.sip
-%%SIP%%share/py-sip/QtSql/qsqlrelationaltablemodel.sip
-%%SIP%%share/py-sip/QtSql/qsqlresult.sip
-%%SIP%%share/py-sip/QtSql/qsqltablemodel.sip
+share/py-sip/QtSql/QtSqlmod.sip
+share/py-sip/QtSql/qsql.sip
+share/py-sip/QtSql/qsqldatabase.sip
+share/py-sip/QtSql/qsqldriver.sip
+share/py-sip/QtSql/qsqlerror.sip
+share/py-sip/QtSql/qsqlfield.sip
+share/py-sip/QtSql/qsqlindex.sip
+share/py-sip/QtSql/qsqlquery.sip
+share/py-sip/QtSql/qsqlquerymodel.sip
+share/py-sip/QtSql/qsqlrecord.sip
+share/py-sip/QtSql/qsqlrelationaldelegate.sip
+share/py-sip/QtSql/qsqlrelationaltablemodel.sip
+share/py-sip/QtSql/qsqlresult.sip
+share/py-sip/QtSql/qsqltablemodel.sip
 %%API%%share/qt4/qsci/api/python/QtSql.api
-%%SIP%%@dirrmtry share/py-sip/QtSql
+@dirrmtry share/py-sip/QtSql
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@ -25,29 +25,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	assistantclient qmake_build

-OPTIONS=	API		"Install QtAssistant API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtAssistant SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtAssistant API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtAssistant

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -56,16 +55,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-assistant/pkg-plist
+++ b/devel/py-qt4-assistant/pkg-plist
@ -1,6 +1,6 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtAssistant.so
-%%SIP%%share/py-sip/QtAssistant/QtAssistantmod.sip
-%%SIP%%share/py-sip/QtAssistant/qassistantclient.sip
+share/py-sip/QtAssistant/QtAssistantmod.sip
+share/py-sip/QtAssistant/qassistantclient.sip
 %%API%%share/qt4/qsci/api/python/QtAssistant.api
-%%SIP%%@dirrmtry share/py-sip/QtAssistant
+@dirrmtry share/py-sip/QtAssistant
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@ -24,28 +24,27 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	corelib qmake_build moc_build

-OPTIONS=	API		"Install QtCore API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtCore SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtCore API for QScintilla2" on

 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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtCore

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -54,16 +53,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 post-extract:
 	rm -rf ${WRKSRC}/pyuic/uic/port_v3
--- a/devel/py-qt4-core/pkg-plist
+++ b/devel/py-qt4-core/pkg-plist
@ -99,102 +99,102 @@ bin/pyuic4
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.py
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc
 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo
-%%SIP%%share/py-sip/QtCore/QtCoremod.sip
-%%SIP%%share/py-sip/QtCore/qabstractanimation.sip
-%%SIP%%share/py-sip/QtCore/qabstracteventdispatcher.sip
-%%SIP%%share/py-sip/QtCore/qabstractfileengine.sip
-%%SIP%%share/py-sip/QtCore/qabstractitemmodel.sip
-%%SIP%%share/py-sip/QtCore/qabstractstate.sip
-%%SIP%%share/py-sip/QtCore/qabstracttransition.sip
-%%SIP%%share/py-sip/QtCore/qanimationgroup.sip
-%%SIP%%share/py-sip/QtCore/qbasictimer.sip
-%%SIP%%share/py-sip/QtCore/qbitarray.sip
-%%SIP%%share/py-sip/QtCore/qbuffer.sip
-%%SIP%%share/py-sip/QtCore/qbytearray.sip
-%%SIP%%share/py-sip/QtCore/qbytearraymatcher.sip
-%%SIP%%share/py-sip/QtCore/qchar.sip
-%%SIP%%share/py-sip/QtCore/qcoreapplication.sip
-%%SIP%%share/py-sip/QtCore/qcoreevent.sip
-%%SIP%%share/py-sip/QtCore/qcryptographichash.sip
-%%SIP%%share/py-sip/QtCore/qdatastream.sip
-%%SIP%%share/py-sip/QtCore/qdatetime.sip
-%%SIP%%share/py-sip/QtCore/qdir.sip
-%%SIP%%share/py-sip/QtCore/qdiriterator.sip
-%%SIP%%share/py-sip/QtCore/qeasingcurve.sip
-%%SIP%%share/py-sip/QtCore/qelapsedtimer.sip
-%%SIP%%share/py-sip/QtCore/qeventloop.sip
-%%SIP%%share/py-sip/QtCore/qeventtransition.sip
-%%SIP%%share/py-sip/QtCore/qfile.sip
-%%SIP%%share/py-sip/QtCore/qfileinfo.sip
-%%SIP%%share/py-sip/QtCore/qfilesystemwatcher.sip
-%%SIP%%share/py-sip/QtCore/qfinalstate.sip
-%%SIP%%share/py-sip/QtCore/qfsfileengine.sip
-%%SIP%%share/py-sip/QtCore/qglobal.sip
-%%SIP%%share/py-sip/QtCore/qhash.sip
-%%SIP%%share/py-sip/QtCore/qhistorystate.sip
-%%SIP%%share/py-sip/QtCore/qiodevice.sip
-%%SIP%%share/py-sip/QtCore/qlibrary.sip
-%%SIP%%share/py-sip/QtCore/qlibraryinfo.sip
-%%SIP%%share/py-sip/QtCore/qline.sip
-%%SIP%%share/py-sip/QtCore/qlist.sip
-%%SIP%%share/py-sip/QtCore/qlocale.sip
-%%SIP%%share/py-sip/QtCore/qmap.sip
-%%SIP%%share/py-sip/QtCore/qmargins.sip
-%%SIP%%share/py-sip/QtCore/qmetaobject.sip
-%%SIP%%share/py-sip/QtCore/qmetatype.sip
-%%SIP%%share/py-sip/QtCore/qmimedata.sip
-%%SIP%%share/py-sip/QtCore/qmutex.sip
-%%SIP%%share/py-sip/QtCore/qnamespace.sip
-%%SIP%%share/py-sip/QtCore/qnumeric.sip
-%%SIP%%share/py-sip/QtCore/qobject.sip
-%%SIP%%share/py-sip/QtCore/qobjectcleanuphandler.sip
-%%SIP%%share/py-sip/QtCore/qobjectdefs.sip
-%%SIP%%share/py-sip/QtCore/qpair.sip
-%%SIP%%share/py-sip/QtCore/qparallelanimationgroup.sip
-%%SIP%%share/py-sip/QtCore/qpauseanimation.sip
-%%SIP%%share/py-sip/QtCore/qpluginloader.sip
-%%SIP%%share/py-sip/QtCore/qpoint.sip
-%%SIP%%share/py-sip/QtCore/qprocess.sip
-%%SIP%%share/py-sip/QtCore/qpropertyanimation.sip
-%%SIP%%share/py-sip/QtCore/qpynullvariant.sip
-%%SIP%%share/py-sip/QtCore/qreadwritelock.sip
-%%SIP%%share/py-sip/QtCore/qrect.sip
-%%SIP%%share/py-sip/QtCore/qregexp.sip
-%%SIP%%share/py-sip/QtCore/qresource.sip
-%%SIP%%share/py-sip/QtCore/qrunnable.sip
-%%SIP%%share/py-sip/QtCore/qsemaphore.sip
-%%SIP%%share/py-sip/QtCore/qsequentialanimationgroup.sip
-%%SIP%%share/py-sip/QtCore/qset.sip
-%%SIP%%share/py-sip/QtCore/qsettings.sip
-%%SIP%%share/py-sip/QtCore/qsharedmemory.sip
-%%SIP%%share/py-sip/QtCore/qsignalmapper.sip
-%%SIP%%share/py-sip/QtCore/qsignaltransition.sip
-%%SIP%%share/py-sip/QtCore/qsize.sip
-%%SIP%%share/py-sip/QtCore/qsocketnotifier.sip
-%%SIP%%share/py-sip/QtCore/qstate.sip
-%%SIP%%share/py-sip/QtCore/qstatemachine.sip
-%%SIP%%share/py-sip/QtCore/qstring.sip
-%%SIP%%share/py-sip/QtCore/qstringlist.sip
-%%SIP%%share/py-sip/QtCore/qstringmatcher.sip
-%%SIP%%share/py-sip/QtCore/qsystemsemaphore.sip
-%%SIP%%share/py-sip/QtCore/qtemporaryfile.sip
-%%SIP%%share/py-sip/QtCore/qtextboundaryfinder.sip
-%%SIP%%share/py-sip/QtCore/qtextcodec.sip
-%%SIP%%share/py-sip/QtCore/qtextstream.sip
-%%SIP%%share/py-sip/QtCore/qthread.sip
-%%SIP%%share/py-sip/QtCore/qthreadpool.sip
-%%SIP%%share/py-sip/QtCore/qtimeline.sip
-%%SIP%%share/py-sip/QtCore/qtimer.sip
-%%SIP%%share/py-sip/QtCore/qtranslator.sip
-%%SIP%%share/py-sip/QtCore/qurl.sip
-%%SIP%%share/py-sip/QtCore/quuid.sip
-%%SIP%%share/py-sip/QtCore/qvariant.sip
-%%SIP%%share/py-sip/QtCore/qvariantanimation.sip
-%%SIP%%share/py-sip/QtCore/qvector.sip
-%%SIP%%share/py-sip/QtCore/qwaitcondition.sip
-%%SIP%%share/py-sip/QtCore/qxmlstream.sip
+share/py-sip/QtCore/QtCoremod.sip
+share/py-sip/QtCore/qabstractanimation.sip
+share/py-sip/QtCore/qabstracteventdispatcher.sip
+share/py-sip/QtCore/qabstractfileengine.sip
+share/py-sip/QtCore/qabstractitemmodel.sip
+share/py-sip/QtCore/qabstractstate.sip
+share/py-sip/QtCore/qabstracttransition.sip
+share/py-sip/QtCore/qanimationgroup.sip
+share/py-sip/QtCore/qbasictimer.sip
+share/py-sip/QtCore/qbitarray.sip
+share/py-sip/QtCore/qbuffer.sip
+share/py-sip/QtCore/qbytearray.sip
+share/py-sip/QtCore/qbytearraymatcher.sip
+share/py-sip/QtCore/qchar.sip
+share/py-sip/QtCore/qcoreapplication.sip
+share/py-sip/QtCore/qcoreevent.sip
+share/py-sip/QtCore/qcryptographichash.sip
+share/py-sip/QtCore/qdatastream.sip
+share/py-sip/QtCore/qdatetime.sip
+share/py-sip/QtCore/qdir.sip
+share/py-sip/QtCore/qdiriterator.sip
+share/py-sip/QtCore/qeasingcurve.sip
+share/py-sip/QtCore/qelapsedtimer.sip
+share/py-sip/QtCore/qeventloop.sip
+share/py-sip/QtCore/qeventtransition.sip
+share/py-sip/QtCore/qfile.sip
+share/py-sip/QtCore/qfileinfo.sip
+share/py-sip/QtCore/qfilesystemwatcher.sip
+share/py-sip/QtCore/qfinalstate.sip
+share/py-sip/QtCore/qfsfileengine.sip
+share/py-sip/QtCore/qglobal.sip
+share/py-sip/QtCore/qhash.sip
+share/py-sip/QtCore/qhistorystate.sip
+share/py-sip/QtCore/qiodevice.sip
+share/py-sip/QtCore/qlibrary.sip
+share/py-sip/QtCore/qlibraryinfo.sip
+share/py-sip/QtCore/qline.sip
+share/py-sip/QtCore/qlist.sip
+share/py-sip/QtCore/qlocale.sip
+share/py-sip/QtCore/qmap.sip
+share/py-sip/QtCore/qmargins.sip
+share/py-sip/QtCore/qmetaobject.sip
+share/py-sip/QtCore/qmetatype.sip
+share/py-sip/QtCore/qmimedata.sip
+share/py-sip/QtCore/qmutex.sip
+share/py-sip/QtCore/qnamespace.sip
+share/py-sip/QtCore/qnumeric.sip
+share/py-sip/QtCore/qobject.sip
+share/py-sip/QtCore/qobjectcleanuphandler.sip
+share/py-sip/QtCore/qobjectdefs.sip
+share/py-sip/QtCore/qpair.sip
+share/py-sip/QtCore/qparallelanimationgroup.sip
+share/py-sip/QtCore/qpauseanimation.sip
+share/py-sip/QtCore/qpluginloader.sip
+share/py-sip/QtCore/qpoint.sip
+share/py-sip/QtCore/qprocess.sip
+share/py-sip/QtCore/qpropertyanimation.sip
+share/py-sip/QtCore/qpynullvariant.sip
+share/py-sip/QtCore/qreadwritelock.sip
+share/py-sip/QtCore/qrect.sip
+share/py-sip/QtCore/qregexp.sip
+share/py-sip/QtCore/qresource.sip
+share/py-sip/QtCore/qrunnable.sip
+share/py-sip/QtCore/qsemaphore.sip
+share/py-sip/QtCore/qsequentialanimationgroup.sip
+share/py-sip/QtCore/qset.sip
+share/py-sip/QtCore/qsettings.sip
+share/py-sip/QtCore/qsharedmemory.sip
+share/py-sip/QtCore/qsignalmapper.sip
+share/py-sip/QtCore/qsignaltransition.sip
+share/py-sip/QtCore/qsize.sip
+share/py-sip/QtCore/qsocketnotifier.sip
+share/py-sip/QtCore/qstate.sip
+share/py-sip/QtCore/qstatemachine.sip
+share/py-sip/QtCore/qstring.sip
+share/py-sip/QtCore/qstringlist.sip
+share/py-sip/QtCore/qstringmatcher.sip
+share/py-sip/QtCore/qsystemsemaphore.sip
+share/py-sip/QtCore/qtemporaryfile.sip
+share/py-sip/QtCore/qtextboundaryfinder.sip
+share/py-sip/QtCore/qtextcodec.sip
+share/py-sip/QtCore/qtextstream.sip
+share/py-sip/QtCore/qthread.sip
+share/py-sip/QtCore/qthreadpool.sip
+share/py-sip/QtCore/qtimeline.sip
+share/py-sip/QtCore/qtimer.sip
+share/py-sip/QtCore/qtranslator.sip
+share/py-sip/QtCore/qurl.sip
+share/py-sip/QtCore/quuid.sip
+share/py-sip/QtCore/qvariant.sip
+share/py-sip/QtCore/qvariantanimation.sip
+share/py-sip/QtCore/qvector.sip
+share/py-sip/QtCore/qwaitcondition.sip
+share/py-sip/QtCore/qxmlstream.sip
 %%API%%share/qt4/qsci/api/python/QtCore.api
-%%SIP%%@dirrm share/py-sip/QtCore
+@dirrm share/py-sip/QtCore
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2
@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@ -30,29 +30,22 @@ USE_XORG=	x11 xext
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
 INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}

-OPTIONS=	DEBUG	"Enable debugging in generated code" off \
-		TRACING	"Enable tracing in generated code" off
-
 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
 OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
-ARGS=		-b ${PREFIX}/bin\
-		-d ${PYTHONPREFIX_SITELIBDIR}\
-		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
-		-q ${QMAKE}\
-		--confirm-license\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
 		--enable QtCore

-.include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.options.mk>
-
 .if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
+ARGS+=		--debug --trace
 .endif

+.include "../py-sip/files/bsd.pyqt.mk"
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	declarative qmake_build moc_build

-OPTIONS=	API		"Install QtDeclarative API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtDeclarative SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtDeclarative API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtDeclarative

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-declarative/pkg-plist
+++ b/devel/py-qt4-declarative/pkg-plist
@ -1,23 +1,23 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtDeclarative.so
-%%SIP%%share/py-sip/QtDeclarative/QtDeclarativemod.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativecomponent.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativecontext.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeengine.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeerror.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeexpression.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeextensionplugin.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeimageprovider.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeitem.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativelist.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeparserstatus.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeproperty.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativepropertymap.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativepropertyvaluesource.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativescriptstring.sip
-%%SIP%%share/py-sip/QtDeclarative/qdeclarativeview.sip
-%%SIP%%share/py-sip/QtDeclarative/qpydeclarativelistproperty.sip
-%%SIP%%share/py-sip/QtDeclarative/qpydeclarativepropertyvaluesource.sip
+share/py-sip/QtDeclarative/QtDeclarativemod.sip
+share/py-sip/QtDeclarative/qdeclarativecomponent.sip
+share/py-sip/QtDeclarative/qdeclarativecontext.sip
+share/py-sip/QtDeclarative/qdeclarativeengine.sip
+share/py-sip/QtDeclarative/qdeclarativeerror.sip
+share/py-sip/QtDeclarative/qdeclarativeexpression.sip
+share/py-sip/QtDeclarative/qdeclarativeextensionplugin.sip
+share/py-sip/QtDeclarative/qdeclarativeimageprovider.sip
+share/py-sip/QtDeclarative/qdeclarativeitem.sip
+share/py-sip/QtDeclarative/qdeclarativelist.sip
+share/py-sip/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip
+share/py-sip/QtDeclarative/qdeclarativeparserstatus.sip
+share/py-sip/QtDeclarative/qdeclarativeproperty.sip
+share/py-sip/QtDeclarative/qdeclarativepropertymap.sip
+share/py-sip/QtDeclarative/qdeclarativepropertyvaluesource.sip
+share/py-sip/QtDeclarative/qdeclarativescriptstring.sip
+share/py-sip/QtDeclarative/qdeclarativeview.sip
+share/py-sip/QtDeclarative/qpydeclarativelistproperty.sip
+share/py-sip/QtDeclarative/qpydeclarativepropertyvaluesource.sip
 %%API%%share/qt4/qsci/api/python/QtDeclarative.api
-%%SIP%%@dirrmtry share/py-sip/QtDeclarative
+@dirrmtry share/py-sip/QtDeclarative
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@ -26,30 +26,29 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	gui xml designer moc_build qmake_build

-OPTIONS=	API		"Install QtDesigner API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtDesigner SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtDesigner API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
-		--no-designer-plugin\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
+		--no-designer-plugin \
 		--enable QtDesigner

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -58,16 +57,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-designer/pkg-plist
+++ b/devel/py-qt4-designer/pkg-plist
@ -1,29 +1,29 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtDesigner.so
-%%SIP%%share/py-sip/QtDesigner/QtDesignermod.sip
-%%SIP%%share/py-sip/QtDesigner/abstractactioneditor.sip
-%%SIP%%share/py-sip/QtDesigner/abstractformbuilder.sip
-%%SIP%%share/py-sip/QtDesigner/abstractformeditor.sip
-%%SIP%%share/py-sip/QtDesigner/abstractformwindow.sip
-%%SIP%%share/py-sip/QtDesigner/abstractformwindowcursor.sip
-%%SIP%%share/py-sip/QtDesigner/abstractformwindowmanager.sip
-%%SIP%%share/py-sip/QtDesigner/abstractobjectinspector.sip
-%%SIP%%share/py-sip/QtDesigner/abstractpropertyeditor.sip
-%%SIP%%share/py-sip/QtDesigner/abstractwidgetbox.sip
-%%SIP%%share/py-sip/QtDesigner/container.sip
-%%SIP%%share/py-sip/QtDesigner/customwidget.sip
-%%SIP%%share/py-sip/QtDesigner/default_extensionfactory.sip
-%%SIP%%share/py-sip/QtDesigner/extension.sip
-%%SIP%%share/py-sip/QtDesigner/formbuilder.sip
-%%SIP%%share/py-sip/QtDesigner/membersheet.sip
-%%SIP%%share/py-sip/QtDesigner/propertysheet.sip
-%%SIP%%share/py-sip/QtDesigner/qextensionmanager.sip
-%%SIP%%share/py-sip/QtDesigner/qpydesignercontainerextension.sip
-%%SIP%%share/py-sip/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
-%%SIP%%share/py-sip/QtDesigner/qpydesignercustomwidgetplugin.sip
-%%SIP%%share/py-sip/QtDesigner/qpydesignermembersheetextension.sip
-%%SIP%%share/py-sip/QtDesigner/qpydesignerpropertysheetextension.sip
-%%SIP%%share/py-sip/QtDesigner/qpydesignertaskmenuextension.sip
-%%SIP%%share/py-sip/QtDesigner/taskmenu.sip
+share/py-sip/QtDesigner/QtDesignermod.sip
+share/py-sip/QtDesigner/abstractactioneditor.sip
+share/py-sip/QtDesigner/abstractformbuilder.sip
+share/py-sip/QtDesigner/abstractformeditor.sip
+share/py-sip/QtDesigner/abstractformwindow.sip
+share/py-sip/QtDesigner/abstractformwindowcursor.sip
+share/py-sip/QtDesigner/abstractformwindowmanager.sip
+share/py-sip/QtDesigner/abstractobjectinspector.sip
+share/py-sip/QtDesigner/abstractpropertyeditor.sip
+share/py-sip/QtDesigner/abstractwidgetbox.sip
+share/py-sip/QtDesigner/container.sip
+share/py-sip/QtDesigner/customwidget.sip
+share/py-sip/QtDesigner/default_extensionfactory.sip
+share/py-sip/QtDesigner/extension.sip
+share/py-sip/QtDesigner/formbuilder.sip
+share/py-sip/QtDesigner/membersheet.sip
+share/py-sip/QtDesigner/propertysheet.sip
+share/py-sip/QtDesigner/qextensionmanager.sip
+share/py-sip/QtDesigner/qpydesignercontainerextension.sip
+share/py-sip/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip
+share/py-sip/QtDesigner/qpydesignercustomwidgetplugin.sip
+share/py-sip/QtDesigner/qpydesignermembersheetextension.sip
+share/py-sip/QtDesigner/qpydesignerpropertysheetextension.sip
+share/py-sip/QtDesigner/qpydesignertaskmenuextension.sip
+share/py-sip/QtDesigner/taskmenu.sip
 %%API%%share/qt4/qsci/api/python/QtDesigner.api
-%%SIP%%@dirrm share/py-sip/QtDesigner
+@dirrm share/py-sip/QtDesigner
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@ -27,29 +27,22 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	gui xml designer moc_build qmake_build

-OPTIONS=	DEBUG		"Enable debugging in generated code" off \
-		TRACING		"Enable tracing in generated code" off
-
 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
 OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
-ARGS=		-b ${PREFIX}/bin\
-		-d ${PYTHONPREFIX_SITELIBDIR}\
-		-p ${PREFIX}/${QT_PLUGINDIR_REL}\
-		-q ${QMAKE}\
-		--confirm-license\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
 		--enable QtDesigner

-.include "../py-sip/files/bsd.pyqt.mk"
-.include <bsd.port.options.mk>
-
 .if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
+ARGS+=		--debug --trace
 .endif

+.include "../py-sip/files/bsd.pyqt.mk"
+
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
 		${PYTHON_CMD} configure.py ${ARGS}
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	help qmake_build

-OPTIONS=	API		"Install QtHelp API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtHelp SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtHelp API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtHelp

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-help/pkg-plist
+++ b/devel/py-qt4-help/pkg-plist
@ -1,12 +1,12 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtHelp.so
-%%SIP%%share/py-sip/QtHelp/QtHelpmod.sip
-%%SIP%%share/py-sip/QtHelp/qhelpcontentwidget.sip
-%%SIP%%share/py-sip/QtHelp/qhelpengine.sip
-%%SIP%%share/py-sip/QtHelp/qhelpenginecore.sip
-%%SIP%%share/py-sip/QtHelp/qhelpindexwidget.sip
-%%SIP%%share/py-sip/QtHelp/qhelpsearchengine.sip
-%%SIP%%share/py-sip/QtHelp/qhelpsearchquerywidget.sip
-%%SIP%%share/py-sip/QtHelp/qhelpsearchresultwidget.sip
+share/py-sip/QtHelp/QtHelpmod.sip
+share/py-sip/QtHelp/qhelpcontentwidget.sip
+share/py-sip/QtHelp/qhelpengine.sip
+share/py-sip/QtHelp/qhelpenginecore.sip
+share/py-sip/QtHelp/qhelpindexwidget.sip
+share/py-sip/QtHelp/qhelpsearchengine.sip
+share/py-sip/QtHelp/qhelpsearchquerywidget.sip
+share/py-sip/QtHelp/qhelpsearchresultwidget.sip
 %%API%%share/qt4/qsci/api/python/QtHelp.api
-@dirrm %%SIP%%share/py-sip/QtHelp
+@dirrm share/py-sip/QtHelp
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@ -27,26 +27,24 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	gui

-OPTIONS=	API		"Install binding API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the Qscintilla SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install binding API for QScintilla2" on

 OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
-ARGS=		-p 4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4
+ARGS=		-p 4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR}
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 ALL_TARGET=	#empty

+.if defined(WITH_DEBUG)
+ARGS+=		-u -r
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

 PYVER=		${PYTHON_VER}

-.if defined(WITH_DEBUG)
-ARGS+=		-u
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		-a /dev/null
 PLIST_SUB+=	API="@comment "
@ -54,16 +52,6 @@ PLIST_SUB+=	API="@comment "
 ARGS+=		-a ${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		-v /dev/null
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		-v ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		-r
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-qscintilla2/pkg-plist
+++ b/devel/py-qt4-qscintilla2/pkg-plist
@ -1,54 +1,54 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/Qsci.so
-%%SIP%%share/py-sip/Qsci/qsciabstractapis.sip
-%%SIP%%share/py-sip/Qsci/qsciapis.sip
-%%SIP%%share/py-sip/Qsci/qscicommand.sip
-%%SIP%%share/py-sip/Qsci/qscicommandset.sip
-%%SIP%%share/py-sip/Qsci/qscidocument.sip
-%%SIP%%share/py-sip/Qsci/qscilexer.sip
-%%SIP%%share/py-sip/Qsci/qscilexerbash.sip
-%%SIP%%share/py-sip/Qsci/qscilexerbatch.sip
-%%SIP%%share/py-sip/Qsci/qscilexercmake.sip
-%%SIP%%share/py-sip/Qsci/qscilexercpp.sip
-%%SIP%%share/py-sip/Qsci/qscilexercsharp.sip
-%%SIP%%share/py-sip/Qsci/qscilexercss.sip
-%%SIP%%share/py-sip/Qsci/qscilexercustom.sip
-%%SIP%%share/py-sip/Qsci/qscilexerd.sip
-%%SIP%%share/py-sip/Qsci/qscilexerdiff.sip
-%%SIP%%share/py-sip/Qsci/qscilexerfortran.sip
-%%SIP%%share/py-sip/Qsci/qscilexerfortran77.sip
-%%SIP%%share/py-sip/Qsci/qscilexerhtml.sip
-%%SIP%%share/py-sip/Qsci/qscilexeridl.sip
-%%SIP%%share/py-sip/Qsci/qscilexerjava.sip
-%%SIP%%share/py-sip/Qsci/qscilexerjavascript.sip
-%%SIP%%share/py-sip/Qsci/qscilexerlua.sip
-%%SIP%%share/py-sip/Qsci/qscilexermakefile.sip
-%%SIP%%share/py-sip/Qsci/qscilexermatlab.sip
-%%SIP%%share/py-sip/Qsci/qscilexeroctave.sip
-%%SIP%%share/py-sip/Qsci/qscilexerpascal.sip
-%%SIP%%share/py-sip/Qsci/qscilexerperl.sip
-%%SIP%%share/py-sip/Qsci/qscilexerpostscript.sip
-%%SIP%%share/py-sip/Qsci/qscilexerpov.sip
-%%SIP%%share/py-sip/Qsci/qscilexerproperties.sip
-%%SIP%%share/py-sip/Qsci/qscilexerpython.sip
-%%SIP%%share/py-sip/Qsci/qscilexerruby.sip
-%%SIP%%share/py-sip/Qsci/qscilexerspice.sip
-%%SIP%%share/py-sip/Qsci/qscilexersql.sip
-%%SIP%%share/py-sip/Qsci/qscilexertcl.sip
-%%SIP%%share/py-sip/Qsci/qscilexertex.sip
-%%SIP%%share/py-sip/Qsci/qscilexerverilog.sip
-%%SIP%%share/py-sip/Qsci/qscilexervhdl.sip
-%%SIP%%share/py-sip/Qsci/qscilexerxml.sip
-%%SIP%%share/py-sip/Qsci/qscilexeryaml.sip
-%%SIP%%share/py-sip/Qsci/qscimacro.sip
-%%SIP%%share/py-sip/Qsci/qscimod3.sip
-%%SIP%%share/py-sip/Qsci/qscimod4.sip
-%%SIP%%share/py-sip/Qsci/qscimodcommon.sip
-%%SIP%%share/py-sip/Qsci/qsciprinter.sip
-%%SIP%%share/py-sip/Qsci/qsciscintilla.sip
-%%SIP%%share/py-sip/Qsci/qsciscintillabase3.sip
-%%SIP%%share/py-sip/Qsci/qsciscintillabase4.sip
-%%SIP%%share/py-sip/Qsci/qscistyle.sip
-%%SIP%%share/py-sip/Qsci/qscistyledtext.sip
+share/py-sip/Qsci/qsciabstractapis.sip
+share/py-sip/Qsci/qsciapis.sip
+share/py-sip/Qsci/qscicommand.sip
+share/py-sip/Qsci/qscicommandset.sip
+share/py-sip/Qsci/qscidocument.sip
+share/py-sip/Qsci/qscilexer.sip
+share/py-sip/Qsci/qscilexerbash.sip
+share/py-sip/Qsci/qscilexerbatch.sip
+share/py-sip/Qsci/qscilexercmake.sip
+share/py-sip/Qsci/qscilexercpp.sip
+share/py-sip/Qsci/qscilexercsharp.sip
+share/py-sip/Qsci/qscilexercss.sip
+share/py-sip/Qsci/qscilexercustom.sip
+share/py-sip/Qsci/qscilexerd.sip
+share/py-sip/Qsci/qscilexerdiff.sip
+share/py-sip/Qsci/qscilexerfortran.sip
+share/py-sip/Qsci/qscilexerfortran77.sip
+share/py-sip/Qsci/qscilexerhtml.sip
+share/py-sip/Qsci/qscilexeridl.sip
+share/py-sip/Qsci/qscilexerjava.sip
+share/py-sip/Qsci/qscilexerjavascript.sip
+share/py-sip/Qsci/qscilexerlua.sip
+share/py-sip/Qsci/qscilexermakefile.sip
+share/py-sip/Qsci/qscilexermatlab.sip
+share/py-sip/Qsci/qscilexeroctave.sip
+share/py-sip/Qsci/qscilexerpascal.sip
+share/py-sip/Qsci/qscilexerperl.sip
+share/py-sip/Qsci/qscilexerpostscript.sip
+share/py-sip/Qsci/qscilexerpov.sip
+share/py-sip/Qsci/qscilexerproperties.sip
+share/py-sip/Qsci/qscilexerpython.sip
+share/py-sip/Qsci/qscilexerruby.sip
+share/py-sip/Qsci/qscilexerspice.sip
+share/py-sip/Qsci/qscilexersql.sip
+share/py-sip/Qsci/qscilexertcl.sip
+share/py-sip/Qsci/qscilexertex.sip
+share/py-sip/Qsci/qscilexerverilog.sip
+share/py-sip/Qsci/qscilexervhdl.sip
+share/py-sip/Qsci/qscilexerxml.sip
+share/py-sip/Qsci/qscilexeryaml.sip
+share/py-sip/Qsci/qscimacro.sip
+share/py-sip/Qsci/qscimod3.sip
+share/py-sip/Qsci/qscimod4.sip
+share/py-sip/Qsci/qscimodcommon.sip
+share/py-sip/Qsci/qsciprinter.sip
+share/py-sip/Qsci/qsciscintilla.sip
+share/py-sip/Qsci/qsciscintillabase3.sip
+share/py-sip/Qsci/qsciscintillabase4.sip
+share/py-sip/Qsci/qscistyle.sip
+share/py-sip/Qsci/qscistyledtext.sip
 %%API%%share/qt4/qsci/api/python/QScintilla2.api
-%%SIP%%@dirrm share/py-sip/Qsci
+@dirrm share/py-sip/Qsci
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	script qmake_build

-OPTIONS=	API		"Install QtScript API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtScript SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtScript API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtScript

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-script/pkg-plist
+++ b/devel/py-qt4-script/pkg-plist
@ -1,14 +1,14 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtScript.so
-%%SIP%%share/py-sip/QtScript/QtScriptmod.sip
-%%SIP%%share/py-sip/QtScript/qscriptclass.sip
-%%SIP%%share/py-sip/QtScript/qscriptclasspropertyiterator.sip
-%%SIP%%share/py-sip/QtScript/qscriptcontext.sip
-%%SIP%%share/py-sip/QtScript/qscriptcontextinfo.sip
-%%SIP%%share/py-sip/QtScript/qscriptengine.sip
-%%SIP%%share/py-sip/QtScript/qscriptengineagent.sip
-%%SIP%%share/py-sip/QtScript/qscriptstring.sip
-%%SIP%%share/py-sip/QtScript/qscriptvalue.sip
-%%SIP%%share/py-sip/QtScript/qscriptvalueiterator.sip
+share/py-sip/QtScript/QtScriptmod.sip
+share/py-sip/QtScript/qscriptclass.sip
+share/py-sip/QtScript/qscriptclasspropertyiterator.sip
+share/py-sip/QtScript/qscriptcontext.sip
+share/py-sip/QtScript/qscriptcontextinfo.sip
+share/py-sip/QtScript/qscriptengine.sip
+share/py-sip/QtScript/qscriptengineagent.sip
+share/py-sip/QtScript/qscriptstring.sip
+share/py-sip/QtScript/qscriptvalue.sip
+share/py-sip/QtScript/qscriptvalueiterator.sip
 %%API%%share/qt4/qsci/api/python/QtScript.api
-%%SIP%%@dirrm share/py-sip/QtScript
+@dirrm share/py-sip/QtScript
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@ -25,29 +25,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	scripttools qmake_build

-OPTIONS=	API		"Install QtScript API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtScript SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtScript API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtScriptTools

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -56,16 +55,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/devel/py-qt4-scripttools/pkg-plist
+++ b/devel/py-qt4-scripttools/pkg-plist
@ -1,6 +1,6 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtScriptTools.so
-%%SIP%%share/py-sip/QtScriptTools/QtScriptToolsmod.sip
-%%SIP%%share/py-sip/QtScriptTools/qscriptenginedebugger.sip
+share/py-sip/QtScriptTools/QtScriptToolsmod.sip
+share/py-sip/QtScriptTools/qscriptenginedebugger.sip
 %%API%%share/qt4/qsci/api/python/QtScriptTools.api
-%%SIP%%@dirrm share/py-sip/QtScriptTools
+@dirrm share/py-sip/QtScriptTools
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	qtestlib qmake_build

-OPTIONS=	API		"Install QtTest API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtTest SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtTest API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtTest

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
--- a/devel/py-qt4-test/pkg-plist
+++ b/devel/py-qt4-test/pkg-plist
@ -1,9 +1,9 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtTest.so
-%%SIP%%share/py-sip/QtTest/QtTestmod.sip
-%%SIP%%share/py-sip/QtTest/qtestcase.sip
-%%SIP%%share/py-sip/QtTest/qtestkeyboard.sip
-%%SIP%%share/py-sip/QtTest/qtestmouse.sip
-%%SIP%%share/py-sip/QtTest/qtestsystem.sip
+share/py-sip/QtTest/QtTestmod.sip
+share/py-sip/QtTest/qtestcase.sip
+share/py-sip/QtTest/qtestkeyboard.sip
+share/py-sip/QtTest/qtestmouse.sip
+share/py-sip/QtTest/qtestsystem.sip
 %%API%%share/qt4/qsci/api/python/QtTest.api
-%%SIP%%@dirrm share/py-sip/QtTest
+@dirrm share/py-sip/QtTest
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@ -17,23 +17,20 @@ COMMENT=	Python to C and C++ bindings generator

 USE_PYTHON=	2.5+

-OPTIONS=	DEBUG "Build with debugging symbols" off
-
 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\
 		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR}

-PORTDOCS=	*
-
-.include "files/bsd.pyqt.mk"
-.include <bsd.port.options.mk>
-
 .if defined(WITH_DEBUG)
 ARGS+=		-u
 .endif

+PORTDOCS=	*
+
+.include "files/bsd.pyqt.mk"
+
 do-configure:
 	cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${ARGS}

--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	svg qmake_build

-OPTIONS=	API		"Install QtSvg API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtSvg SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtSvg API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtSvg

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/graphics/py-qt4-svg/pkg-plist
+++ b/graphics/py-qt4-svg/pkg-plist
@ -1,9 +1,9 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtSvg.so
-%%SIP%%share/py-sip/QtSvg/QtSvgmod.sip
-%%SIP%%share/py-sip/QtSvg/qgraphicssvgitem.sip
-%%SIP%%share/py-sip/QtSvg/qsvggenerator.sip
-%%SIP%%share/py-sip/QtSvg/qsvgrenderer.sip
-%%SIP%%share/py-sip/QtSvg/qsvgwidget.sip
+share/py-sip/QtSvg/QtSvgmod.sip
+share/py-sip/QtSvg/qgraphicssvgitem.sip
+share/py-sip/QtSvg/qsvggenerator.sip
+share/py-sip/QtSvg/qsvgrenderer.sip
+share/py-sip/QtSvg/qsvgwidget.sip
 %%API%%share/qt4/qsci/api/python/QtSvg.api
-%%SIP%%@dirrm share/py-sip/QtSvg
+@dirrm share/py-sip/QtSvg
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	multimedia qmake_build

-OPTIONS=	API		"Install Phonon API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the Phonon SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install Phonon API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtMultimedia

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/multimedia/py-qt4-multimedia/pkg-plist
+++ b/multimedia/py-qt4-multimedia/pkg-plist
@ -1,14 +1,14 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtMultimedia.so
-%%SIP%%share/py-sip/QtMultimedia/QtMultimediamod.sip
-%%SIP%%share/py-sip/QtMultimedia/qabstractvideobuffer.sip
-%%SIP%%share/py-sip/QtMultimedia/qabstractvideosurface.sip
-%%SIP%%share/py-sip/QtMultimedia/qaudio.sip
-%%SIP%%share/py-sip/QtMultimedia/qaudiodeviceinfo.sip
-%%SIP%%share/py-sip/QtMultimedia/qaudioformat.sip
-%%SIP%%share/py-sip/QtMultimedia/qaudioinput.sip
-%%SIP%%share/py-sip/QtMultimedia/qaudiooutput.sip
-%%SIP%%share/py-sip/QtMultimedia/qvideoframe.sip
-%%SIP%%share/py-sip/QtMultimedia/qvideosurfaceformat.sip
+share/py-sip/QtMultimedia/QtMultimediamod.sip
+share/py-sip/QtMultimedia/qabstractvideobuffer.sip
+share/py-sip/QtMultimedia/qabstractvideosurface.sip
+share/py-sip/QtMultimedia/qaudio.sip
+share/py-sip/QtMultimedia/qaudiodeviceinfo.sip
+share/py-sip/QtMultimedia/qaudioformat.sip
+share/py-sip/QtMultimedia/qaudioinput.sip
+share/py-sip/QtMultimedia/qaudiooutput.sip
+share/py-sip/QtMultimedia/qvideoframe.sip
+share/py-sip/QtMultimedia/qvideosurfaceformat.sip
 %%API%%share/qt4/qsci/api/python/QtMultimedia.api
-%%SIP%%@dirrm share/py-sip/QtMultimedia
+@dirrm share/py-sip/QtMultimedia
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	phonon qmake_build

-OPTIONS=	API		"Install Phonon API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the Phonon SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install Phonon API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable phonon

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/multimedia/py-qt4-phonon/pkg-plist
+++ b/multimedia/py-qt4-phonon/pkg-plist
@ -1,23 +1,23 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/phonon.so
-%%SIP%%share/py-sip/phonon/abstractaudiooutput.sip
-%%SIP%%share/py-sip/phonon/abstractvideooutput.sip
-%%SIP%%share/py-sip/phonon/audiooutput.sip
-%%SIP%%share/py-sip/phonon/backendcapabilities.sip
-%%SIP%%share/py-sip/phonon/effect.sip
-%%SIP%%share/py-sip/phonon/effectparameter.sip
-%%SIP%%share/py-sip/phonon/effectwidget.sip
-%%SIP%%share/py-sip/phonon/mediacontroller.sip
-%%SIP%%share/py-sip/phonon/medianode.sip
-%%SIP%%share/py-sip/phonon/mediaobject.sip
-%%SIP%%share/py-sip/phonon/mediasource.sip
-%%SIP%%share/py-sip/phonon/objectdescription.sip
-%%SIP%%share/py-sip/phonon/path.sip
-%%SIP%%share/py-sip/phonon/phononmod.sip
-%%SIP%%share/py-sip/phonon/phononnamespace.sip
-%%SIP%%share/py-sip/phonon/seekslider.sip
-%%SIP%%share/py-sip/phonon/videoplayer.sip
-%%SIP%%share/py-sip/phonon/videowidget.sip
-%%SIP%%share/py-sip/phonon/volumeslider.sip
+share/py-sip/phonon/abstractaudiooutput.sip
+share/py-sip/phonon/abstractvideooutput.sip
+share/py-sip/phonon/audiooutput.sip
+share/py-sip/phonon/backendcapabilities.sip
+share/py-sip/phonon/effect.sip
+share/py-sip/phonon/effectparameter.sip
+share/py-sip/phonon/effectwidget.sip
+share/py-sip/phonon/mediacontroller.sip
+share/py-sip/phonon/medianode.sip
+share/py-sip/phonon/mediaobject.sip
+share/py-sip/phonon/mediasource.sip
+share/py-sip/phonon/objectdescription.sip
+share/py-sip/phonon/path.sip
+share/py-sip/phonon/phononmod.sip
+share/py-sip/phonon/phononnamespace.sip
+share/py-sip/phonon/seekslider.sip
+share/py-sip/phonon/videoplayer.sip
+share/py-sip/phonon/videowidget.sip
+share/py-sip/phonon/volumeslider.sip
 %%API%%share/qt4/qsci/api/python/phonon.api
-%%SIP%%@dirrm share/py-sip/phonon
+@dirrm share/py-sip/phonon
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	network qmake_build

-OPTIONS=	API		"Install QtNetwork API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtNetwork SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtNetwork API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtNetwork

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/net/py-qt4-network/pkg-plist
+++ b/net/py-qt4-network/pkg-plist
@ -1,37 +1,37 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtNetwork.so
-%%SIP%%share/py-sip/QtNetwork/QtNetworkmod.sip
-%%SIP%%share/py-sip/QtNetwork/qabstractnetworkcache.sip
-%%SIP%%share/py-sip/QtNetwork/qabstractsocket.sip
-%%SIP%%share/py-sip/QtNetwork/qauthenticator.sip
-%%SIP%%share/py-sip/QtNetwork/qftp.sip
-%%SIP%%share/py-sip/QtNetwork/qhostaddress.sip
-%%SIP%%share/py-sip/QtNetwork/qhostinfo.sip
-%%SIP%%share/py-sip/QtNetwork/qhttp.sip
-%%SIP%%share/py-sip/QtNetwork/qhttpmultipart.sip
-%%SIP%%share/py-sip/QtNetwork/qlocalserver.sip
-%%SIP%%share/py-sip/QtNetwork/qlocalsocket.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkaccessmanager.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkconfigmanager.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkconfiguration.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkcookie.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkcookiejar.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkdiskcache.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkinterface.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkproxy.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkreply.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworkrequest.sip
-%%SIP%%share/py-sip/QtNetwork/qnetworksession.sip
-%%SIP%%share/py-sip/QtNetwork/qssl.sip
-%%SIP%%share/py-sip/QtNetwork/qsslcertificate.sip
-%%SIP%%share/py-sip/QtNetwork/qsslcipher.sip
-%%SIP%%share/py-sip/QtNetwork/qsslconfiguration.sip
-%%SIP%%share/py-sip/QtNetwork/qsslerror.sip
-%%SIP%%share/py-sip/QtNetwork/qsslkey.sip
-%%SIP%%share/py-sip/QtNetwork/qsslsocket.sip
-%%SIP%%share/py-sip/QtNetwork/qtcpserver.sip
-%%SIP%%share/py-sip/QtNetwork/qtcpsocket.sip
-%%SIP%%share/py-sip/QtNetwork/qudpsocket.sip
-%%SIP%%share/py-sip/QtNetwork/qurlinfo.sip
+share/py-sip/QtNetwork/QtNetworkmod.sip
+share/py-sip/QtNetwork/qabstractnetworkcache.sip
+share/py-sip/QtNetwork/qabstractsocket.sip
+share/py-sip/QtNetwork/qauthenticator.sip
+share/py-sip/QtNetwork/qftp.sip
+share/py-sip/QtNetwork/qhostaddress.sip
+share/py-sip/QtNetwork/qhostinfo.sip
+share/py-sip/QtNetwork/qhttp.sip
+share/py-sip/QtNetwork/qhttpmultipart.sip
+share/py-sip/QtNetwork/qlocalserver.sip
+share/py-sip/QtNetwork/qlocalsocket.sip
+share/py-sip/QtNetwork/qnetworkaccessmanager.sip
+share/py-sip/QtNetwork/qnetworkconfigmanager.sip
+share/py-sip/QtNetwork/qnetworkconfiguration.sip
+share/py-sip/QtNetwork/qnetworkcookie.sip
+share/py-sip/QtNetwork/qnetworkcookiejar.sip
+share/py-sip/QtNetwork/qnetworkdiskcache.sip
+share/py-sip/QtNetwork/qnetworkinterface.sip
+share/py-sip/QtNetwork/qnetworkproxy.sip
+share/py-sip/QtNetwork/qnetworkreply.sip
+share/py-sip/QtNetwork/qnetworkrequest.sip
+share/py-sip/QtNetwork/qnetworksession.sip
+share/py-sip/QtNetwork/qssl.sip
+share/py-sip/QtNetwork/qsslcertificate.sip
+share/py-sip/QtNetwork/qsslcipher.sip
+share/py-sip/QtNetwork/qsslconfiguration.sip
+share/py-sip/QtNetwork/qsslerror.sip
+share/py-sip/QtNetwork/qsslkey.sip
+share/py-sip/QtNetwork/qsslsocket.sip
+share/py-sip/QtNetwork/qtcpserver.sip
+share/py-sip/QtNetwork/qtcpsocket.sip
+share/py-sip/QtNetwork/qudpsocket.sip
+share/py-sip/QtNetwork/qurlinfo.sip
 %%API%%share/qt4/qsci/api/python/QtNetwork.api
-%%SIP%%@dirrm share/py-sip/QtNetwork
+@dirrm share/py-sip/QtNetwork
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	xml qmake_build moc_build

-OPTIONS=	API		"Install QtXml API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtXml SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtXml API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtXml

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/textproc/py-qt4-xml/pkg-plist
+++ b/textproc/py-qt4-xml/pkg-plist
@ -1,10 +1,10 @@
 bin/pylupdate4
 bin/pyrcc4
 %%PYTHON_SITELIBDIR%%/PyQt4/QtXml.so
-%%SIP%%share/py-sip/QtXml/QtXmlmod.sip
-%%SIP%%share/py-sip/QtXml/qdom.sip
-%%SIP%%share/py-sip/QtXml/qxml.sip
-%%SIP%%share/py-sip/QtXml/qxmlstream.sip
+share/py-sip/QtXml/QtXmlmod.sip
+share/py-sip/QtXml/qdom.sip
+share/py-sip/QtXml/qxml.sip
+share/py-sip/QtXml/qxmlstream.sip
 %%API%%share/qt4/qsci/api/python/QtXml.api
-%%SIP%%@dirrm share/py-sip/QtXml
+@dirrm share/py-sip/QtXml
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@ -23,29 +23,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	xmlpatterns qmake_build

-OPTIONS=	API		"Install QtXml API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtXml SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtXml API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtXmlPatterns

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -54,16 +53,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/textproc/py-qt4-xmlpatterns/pkg-plist
+++ b/textproc/py-qt4-xmlpatterns/pkg-plist
@ -1,19 +1,19 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtXmlPatterns.so
-%%SIP%%share/py-sip/QtXmlPatterns/QtXmlPatternsmod.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qabstractmessagehandler.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qabstracturiresolver.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qabstractxmlnodemodel.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qabstractxmlreceiver.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qsimplexmlnodemodel.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qsourcelocation.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlformatter.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlname.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlnamepool.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlquery.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlresultitems.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlschema.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlschemavalidator.sip
-%%SIP%%share/py-sip/QtXmlPatterns/qxmlserializer.sip
+share/py-sip/QtXmlPatterns/QtXmlPatternsmod.sip
+share/py-sip/QtXmlPatterns/qabstractmessagehandler.sip
+share/py-sip/QtXmlPatterns/qabstracturiresolver.sip
+share/py-sip/QtXmlPatterns/qabstractxmlnodemodel.sip
+share/py-sip/QtXmlPatterns/qabstractxmlreceiver.sip
+share/py-sip/QtXmlPatterns/qsimplexmlnodemodel.sip
+share/py-sip/QtXmlPatterns/qsourcelocation.sip
+share/py-sip/QtXmlPatterns/qxmlformatter.sip
+share/py-sip/QtXmlPatterns/qxmlname.sip
+share/py-sip/QtXmlPatterns/qxmlnamepool.sip
+share/py-sip/QtXmlPatterns/qxmlquery.sip
+share/py-sip/QtXmlPatterns/qxmlresultitems.sip
+share/py-sip/QtXmlPatterns/qxmlschema.sip
+share/py-sip/QtXmlPatterns/qxmlschemavalidator.sip
+share/py-sip/QtXmlPatterns/qxmlserializer.sip
 %%API%%share/qt4/qsci/api/python/QtXmlPatterns.api
-%%SIP%%@dirrm share/py-sip/QtXmlPatterns
+@dirrm share/py-sip/QtXmlPatterns
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@ -23,29 +23,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	qmake_build gui network webkit

-OPTIONS=	API		"Install QtXml API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtXml SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtXml API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtWebKit

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -54,16 +53,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/www/py-qt4-webkit/pkg-plist
+++ b/www/py-qt4-webkit/pkg-plist
@ -1,18 +1,18 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtWebKit.so
-%%SIP%%share/py-sip/QtWebKit/QtWebKitmod.sip
-%%SIP%%share/py-sip/QtWebKit/qgraphicswebview.sip
-%%SIP%%share/py-sip/QtWebKit/qwebdatabase.sip
-%%SIP%%share/py-sip/QtWebKit/qwebelement.sip
-%%SIP%%share/py-sip/QtWebKit/qwebframe.sip
-%%SIP%%share/py-sip/QtWebKit/qwebhistory.sip
-%%SIP%%share/py-sip/QtWebKit/qwebhistoryinterface.sip
-%%SIP%%share/py-sip/QtWebKit/qwebinspector.sip
-%%SIP%%share/py-sip/QtWebKit/qwebkitversion.sip
-%%SIP%%share/py-sip/QtWebKit/qwebpage.sip
-%%SIP%%share/py-sip/QtWebKit/qwebpluginfactory.sip
-%%SIP%%share/py-sip/QtWebKit/qwebsecurityorigin.sip
-%%SIP%%share/py-sip/QtWebKit/qwebsettings.sip
-%%SIP%%share/py-sip/QtWebKit/qwebview.sip
+share/py-sip/QtWebKit/QtWebKitmod.sip
+share/py-sip/QtWebKit/qgraphicswebview.sip
+share/py-sip/QtWebKit/qwebdatabase.sip
+share/py-sip/QtWebKit/qwebelement.sip
+share/py-sip/QtWebKit/qwebframe.sip
+share/py-sip/QtWebKit/qwebhistory.sip
+share/py-sip/QtWebKit/qwebhistoryinterface.sip
+share/py-sip/QtWebKit/qwebinspector.sip
+share/py-sip/QtWebKit/qwebkitversion.sip
+share/py-sip/QtWebKit/qwebpage.sip
+share/py-sip/QtWebKit/qwebpluginfactory.sip
+share/py-sip/QtWebKit/qwebsecurityorigin.sip
+share/py-sip/QtWebKit/qwebsettings.sip
+share/py-sip/QtWebKit/qwebview.sip
 %%API%%share/qt4/qsci/api/python/QtWebKit.api
-%%SIP%%@dirrm share/py-sip/QtWebKit
+@dirrm share/py-sip/QtWebKit
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@ -25,29 +25,28 @@ USE_PYTHON=	2.5+
 USE_QT4=	gui imageformats_run inputmethods_run iconengines_run \
 		qmake_build moc_build

-OPTIONS=	API		"Install QtGui API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtGui SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtGui API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtGui

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -56,16 +55,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
--- a/x11-toolkits/py-qt4-gui/pkg-plist
+++ b/x11-toolkits/py-qt4-gui/pkg-plist
@ -1,204 +1,204 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtGui.so
-%%SIP%%share/py-sip/QtGui/QtGuimod.sip
-%%SIP%%share/py-sip/QtGui/qabstractbutton.sip
-%%SIP%%share/py-sip/QtGui/qabstractitemdelegate.sip
-%%SIP%%share/py-sip/QtGui/qabstractitemview.sip
-%%SIP%%share/py-sip/QtGui/qabstractprintdialog.sip
-%%SIP%%share/py-sip/QtGui/qabstractproxymodel.sip
-%%SIP%%share/py-sip/QtGui/qabstractscrollarea.sip
-%%SIP%%share/py-sip/QtGui/qabstractslider.sip
-%%SIP%%share/py-sip/QtGui/qabstractspinbox.sip
-%%SIP%%share/py-sip/QtGui/qabstracttextdocumentlayout.sip
-%%SIP%%share/py-sip/QtGui/qaction.sip
-%%SIP%%share/py-sip/QtGui/qactiongroup.sip
-%%SIP%%share/py-sip/QtGui/qapplication.sip
-%%SIP%%share/py-sip/QtGui/qbitmap.sip
-%%SIP%%share/py-sip/QtGui/qboxlayout.sip
-%%SIP%%share/py-sip/QtGui/qbrush.sip
-%%SIP%%share/py-sip/QtGui/qbuttongroup.sip
-%%SIP%%share/py-sip/QtGui/qcalendarwidget.sip
-%%SIP%%share/py-sip/QtGui/qcheckbox.sip
-%%SIP%%share/py-sip/QtGui/qclipboard.sip
-%%SIP%%share/py-sip/QtGui/qcolor.sip
-%%SIP%%share/py-sip/QtGui/qcolordialog.sip
-%%SIP%%share/py-sip/QtGui/qcolumnview.sip
-%%SIP%%share/py-sip/QtGui/qcombobox.sip
-%%SIP%%share/py-sip/QtGui/qcommandlinkbutton.sip
-%%SIP%%share/py-sip/QtGui/qcommonstyle.sip
-%%SIP%%share/py-sip/QtGui/qcompleter.sip
-%%SIP%%share/py-sip/QtGui/qcursor.sip
-%%SIP%%share/py-sip/QtGui/qdatawidgetmapper.sip
-%%SIP%%share/py-sip/QtGui/qdatetimeedit.sip
-%%SIP%%share/py-sip/QtGui/qdesktopservices.sip
-%%SIP%%share/py-sip/QtGui/qdesktopwidget.sip
-%%SIP%%share/py-sip/QtGui/qdial.sip
-%%SIP%%share/py-sip/QtGui/qdialog.sip
-%%SIP%%share/py-sip/QtGui/qdialogbuttonbox.sip
-%%SIP%%share/py-sip/QtGui/qdirmodel.sip
-%%SIP%%share/py-sip/QtGui/qdockwidget.sip
-%%SIP%%share/py-sip/QtGui/qdrag.sip
-%%SIP%%share/py-sip/QtGui/qdrawutil.sip
-%%SIP%%share/py-sip/QtGui/qerrormessage.sip
-%%SIP%%share/py-sip/QtGui/qevent.sip
-%%SIP%%share/py-sip/QtGui/qfiledialog.sip
-%%SIP%%share/py-sip/QtGui/qfileiconprovider.sip
-%%SIP%%share/py-sip/QtGui/qfilesystemmodel.sip
-%%SIP%%share/py-sip/QtGui/qfocusframe.sip
-%%SIP%%share/py-sip/QtGui/qfont.sip
-%%SIP%%share/py-sip/QtGui/qfontcombobox.sip
-%%SIP%%share/py-sip/QtGui/qfontdatabase.sip
-%%SIP%%share/py-sip/QtGui/qfontdialog.sip
-%%SIP%%share/py-sip/QtGui/qfontinfo.sip
-%%SIP%%share/py-sip/QtGui/qfontmetrics.sip
-%%SIP%%share/py-sip/QtGui/qformlayout.sip
-%%SIP%%share/py-sip/QtGui/qframe.sip
-%%SIP%%share/py-sip/QtGui/qgenericmatrix.sip
-%%SIP%%share/py-sip/QtGui/qgesture.sip
-%%SIP%%share/py-sip/QtGui/qgesturerecognizer.sip
-%%SIP%%share/py-sip/QtGui/qglyphrun.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsanchorlayout.sip
-%%SIP%%share/py-sip/QtGui/qgraphicseffect.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsgridlayout.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsitem.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsitemanimation.sip
-%%SIP%%share/py-sip/QtGui/qgraphicslayout.sip
-%%SIP%%share/py-sip/QtGui/qgraphicslayoutitem.sip
-%%SIP%%share/py-sip/QtGui/qgraphicslinearlayout.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsproxywidget.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsscene.sip
-%%SIP%%share/py-sip/QtGui/qgraphicssceneevent.sip
-%%SIP%%share/py-sip/QtGui/qgraphicstransform.sip
-%%SIP%%share/py-sip/QtGui/qgraphicsview.sip
-%%SIP%%share/py-sip/QtGui/qgraphicswidget.sip
-%%SIP%%share/py-sip/QtGui/qgridlayout.sip
-%%SIP%%share/py-sip/QtGui/qgroupbox.sip
-%%SIP%%share/py-sip/QtGui/qheaderview.sip
-%%SIP%%share/py-sip/QtGui/qicon.sip
-%%SIP%%share/py-sip/QtGui/qiconengine.sip
-%%SIP%%share/py-sip/QtGui/qidentityproxymodel.sip
-%%SIP%%share/py-sip/QtGui/qimage.sip
-%%SIP%%share/py-sip/QtGui/qimageiohandler.sip
-%%SIP%%share/py-sip/QtGui/qimagereader.sip
-%%SIP%%share/py-sip/QtGui/qimagewriter.sip
-%%SIP%%share/py-sip/QtGui/qinputcontext.sip
-%%SIP%%share/py-sip/QtGui/qinputcontextfactory.sip
-%%SIP%%share/py-sip/QtGui/qinputdialog.sip
-%%SIP%%share/py-sip/QtGui/qitemdelegate.sip
-%%SIP%%share/py-sip/QtGui/qitemeditorfactory.sip
-%%SIP%%share/py-sip/QtGui/qitemselectionmodel.sip
-%%SIP%%share/py-sip/QtGui/qkeyeventtransition.sip
-%%SIP%%share/py-sip/QtGui/qkeysequence.sip
-%%SIP%%share/py-sip/QtGui/qlabel.sip
-%%SIP%%share/py-sip/QtGui/qlayout.sip
-%%SIP%%share/py-sip/QtGui/qlayoutitem.sip
-%%SIP%%share/py-sip/QtGui/qlcdnumber.sip
-%%SIP%%share/py-sip/QtGui/qlineedit.sip
-%%SIP%%share/py-sip/QtGui/qlistview.sip
-%%SIP%%share/py-sip/QtGui/qlistwidget.sip
-%%SIP%%share/py-sip/QtGui/qmainwindow.sip
-%%SIP%%share/py-sip/QtGui/qmatrix.sip
-%%SIP%%share/py-sip/QtGui/qmatrix4x4.sip
-%%SIP%%share/py-sip/QtGui/qmdiarea.sip
-%%SIP%%share/py-sip/QtGui/qmdisubwindow.sip
-%%SIP%%share/py-sip/QtGui/qmenu.sip
-%%SIP%%share/py-sip/QtGui/qmenubar.sip
-%%SIP%%share/py-sip/QtGui/qmessagebox.sip
-%%SIP%%share/py-sip/QtGui/qmime.sip
-%%SIP%%share/py-sip/QtGui/qmouseeventtransition.sip
-%%SIP%%share/py-sip/QtGui/qmovie.sip
-%%SIP%%share/py-sip/QtGui/qpagesetupdialog.sip
-%%SIP%%share/py-sip/QtGui/qpaintdevice.sip
-%%SIP%%share/py-sip/QtGui/qpaintengine.sip
-%%SIP%%share/py-sip/QtGui/qpainter.sip
-%%SIP%%share/py-sip/QtGui/qpainterpath.sip
-%%SIP%%share/py-sip/QtGui/qpalette.sip
-%%SIP%%share/py-sip/QtGui/qpen.sip
-%%SIP%%share/py-sip/QtGui/qpicture.sip
-%%SIP%%share/py-sip/QtGui/qpixmap.sip
-%%SIP%%share/py-sip/QtGui/qpixmapcache.sip
-%%SIP%%share/py-sip/QtGui/qplaintextedit.sip
-%%SIP%%share/py-sip/QtGui/qpolygon.sip
-%%SIP%%share/py-sip/QtGui/qprintdialog.sip
-%%SIP%%share/py-sip/QtGui/qprintengine.sip
-%%SIP%%share/py-sip/QtGui/qprinter.sip
-%%SIP%%share/py-sip/QtGui/qprinterinfo.sip
-%%SIP%%share/py-sip/QtGui/qprintpreviewdialog.sip
-%%SIP%%share/py-sip/QtGui/qprintpreviewwidget.sip
-%%SIP%%share/py-sip/QtGui/qprogressbar.sip
-%%SIP%%share/py-sip/QtGui/qprogressdialog.sip
-%%SIP%%share/py-sip/QtGui/qproxymodel.sip
-%%SIP%%share/py-sip/QtGui/qpushbutton.sip
-%%SIP%%share/py-sip/QtGui/qpytextobject.sip
-%%SIP%%share/py-sip/QtGui/qquaternion.sip
-%%SIP%%share/py-sip/QtGui/qradiobutton.sip
-%%SIP%%share/py-sip/QtGui/qrawfont.sip
-%%SIP%%share/py-sip/QtGui/qregion.sip
-%%SIP%%share/py-sip/QtGui/qrgb.sip
-%%SIP%%share/py-sip/QtGui/qrubberband.sip
-%%SIP%%share/py-sip/QtGui/qscrollarea.sip
-%%SIP%%share/py-sip/QtGui/qscrollbar.sip
-%%SIP%%share/py-sip/QtGui/qsessionmanager.sip
-%%SIP%%share/py-sip/QtGui/qshortcut.sip
-%%SIP%%share/py-sip/QtGui/qsizegrip.sip
-%%SIP%%share/py-sip/QtGui/qsizepolicy.sip
-%%SIP%%share/py-sip/QtGui/qslider.sip
-%%SIP%%share/py-sip/QtGui/qsortfilterproxymodel.sip
-%%SIP%%share/py-sip/QtGui/qsound.sip
-%%SIP%%share/py-sip/QtGui/qspinbox.sip
-%%SIP%%share/py-sip/QtGui/qsplashscreen.sip
-%%SIP%%share/py-sip/QtGui/qsplitter.sip
-%%SIP%%share/py-sip/QtGui/qstackedlayout.sip
-%%SIP%%share/py-sip/QtGui/qstackedwidget.sip
-%%SIP%%share/py-sip/QtGui/qstandarditemmodel.sip
-%%SIP%%share/py-sip/QtGui/qstatictext.sip
-%%SIP%%share/py-sip/QtGui/qstatusbar.sip
-%%SIP%%share/py-sip/QtGui/qstringlistmodel.sip
-%%SIP%%share/py-sip/QtGui/qstyle.sip
-%%SIP%%share/py-sip/QtGui/qstyleditemdelegate.sip
-%%SIP%%share/py-sip/QtGui/qstylefactory.sip
-%%SIP%%share/py-sip/QtGui/qstyleoption.sip
-%%SIP%%share/py-sip/QtGui/qstylepainter.sip
-%%SIP%%share/py-sip/QtGui/qsyntaxhighlighter.sip
-%%SIP%%share/py-sip/QtGui/qsystemtrayicon.sip
-%%SIP%%share/py-sip/QtGui/qtabbar.sip
-%%SIP%%share/py-sip/QtGui/qtableview.sip
-%%SIP%%share/py-sip/QtGui/qtablewidget.sip
-%%SIP%%share/py-sip/QtGui/qtabwidget.sip
-%%SIP%%share/py-sip/QtGui/qtextbrowser.sip
-%%SIP%%share/py-sip/QtGui/qtextcursor.sip
-%%SIP%%share/py-sip/QtGui/qtextdocument.sip
-%%SIP%%share/py-sip/QtGui/qtextdocumentfragment.sip
-%%SIP%%share/py-sip/QtGui/qtextdocumentwriter.sip
-%%SIP%%share/py-sip/QtGui/qtextedit.sip
-%%SIP%%share/py-sip/QtGui/qtextformat.sip
-%%SIP%%share/py-sip/QtGui/qtextlayout.sip
-%%SIP%%share/py-sip/QtGui/qtextlist.sip
-%%SIP%%share/py-sip/QtGui/qtextobject.sip
-%%SIP%%share/py-sip/QtGui/qtextoption.sip
-%%SIP%%share/py-sip/QtGui/qtexttable.sip
-%%SIP%%share/py-sip/QtGui/qtoolbar.sip
-%%SIP%%share/py-sip/QtGui/qtoolbox.sip
-%%SIP%%share/py-sip/QtGui/qtoolbutton.sip
-%%SIP%%share/py-sip/QtGui/qtooltip.sip
-%%SIP%%share/py-sip/QtGui/qtransform.sip
-%%SIP%%share/py-sip/QtGui/qtreeview.sip
-%%SIP%%share/py-sip/QtGui/qtreewidget.sip
-%%SIP%%share/py-sip/QtGui/qtreewidgetitemiterator.sip
-%%SIP%%share/py-sip/QtGui/qundogroup.sip
-%%SIP%%share/py-sip/QtGui/qundostack.sip
-%%SIP%%share/py-sip/QtGui/qundoview.sip
-%%SIP%%share/py-sip/QtGui/qvalidator.sip
-%%SIP%%share/py-sip/QtGui/qvector2d.sip
-%%SIP%%share/py-sip/QtGui/qvector3d.sip
-%%SIP%%share/py-sip/QtGui/qvector4d.sip
-%%SIP%%share/py-sip/QtGui/qwhatsthis.sip
-%%SIP%%share/py-sip/QtGui/qwidget.sip
-%%SIP%%share/py-sip/QtGui/qwidgetaction.sip
-%%SIP%%share/py-sip/QtGui/qwindowdefs.sip
-%%SIP%%share/py-sip/QtGui/qwizard.sip
-%%SIP%%share/py-sip/QtGui/qworkspace.sip
-%%SIP%%share/py-sip/QtGui/qx11embed_x11.sip
-%%SIP%%share/py-sip/QtGui/qx11info_x11.sip
+share/py-sip/QtGui/QtGuimod.sip
+share/py-sip/QtGui/qabstractbutton.sip
+share/py-sip/QtGui/qabstractitemdelegate.sip
+share/py-sip/QtGui/qabstractitemview.sip
+share/py-sip/QtGui/qabstractprintdialog.sip
+share/py-sip/QtGui/qabstractproxymodel.sip
+share/py-sip/QtGui/qabstractscrollarea.sip
+share/py-sip/QtGui/qabstractslider.sip
+share/py-sip/QtGui/qabstractspinbox.sip
+share/py-sip/QtGui/qabstracttextdocumentlayout.sip
+share/py-sip/QtGui/qaction.sip
+share/py-sip/QtGui/qactiongroup.sip
+share/py-sip/QtGui/qapplication.sip
+share/py-sip/QtGui/qbitmap.sip
+share/py-sip/QtGui/qboxlayout.sip
+share/py-sip/QtGui/qbrush.sip
+share/py-sip/QtGui/qbuttongroup.sip
+share/py-sip/QtGui/qcalendarwidget.sip
+share/py-sip/QtGui/qcheckbox.sip
+share/py-sip/QtGui/qclipboard.sip
+share/py-sip/QtGui/qcolor.sip
+share/py-sip/QtGui/qcolordialog.sip
+share/py-sip/QtGui/qcolumnview.sip
+share/py-sip/QtGui/qcombobox.sip
+share/py-sip/QtGui/qcommandlinkbutton.sip
+share/py-sip/QtGui/qcommonstyle.sip
+share/py-sip/QtGui/qcompleter.sip
+share/py-sip/QtGui/qcursor.sip
+share/py-sip/QtGui/qdatawidgetmapper.sip
+share/py-sip/QtGui/qdatetimeedit.sip
+share/py-sip/QtGui/qdesktopservices.sip
+share/py-sip/QtGui/qdesktopwidget.sip
+share/py-sip/QtGui/qdial.sip
+share/py-sip/QtGui/qdialog.sip
+share/py-sip/QtGui/qdialogbuttonbox.sip
+share/py-sip/QtGui/qdirmodel.sip
+share/py-sip/QtGui/qdockwidget.sip
+share/py-sip/QtGui/qdrag.sip
+share/py-sip/QtGui/qdrawutil.sip
+share/py-sip/QtGui/qerrormessage.sip
+share/py-sip/QtGui/qevent.sip
+share/py-sip/QtGui/qfiledialog.sip
+share/py-sip/QtGui/qfileiconprovider.sip
+share/py-sip/QtGui/qfilesystemmodel.sip
+share/py-sip/QtGui/qfocusframe.sip
+share/py-sip/QtGui/qfont.sip
+share/py-sip/QtGui/qfontcombobox.sip
+share/py-sip/QtGui/qfontdatabase.sip
+share/py-sip/QtGui/qfontdialog.sip
+share/py-sip/QtGui/qfontinfo.sip
+share/py-sip/QtGui/qfontmetrics.sip
+share/py-sip/QtGui/qformlayout.sip
+share/py-sip/QtGui/qframe.sip
+share/py-sip/QtGui/qgenericmatrix.sip
+share/py-sip/QtGui/qgesture.sip
+share/py-sip/QtGui/qgesturerecognizer.sip
+share/py-sip/QtGui/qglyphrun.sip
+share/py-sip/QtGui/qgraphicsanchorlayout.sip
+share/py-sip/QtGui/qgraphicseffect.sip
+share/py-sip/QtGui/qgraphicsgridlayout.sip
+share/py-sip/QtGui/qgraphicsitem.sip
+share/py-sip/QtGui/qgraphicsitemanimation.sip
+share/py-sip/QtGui/qgraphicslayout.sip
+share/py-sip/QtGui/qgraphicslayoutitem.sip
+share/py-sip/QtGui/qgraphicslinearlayout.sip
+share/py-sip/QtGui/qgraphicsproxywidget.sip
+share/py-sip/QtGui/qgraphicsscene.sip
+share/py-sip/QtGui/qgraphicssceneevent.sip
+share/py-sip/QtGui/qgraphicstransform.sip
+share/py-sip/QtGui/qgraphicsview.sip
+share/py-sip/QtGui/qgraphicswidget.sip
+share/py-sip/QtGui/qgridlayout.sip
+share/py-sip/QtGui/qgroupbox.sip
+share/py-sip/QtGui/qheaderview.sip
+share/py-sip/QtGui/qicon.sip
+share/py-sip/QtGui/qiconengine.sip
+share/py-sip/QtGui/qidentityproxymodel.sip
+share/py-sip/QtGui/qimage.sip
+share/py-sip/QtGui/qimageiohandler.sip
+share/py-sip/QtGui/qimagereader.sip
+share/py-sip/QtGui/qimagewriter.sip
+share/py-sip/QtGui/qinputcontext.sip
+share/py-sip/QtGui/qinputcontextfactory.sip
+share/py-sip/QtGui/qinputdialog.sip
+share/py-sip/QtGui/qitemdelegate.sip
+share/py-sip/QtGui/qitemeditorfactory.sip
+share/py-sip/QtGui/qitemselectionmodel.sip
+share/py-sip/QtGui/qkeyeventtransition.sip
+share/py-sip/QtGui/qkeysequence.sip
+share/py-sip/QtGui/qlabel.sip
+share/py-sip/QtGui/qlayout.sip
+share/py-sip/QtGui/qlayoutitem.sip
+share/py-sip/QtGui/qlcdnumber.sip
+share/py-sip/QtGui/qlineedit.sip
+share/py-sip/QtGui/qlistview.sip
+share/py-sip/QtGui/qlistwidget.sip
+share/py-sip/QtGui/qmainwindow.sip
+share/py-sip/QtGui/qmatrix.sip
+share/py-sip/QtGui/qmatrix4x4.sip
+share/py-sip/QtGui/qmdiarea.sip
+share/py-sip/QtGui/qmdisubwindow.sip
+share/py-sip/QtGui/qmenu.sip
+share/py-sip/QtGui/qmenubar.sip
+share/py-sip/QtGui/qmessagebox.sip
+share/py-sip/QtGui/qmime.sip
+share/py-sip/QtGui/qmouseeventtransition.sip
+share/py-sip/QtGui/qmovie.sip
+share/py-sip/QtGui/qpagesetupdialog.sip
+share/py-sip/QtGui/qpaintdevice.sip
+share/py-sip/QtGui/qpaintengine.sip
+share/py-sip/QtGui/qpainter.sip
+share/py-sip/QtGui/qpainterpath.sip
+share/py-sip/QtGui/qpalette.sip
+share/py-sip/QtGui/qpen.sip
+share/py-sip/QtGui/qpicture.sip
+share/py-sip/QtGui/qpixmap.sip
+share/py-sip/QtGui/qpixmapcache.sip
+share/py-sip/QtGui/qplaintextedit.sip
+share/py-sip/QtGui/qpolygon.sip
+share/py-sip/QtGui/qprintdialog.sip
+share/py-sip/QtGui/qprintengine.sip
+share/py-sip/QtGui/qprinter.sip
+share/py-sip/QtGui/qprinterinfo.sip
+share/py-sip/QtGui/qprintpreviewdialog.sip
+share/py-sip/QtGui/qprintpreviewwidget.sip
+share/py-sip/QtGui/qprogressbar.sip
+share/py-sip/QtGui/qprogressdialog.sip
+share/py-sip/QtGui/qproxymodel.sip
+share/py-sip/QtGui/qpushbutton.sip
+share/py-sip/QtGui/qpytextobject.sip
+share/py-sip/QtGui/qquaternion.sip
+share/py-sip/QtGui/qradiobutton.sip
+share/py-sip/QtGui/qrawfont.sip
+share/py-sip/QtGui/qregion.sip
+share/py-sip/QtGui/qrgb.sip
+share/py-sip/QtGui/qrubberband.sip
+share/py-sip/QtGui/qscrollarea.sip
+share/py-sip/QtGui/qscrollbar.sip
+share/py-sip/QtGui/qsessionmanager.sip
+share/py-sip/QtGui/qshortcut.sip
+share/py-sip/QtGui/qsizegrip.sip
+share/py-sip/QtGui/qsizepolicy.sip
+share/py-sip/QtGui/qslider.sip
+share/py-sip/QtGui/qsortfilterproxymodel.sip
+share/py-sip/QtGui/qsound.sip
+share/py-sip/QtGui/qspinbox.sip
+share/py-sip/QtGui/qsplashscreen.sip
+share/py-sip/QtGui/qsplitter.sip
+share/py-sip/QtGui/qstackedlayout.sip
+share/py-sip/QtGui/qstackedwidget.sip
+share/py-sip/QtGui/qstandarditemmodel.sip
+share/py-sip/QtGui/qstatictext.sip
+share/py-sip/QtGui/qstatusbar.sip
+share/py-sip/QtGui/qstringlistmodel.sip
+share/py-sip/QtGui/qstyle.sip
+share/py-sip/QtGui/qstyleditemdelegate.sip
+share/py-sip/QtGui/qstylefactory.sip
+share/py-sip/QtGui/qstyleoption.sip
+share/py-sip/QtGui/qstylepainter.sip
+share/py-sip/QtGui/qsyntaxhighlighter.sip
+share/py-sip/QtGui/qsystemtrayicon.sip
+share/py-sip/QtGui/qtabbar.sip
+share/py-sip/QtGui/qtableview.sip
+share/py-sip/QtGui/qtablewidget.sip
+share/py-sip/QtGui/qtabwidget.sip
+share/py-sip/QtGui/qtextbrowser.sip
+share/py-sip/QtGui/qtextcursor.sip
+share/py-sip/QtGui/qtextdocument.sip
+share/py-sip/QtGui/qtextdocumentfragment.sip
+share/py-sip/QtGui/qtextdocumentwriter.sip
+share/py-sip/QtGui/qtextedit.sip
+share/py-sip/QtGui/qtextformat.sip
+share/py-sip/QtGui/qtextlayout.sip
+share/py-sip/QtGui/qtextlist.sip
+share/py-sip/QtGui/qtextobject.sip
+share/py-sip/QtGui/qtextoption.sip
+share/py-sip/QtGui/qtexttable.sip
+share/py-sip/QtGui/qtoolbar.sip
+share/py-sip/QtGui/qtoolbox.sip
+share/py-sip/QtGui/qtoolbutton.sip
+share/py-sip/QtGui/qtooltip.sip
+share/py-sip/QtGui/qtransform.sip
+share/py-sip/QtGui/qtreeview.sip
+share/py-sip/QtGui/qtreewidget.sip
+share/py-sip/QtGui/qtreewidgetitemiterator.sip
+share/py-sip/QtGui/qundogroup.sip
+share/py-sip/QtGui/qundostack.sip
+share/py-sip/QtGui/qundoview.sip
+share/py-sip/QtGui/qvalidator.sip
+share/py-sip/QtGui/qvector2d.sip
+share/py-sip/QtGui/qvector3d.sip
+share/py-sip/QtGui/qvector4d.sip
+share/py-sip/QtGui/qwhatsthis.sip
+share/py-sip/QtGui/qwidget.sip
+share/py-sip/QtGui/qwidgetaction.sip
+share/py-sip/QtGui/qwindowdefs.sip
+share/py-sip/QtGui/qwizard.sip
+share/py-sip/QtGui/qworkspace.sip
+share/py-sip/QtGui/qx11embed_x11.sip
+share/py-sip/QtGui/qx11info_x11.sip
 %%API%%share/qt4/qsci/api/python/QtGui.api
-%%SIP%%@dirrm share/py-sip/QtGui
+@dirrm share/py-sip/QtGui
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@ -24,29 +24,28 @@ HAS_CONFIGURE=	yes
 USE_PYTHON=	2.5+
 USE_QT4=	opengl qmake_build

-OPTIONS=	API		"Install QtOpenGL API for QScintilla2" on \
-		DEBUG		"Enable debugging in generated code" off \
-		SIPFILES	"Install the QtOpenGL SIP files" on \
-		TRACING		"Enable tracing in generated code" off
+OPTIONS=	API	"Install QtOpenGL API for QScintilla2" on

 PATCHDIR=	${PORTSDIR}/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\
+ARGS=		-b ${PREFIX}/bin \
+		-d ${PYTHONPREFIX_SITELIBDIR} \
+		-p ${PREFIX}/${QT_PLUGINDIR_REL} \
+		-q ${QMAKE} \
+		--confirm-license \
+		--sipdir ${SIPDIR} \
 		--enable QtOpenGL

+.if defined(WITH_DEBUG)
+ARGS+=		--debug --trace
+.endif
+
 .include "../../devel/py-sip/files/bsd.pyqt.mk"
 .include <bsd.port.options.mk>

-.if defined(WITH_DEBUG)
-ARGS+=		--debug
-.endif
 .if defined(WITHOUT_API)
 ARGS+=		--no-qsci-api
 PLIST_SUB+=	API="@comment "
@ -55,16 +54,6 @@ LIB_DEPENDS+=	qscintilla2.8:${PORTSDIR}/devel/qscintilla2
 ARGS+=		--qsci-api --qsci-api-destdir=${QSCIDIR}
 PLIST_SUB+=	API=""
 .endif
-.if defined(WITHOUT_SIPFILES)
-ARGS+=		--no-sip-files
-PLIST_SUB+=	SIP="@comment "
-.else
-ARGS+=		--sipdir ${SIPDIR}
-PLIST_SUB+=	SIP=""
-.endif
-.if defined(WITH_TRACING)
-ARGS+=		--trace
-.endif

 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\
--- a/x11/py-qt4-opengl/pkg-plist
+++ b/x11/py-qt4-opengl/pkg-plist
@ -1,12 +1,12 @@
 %%PYTHON_SITELIBDIR%%/PyQt4/QtOpenGL.so
-%%SIP%%share/py-sip/QtOpenGL/QtOpenGLmod.sip
-%%SIP%%share/py-sip/QtOpenGL/opengl_types.sip
-%%SIP%%share/py-sip/QtOpenGL/qgl.sip
-%%SIP%%share/py-sip/QtOpenGL/qglbuffer.sip
-%%SIP%%share/py-sip/QtOpenGL/qglcolormap.sip
-%%SIP%%share/py-sip/QtOpenGL/qglframebufferobject.sip
-%%SIP%%share/py-sip/QtOpenGL/qglpixelbuffer.sip
-%%SIP%%share/py-sip/QtOpenGL/qglshaderprogram.sip
+share/py-sip/QtOpenGL/QtOpenGLmod.sip
+share/py-sip/QtOpenGL/opengl_types.sip
+share/py-sip/QtOpenGL/qgl.sip
+share/py-sip/QtOpenGL/qglbuffer.sip
+share/py-sip/QtOpenGL/qglcolormap.sip
+share/py-sip/QtOpenGL/qglframebufferobject.sip
+share/py-sip/QtOpenGL/qglpixelbuffer.sip
+share/py-sip/QtOpenGL/qglshaderprogram.sip
 %%API%%share/qt4/qsci/api/python/QtOpenGL.api
-@dirrm %%SIP%%share/py-sip/QtOpenGL
+@dirrm share/py-sip/QtOpenGL
@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4