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.

2 files changed, 27 insertions, 38 deletions

diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 7ac43108fc9f..83ee6923a1e5 100644
--- 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}\
diff --git a/databases/py-qt4-sql/pkg-plist b/databases/py-qt4-sql/pkg-plist
index fded39d417a3..9e2c251d6aae 100644
--- 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