- Pet Tinderbox and friends.

OPTIONSFILE must be set using ?= to allow overriding. PR: 163743 PR: 163744 PR: 163745 PR: 163746 Submitted by: A.J. Kehoe IV (Nanoman) <vOo4vyPj@nanoman.ca>
svn path=/head/; revision=289759
2024-11-20 00:21:35 +00:00 · 2012-01-24 23:40:21 +00:00 · 2012-01-24 23:40:21 +00:00 · cd3fe9e9f2 · 2021-03-31 03:12:20 +00:00
commit cd3fe9e9f2
parent 1af744e44f
25 changed files with 28 additions and 30 deletions
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtSql API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@ -31,7 +31,7 @@ OPTIONS=	API		"Install QtAssistant API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@ -29,7 +29,7 @@ OPTIONS=	API		"Install QtCore API for QScintilla2" on \
 		SIPFILES	"Install the QtCore SIP files" on \
 		TRACING		"Enable tracing in generated code" off

-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@ -34,7 +34,7 @@ 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
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
 ARGS=		-b ${PREFIX}/bin\
 		-d ${PYTHONPREFIX_SITELIBDIR}\
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtDeclarative API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@ -32,7 +32,7 @@ OPTIONS=	API		"Install QtDesigner API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-designerplugin/Makefile
+++ b/devel/py-qt4-designerplugin/Makefile
@ -31,7 +31,7 @@ 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
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
 ARGS=		-b ${PREFIX}/bin\
 		-d ${PYTHONPREFIX_SITELIBDIR}\
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtHelp API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@ -32,7 +32,7 @@ OPTIONS=	API		"Install binding API for QScintilla2" on \
 		SIPFILES	"Install the Qscintilla SIP files" on \
 		TRACING		"Enable tracing in generated code" off

-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 ARGS=		-p 4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtScript API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@ -31,7 +31,7 @@ OPTIONS=	API		"Install QtScript API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtTest API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@ -21,7 +21,7 @@ OPTIONS=	DEBUG "Build with debugging symbols" off

 DATADIR=	${PREFIX}/share/py-${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 ARGS=		-b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\
 		-e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR}

--- a/devel/py-sip/distinfo
+++ b/devel/py-sip/distinfo
@ -1,2 +1,2 @@
-SHA256 (sip-4.12.4.tar.gz) = 768c1f0ae7ccdc2a75cb4ca6dfd22a46832e06b3c96b1f0e8d3e955cbec047b3
-SIZE (sip-4.12.4.tar.gz) = 753270
+SHA256 (sip-4.13.tar.gz) = b5a0231d06fe6e6a234b387ef0c6f526b40f22836937872f25211f6614ccc29f
+SIZE (sip-4.13.tar.gz) = 714023
--- a/devel/py-sip/files/bsd.pyqt.mk
+++ b/devel/py-sip/files/bsd.pyqt.mk
@ -6,13 +6,11 @@ MASTER_SITE_RIVERBANK=	http://www.riverbankcomputing.com/static/Downloads/
 MASTER_SITE_FLUFFY=	http://ns.ael.ru/~fluffy.khv/pyqt/

 MASTER_SITES_SIP=	${MASTER_SITE_RIVERBANK}sip4/ \
-			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \
-			${MASTER_SITE_FLUFFY}sip4/
+			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
 MASTER_SITES_PYQT3=	${MASTER_SITE_RIVERBANK}PyQt3/ \
 			${MASTER_SITE_FLUFFY}PyQt3/
 MASTER_SITES_PYQT4=	${MASTER_SITE_RIVERBANK}PyQt4/ \
-			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \
-			${MASTER_SITE_FLUFFY}PyQt4/
+			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,}
 MASTER_SITES_PYKDE3=	${MASTER_SITE_RIVERBANK}PyKDE3/ \
 			${MASTER_SITE_FLUFFY}PyKDE3/
 MASTER_SITES_QSCI1=	${MASTER_SITE_RIVERBANK}QScintilla1/ \
@ -22,7 +20,7 @@ MASTER_SITES_QSCI2=	${MASTER_SITE_RIVERBANK}QScintilla2/ \
 			${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} \
 			${MASTER_SITE_FLUFFY}QScintilla2/

-SIP_VERSION=		4.12.4
+SIP_VERSION=		4.13
 #SIP_SNAP=		-snapshot-20100102
 PYQT3_VERSION=		3.18.2
 PYQT3_SNAP=		-snapshot-20091119
--- a/graphics/py-qt4-svg/Makefile
+++ b/graphics/py-qt4-svg/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtSvg API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@ -20,7 +20,7 @@ USE_PYTHON=	yes

 OPTIONS=	PYQT4	"Install any missing PyQt4 components" off

-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 EXAMPLESDIR=	${PREFIX}/share/examples/py-qt4

 .include "../../devel/py-sip/files/bsd.pyqt.mk"
--- a/multimedia/py-qt4-multimedia/Makefile
+++ b/multimedia/py-qt4-multimedia/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install Phonon API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/multimedia/py-qt4-phonon/Makefile
+++ b/multimedia/py-qt4-phonon/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install Phonon API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/net/py-qt4-network/Makefile
+++ b/net/py-qt4-network/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtNetwork API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtXml API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@ -29,7 +29,7 @@ OPTIONS=	API		"Install QtXml API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/www/py-qt4-webkit/Makefile
+++ b/www/py-qt4-webkit/Makefile
@ -29,7 +29,7 @@ OPTIONS=	API		"Install QtXml API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@ -31,7 +31,7 @@ OPTIONS=	API		"Install QtGui API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@ -30,7 +30,7 @@ OPTIONS=	API		"Install QtOpenGL API for QScintilla2" on \
 		TRACING		"Enable tracing in generated code" off

 PATCHDIR=	${PORTSDIR}/devel/py-qt4-core/files
-OPTIONSFILE=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
+OPTIONSFILE?=	${PORT_DBDIR}/py-qt4-${PORTNAME}/options
 SIPDIR=		${PREFIX}/share/py-sip
 QSCIDIR=	${PREFIX}/share/qt4/qsci
 CONFIGURE_ENV+=	PYQT4_COMPONENT="${PORTNAME}"