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.

21 files changed, 339 insertions, 456 deletions

diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 2577059d0698..22dd20b51b13 100644
--- 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}\
diff --git a/devel/py-qt4-assistant/pkg-plist b/devel/py-qt4-assistant/pkg-plist
index 0c2ecfd4c171..543d3897e154 100644
--- 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
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 8782575aa153..c2ea0248681e 100644
--- 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
diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist
index 3ced2b829f97..760785630438 100644
--- 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
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index c0a910c96ae9..0ade37180d63 100644
--- 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}
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 07ea553e2bdb..b7967159b502 100644
--- 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}\
diff --git a/devel/py-qt4-declarative/pkg-plist b/devel/py-qt4-declarative/pkg-plist
index 041bde932741..5ffc0508c4f4 100644
--- 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
diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index ee84212b0714..7af767f1edce 100644
--- 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}\
diff --git a/devel/py-qt4-designer/pkg-plist b/devel/py-qt4-designer/pkg-plist
index b687068186f7..265864515b6c 100644
--- 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
diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile
index 25ebf6e162c2..3143a27b97b6 100644
--- 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}
diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index 092672f9c963..3326de1e9aa4 100644
--- 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}\
diff --git a/devel/py-qt4-help/pkg-plist b/devel/py-qt4-help/pkg-plist
index f51547f959b1..0f1e46492050 100644
--- 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
diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index bf35824eab6e..b15d14617db3 100644
--- 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}\
diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist
index e0e19dac51df..827b53d9ca9f 100644
--- 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
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 0e09ad9c125b..c6f3ae459e66 100644
--- 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}\
diff --git a/devel/py-qt4-script/pkg-plist b/devel/py-qt4-script/pkg-plist
index f44cecf29393..07f9d63d7d08 100644
--- 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
diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index 4e0aea903dab..07ec3adba54a 100644
--- 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}\
diff --git a/devel/py-qt4-scripttools/pkg-plist b/devel/py-qt4-scripttools/pkg-plist
index 3f16512cfe4f..86aed5d8649b 100644
--- 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
diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index ff3c61b4519b..2d87d56a15fe 100644
--- 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} \
diff --git a/devel/py-qt4-test/pkg-plist b/devel/py-qt4-test/pkg-plist
index 5e153ba9f2f5..0a7920dead9d 100644
--- 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
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 9e6b23ba9333..1eea81a739ad 100644
--- 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}