Date: Wed, 23 Jul 2014 19:53:11 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362721 - in head: databases/py-qt4-sql databases/sqliteman databases/tora devel/p5-perlqt devel/py-qt4 devel/py-qt4-assistant devel/py-qt4-core devel/py-qt4-core/files devel/py-qt4-dbu... Message-ID: <201407231953.s6NJrBf7044188@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Jul 23 19:53:11 2014 New Revision: 362721 URL: http://svnweb.freebsd.org/changeset/ports/362721 QAT: https://qat.redports.org/buildarchive/r362721/ Log: Update PyQt to 4.11.1, QScintilla to 2.8.3 and SIP to 4.16.2. ... And bump PORTREVISION on ports that depend on devel/qscintilla2 due to the shlib version change. This is brought to you by the KDE on FreeBSD team. Besides updating to newer upstream releases, this commit also contains a lot of under-the-hood changes to the PyQt/QScintilla/SIP ports. Their Makefiles had accumulated a lot of cruft over time, so it was time for some summer cleaning: - General, belated changes: * Use OPTIONS helpers wherever possible, stop including <bsd.port.options.mk> when not necessary, stop checking for ${PORT_OPTIONS:MDOCS} and ${PORT_OPTIONS:MEXAMPLES} when not necessary, add options such as DOCS and/or DEBUG where they were only checked for. - QScintilla ports: * Drop the API option from py-qt4-qscintilla2. It had been broken ever since staging support was added, and its existence does not make much sense: QScintilla is a hard dependency regardless of the state of this option anyway, they all come from the same tarball and the configuration script assumes the .api file will always be installed. - PyQt ports: * The configure.py patch shared by all PyQt ports has been trimmed down to the minimum. Changes for Qt3 compatibility or for things that are just not needed anymore have been removed. * Several post-configure targets in the PyQt ports have been removed, as they had no effect on the way the ports were built whatsoever. * In some cases, instead of calling Python's py_compile.py on `ls *.py */*.py */*/*.py` to generate .pyc and .pyo files, we just call compileall.py, which is made for this kind of task. * The patch + sed hack to build py-qt4-dbussupport has been replaced by only extracting the dbus/ directory for that port and excluding it from all others. * Move the bulk of the code in all Makefiles to bsd.pyqt.mk, like the non-Python Qt ports do with bsd.qt.mk and the QT_DIST variable. A large portion of all PyQt Makefiles were very similar and contained a lot of boilerplate code that can be shared among all of them since they all come from the same tarball. bsd.pyqt.mk now has a PYQT4_DIST variable that, when set, automatically sets several common variables and the do-configure target for a port. This allows us to considerably reduce the size of all the py-qt4-* Makefiles. * To make the above possible and also to allow us to use as many OPTIONS helpers as possible, the ARGS variable is now called CONFIGURE_ARGS. That's what it was used for anyway. PR: 191990 Modified: head/databases/py-qt4-sql/Makefile head/databases/sqliteman/Makefile head/databases/tora/Makefile head/devel/p5-perlqt/Makefile head/devel/py-qt4-assistant/Makefile head/devel/py-qt4-core/Makefile head/devel/py-qt4-core/files/patch-configure.py head/devel/py-qt4-dbus/Makefile head/devel/py-qt4-dbussupport/Makefile head/devel/py-qt4-declarative/Makefile head/devel/py-qt4-designer/Makefile head/devel/py-qt4-designerplugin/Makefile head/devel/py-qt4-help/Makefile head/devel/py-qt4-qscintilla2/Makefile head/devel/py-qt4-qscintilla2/pkg-plist head/devel/py-qt4-script/Makefile head/devel/py-qt4-scripttools/Makefile head/devel/py-qt4-test/Makefile head/devel/py-qt4/Makefile head/devel/py-qt4/bsd.pyqt.mk head/devel/py-qt4/distinfo head/devel/py-sip/Makefile head/devel/py-sip/distinfo head/devel/qscintilla2/Makefile head/devel/qscintilla2/distinfo head/devel/qscintilla2/pkg-plist head/devel/ruby-qtruby/Makefile head/devel/smokeqt/Makefile head/devel/universalindentgui/Makefile head/graphics/py-qt4-svg/Makefile head/math/octave/Makefile head/misc/py-qt4-demo/Makefile head/misc/py-qt4-demo/pkg-plist head/multimedia/py-qt4-multimedia/Makefile head/multimedia/py-qt4-phonon/Makefile head/net/py-qt4-network/Makefile head/textproc/py-qt4-xml/Makefile head/textproc/py-qt4-xmlpatterns/Makefile head/www/py-qt4-webkit/Makefile head/x11-toolkits/py-qt4-gui/Makefile head/x11-toolkits/py-qt4-gui/pkg-plist head/x11/leechcraft/Makefile head/x11/py-qt4-opengl/Makefile head/x11/py-qt4-opengl/pkg-plist Modified: head/databases/py-qt4-sql/Makefile ============================================================================== --- head/databases/py-qt4-sql/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/databases/py-qt4-sql/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,13 +2,8 @@ # $FreeBSD$ PORTNAME= sql -PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtSql module @@ -16,47 +11,19 @@ COMMENT= Python bindings for the Qt4 too BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtSql +PYQT4_DIST= yes USE_QT4= moc_build gui sql qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtSql API for QScintilla2 +OPTIONS_SUB= yes -PATCHDIR= ${.CURDIR}/../../devel/py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --enable QtSql \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtSql API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - .include <bsd.port.mk> Modified: head/databases/sqliteman/Makefile ============================================================================== --- head/databases/sqliteman/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/databases/sqliteman/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -3,7 +3,7 @@ PORTNAME= sqliteman PORTVERSION= 1.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MASTER_SITES= SF Modified: head/databases/tora/Makefile ============================================================================== --- head/databases/tora/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/databases/tora/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -3,7 +3,7 @@ PORTNAME= tora PORTVERSION= 2.1.3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SF Modified: head/devel/p5-perlqt/Makefile ============================================================================== --- head/devel/p5-perlqt/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/p5-perlqt/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,6 +2,7 @@ PORTNAME= perlqt PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde perl5 MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src PKGNAMEPREFIX= p5- Modified: head/devel/py-qt4-assistant/Makefile ============================================================================== --- head/devel/py-qt4-assistant/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-assistant/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= assistant -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtAssistant module @@ -16,48 +12,19 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtAssistant +PYQT4_DIST= yes USE_QT4= assistantclient moc_build qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtAssistant API for QScintilla2 +OPTIONS_SUB= yes -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --enable QtAssistant \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtAssistant API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - .include <bsd.port.mk> Modified: head/devel/py-qt4-core/Makefile ============================================================================== --- head/devel/py-qt4-core/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-core/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,13 +2,8 @@ # $FreeBSD$ PORTNAME= core -PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtCore module @@ -16,45 +11,24 @@ COMMENT= Python bindings for the Qt4 too BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip RUN_DEPENDS:= ${BUILD_DEPENDS} -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes +CONFIGURE_ARGS= --enable QtCore +PYQT4_DIST= yes PYTHON_PY3K_PLIST_HACK= yes -USE_PYTHON= yes -USE_QT4= corelib qmake_build moc_build +USE_QT4= corelib qmake_build moc_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtCore API for QScintilla2 +OPTIONS_SUB= yes -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --enable QtCore \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtCore API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.pre.mk> -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - # Bug 180467: We need to remove the port_v${VERSION} directory that does not # correspond to the Python version being used to avoid failures in the # bytecompilation calls in post-install. @@ -66,23 +40,13 @@ post-patch: ${RM} -rf ${WRKSRC}/pyuic/uic/port_v2 .endif -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - -post-configure: - ${REINPLACE_CMD} -e 's|^CC.*|CC = ${CC}|' \ - -e 's|^CXX.*|CXX = ${CXX}|' \ - -e 's|^LINK.*|LINK = ${CXX}|' \ - -e 's|^CFLAGS|CXXFLAGS|' \ - ${WRKSRC}/qpy/QtCore/Makefile - post-install: - ${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ - cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ - ${PYTHON_CMD} ${PYTHON_LIBDIR}/py_compile.py\ - `ls *.py */*.py */*/*.py` &&\ - ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/py_compile.py\ - `ls *.py */*.py */*/*.py` + ${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 .include <bsd.port.post.mk> Modified: head/devel/py-qt4-core/files/patch-configure.py ============================================================================== --- head/devel/py-qt4-core/files/patch-configure.py Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-core/files/patch-configure.py Wed Jul 23 19:53:11 2014 (r362721) @@ -1,6 +1,6 @@ ---- configure.py.orig 2014-06-06 00:15:32.000000000 +0300 -+++ configure.py 2014-06-06 00:20:20.000000000 +0300 -@@ -342,7 +342,7 @@ +--- configure.py.orig 2014-07-03 17:00:02.000000000 +0300 ++++ configure.py 2014-07-19 23:51:03.000000000 +0300 +@@ -343,7 +343,7 @@ # Note that the order in which we check is important for the # consolidated module - a module's dependencies must be checked first. @@ -9,7 +9,7 @@ check_module("QtGui", "qwidget.h", "new QWidget()") check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") -@@ -371,8 +371,8 @@ +@@ -372,8 +372,8 @@ check_module("QtTest", "QtTest", "QTest::qSleep(0)") check_module("QtWebKit", "qwebpage.h", "new QWebPage()") check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()") @@ -20,7 +20,7 @@ check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs, extra_libs=ass_libs) -@@ -636,21 +636,6 @@ +@@ -635,21 +635,6 @@ if opts.staticplugins: sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins)) @@ -42,7 +42,7 @@ def _qpy_directories(self, mname, lib_name): """Return a 3-tuple of the directories containing the header files, the directory containing the library, and the name of the support library -@@ -741,6 +726,9 @@ +@@ -740,6 +725,9 @@ return libs, libdirs def module_installs(self): @@ -52,7 +52,7 @@ return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"] def qpy_libs(self): -@@ -876,76 +864,78 @@ +@@ -875,80 +863,82 @@ makefile.generate() tool.append("elementtree") @@ -60,23 +60,28 @@ - # previews work properly and normal console use will work anyway), but - # not on Windows (so that normal console use will work). - sipconfig.inform("Creating pyuic4 wrapper...") -- -- if sys.platform == 'darwin': -- gui = True -- use_arch = opts.use_arch -- else: -- gui = False -- use_arch = '' + if "QtCore" in pyqt_modules: + # Create the pyuic4 wrapper. Use the GUI version on MacOS (so that + # previews work properly and normal console use will work anyway), but + # not on Windows (so that normal console use will work). + sipconfig.inform("Creating pyuic4 wrapper...") -+ + +- if sys.platform == 'darwin': +- gui = True + if sys.platform == 'darwin': + gui = True -+ use_arch = opts.use_arch -+ else: + +- if opts.use_arch is None: +- use_arch = '' ++ if opts.use_arch is None: ++ use_arch = '' ++ else: ++ use_arch = ' '.join(opts.use_arch) + else: +- use_arch = ' '.join(opts.use_arch) +- else: +- gui = False +- use_arch = '' + gui = False + use_arch = '' @@ -164,24 +169,24 @@ + arch=sipcfg.arch, + deployment_target=sipcfg.deployment_target + ) ++ ++ makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate")) ++ ++ if cxxflags_app != "": ++ makefile.extra_cxxflags.append(cxxflags_app) ++ ++ makefile.generate() ++ tool.append("pylupdate") - makefile = pyrccMakefile() -+ makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate")) ++ sipconfig.inform("Creating pyrcc4 Makefile...") - if cxxflags_app != "": - makefile.extra_cxxflags.append(cxxflags_app) -+ if cxxflags_app != "": -+ makefile.extra_cxxflags.append(cxxflags_app) ++ makefile = pyrccMakefile() - makefile.generate() - tool.append("pyrcc") -+ makefile.generate() -+ tool.append("pylupdate") -+ -+ sipconfig.inform("Creating pyrcc4 Makefile...") -+ -+ makefile = pyrccMakefile() -+ + if cxxflags_app != "": + makefile.extra_cxxflags.append(cxxflags_app) + @@ -190,7 +195,7 @@ if opts.designer_plugin and "QtDesigner" in pyqt_modules: py_major = sipcfg.py_version >> 16 -@@ -972,9 +962,6 @@ +@@ -975,9 +965,6 @@ # include the ABI information. abi = "" else: @@ -199,8 +204,8 @@ - if dynamic_pylib: if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)): lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) - elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)): -@@ -985,9 +972,6 @@ + elif 'MULTIARCH' in ducfg and glob.glob('%s/lib/%s/libpython%d.%d*' % (ducfg['exec_prefix'], ducfg['MULTIARCH'], py_major, py_minor)): +@@ -990,9 +977,6 @@ opts.designer_plugin = False link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi) @@ -210,33 +215,7 @@ pysh_lib = ducfg.get("LDLIBRARY", "") -@@ -1380,6 +1364,7 @@ - def check_dbus(): - """See if the DBus support module should be built. - """ -+ return # Kill search for dbus. Search key: 6f29b27e48 - sipconfig.inform("Checking to see if the dbus support module should be built...") - - sout = get_command_stdout("pkg-config --cflags-only-I --libs dbus-1") -@@ -1988,6 +1973,7 @@ - sipcfg.qt_framework = qt_framework - sipcfg.qt_threaded = 1 - sipcfg.qt_dir = qt_dir -+ sipcfg.qt_data_dir = qt_datadir - sipcfg.qt_lib_dir = qt_libdir - - return ConfigurePyQt4(generator) -@@ -2323,6 +2309,9 @@ - p.print_help() - sys.exit(2) - -+ # Avoid picking up the Qt3 headers instead -+ macros['INCDIR'] = '.' -+ - sipcfg.set_build_macros(macros) - - # Check Qt is what we need. -@@ -2364,9 +2353,9 @@ +@@ -2301,9 +2285,9 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] if opts.api: @@ -248,12 +227,3 @@ if opts.bigqt: xtra_modules.append("_qt") -@@ -2379,7 +2368,7 @@ - - sipconfig.ParentMakefile( - configuration=sipcfg, -- subdirs=pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools(), -+ subdirs=pyqt.qpy_libs() + [pyqt_modules[-1]] + xtra_modules + pyqt.tools(), - installs=installs - ).generate() - Modified: head/devel/py-qt4-dbus/Makefile ============================================================================== --- head/devel/py-qt4-dbus/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-dbus/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= dbus -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDBus module @@ -17,54 +13,19 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \ ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtDBus +PYQT4_DIST= yes USE_QT4= dbus moc_build qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtDBus API for QScintilla2 +OPTIONS_SUB= yes -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --enable QtDBus \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtDBus API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - -post-configure: - ${REINPLACE_CMD} -e 's|^CC.*|CC = ${CC}|' \ - -e 's|^CXX.*|CXX = ${CXX}|' \ - -e 's|^LINK.*|LINK = ${CXX}|' \ - -e 's|^CFLAGS|CXXFLAGS|' \ - ${WRKSRC}/qpy/QtDBus/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-dbussupport/Makefile ============================================================================== --- head/devel/py-qt4-dbussupport/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-dbussupport/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -1,11 +1,7 @@ # $FreeBSD$ PORTNAME= dbussupport -PORTVERSION= ${PYQT4_VERSION} CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, D-BUS module @@ -17,39 +13,18 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \ ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes +CONFIGURE_ARGS= --enable QtCore +PYQT4_DIST= yes USES= pkgconfig -USE_PYTHON= yes USE_QT4= corelib qmake_build moc_build +OPTIONS_DEFINE= DEBUG +DEBUG_CONFIGURE_ON= --debug --trace + BUILD_WRKSRC= ${WRKSRC}/dbus INSTALL_WRKSRC= ${WRKSRC}/dbus -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --enable QtCore \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" - PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -post-patch: - ${REINPLACE_CMD} -e '/6f29b27e48/d' ${WRKSRC}/configure.py - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - .include <bsd.port.mk> Modified: head/devel/py-qt4-declarative/Makefile ============================================================================== --- head/devel/py-qt4-declarative/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-declarative/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -1,11 +1,7 @@ # $FreeBSD$ PORTNAME= declarative -PORTVERSION= ${PYQT4_VERSION} CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDeclarative module @@ -14,54 +10,19 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtDeclarative +PYQT4_DIST= yes USE_QT4= declarative qmake_build moc_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtDeclarative API for QScintilla2 +OPTIONS_SUB= yes -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --enable QtDeclarative \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtDeclarative API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - -post-configure: - ${REINPLACE_CMD} -e 's|^CC.*|CC = ${CC}|' \ - -e 's|^CXX.*|CXX = ${CXX}|' \ - -e 's|^LINK.*|LINK = ${CXX}|' \ - -e 's|^CFLAGS|CXXFLAGS|' \ - ${WRKSRC}/qpy/QtDeclarative/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-designer/Makefile ============================================================================== --- head/devel/py-qt4-designer/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-designer/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= designer -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDesigner module @@ -17,55 +13,19 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \ ${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin +PYQT4_DIST= yes USE_QT4= gui xml designer moc_build qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtDesigner API for QScintilla2 +OPTIONS_SUB= yes -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --no-designer-plugin \ - --enable QtDesigner \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtDesigner API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - -post-configure: - ${REINPLACE_CMD} -e 's|^CC.*|CC = ${CC}|' \ - -e 's|^CXX.*|CXX = ${CXX}|' \ - -e 's|^LINK.*|LINK = ${CXX}|' \ - -e 's|^CFLAGS|CXXFLAGS|' \ - ${WRKSRC}/qpy/QtDesigner/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-designerplugin/Makefile ============================================================================== --- head/devel/py-qt4-designerplugin/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-designerplugin/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,13 +2,8 @@ # $FreeBSD$ PORTNAME= designerplugin -PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDesigner plugin @@ -19,34 +14,13 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}designer>=$ BUILD_WRKSRC= ${WRKSRC}/designer INSTALL_WRKSRC= ${WRKSRC}/designer -# For staging support. -# TODO: Once all the PyQt ports start using configure-ng.py, this can be -# moved to bsd.pyqt.mk itself. +CONFIGURE_ARGS= --enable QtDesigner DESTDIRNAME= INSTALL_ROOT - -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +PYQT4_DIST= yes USE_QT4= gui xml designer moc_build qmake_build -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --enable QtDesigner \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +OPTIONS_DEFINE= DEBUG +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - .include <bsd.port.mk> Modified: head/devel/py-qt4-help/Makefile ============================================================================== --- head/devel/py-qt4-help/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-help/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -1,11 +1,7 @@ # $FreeBSD$ PORTNAME= help -PORTVERSION= ${PYQT4_VERSION} CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtHelp module @@ -13,47 +9,19 @@ COMMENT= Python bindings for the Qt4 too BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtHelp +PYQT4_DIST= yes USE_QT4= help moc_build qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtHelp API for QScintilla2 +OPTIONS_SUB= yes -PATCHDIR= ${.CURDIR}/../py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -SIPDIR= ${PREFIX}/share/py-sip -QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= -b ${PREFIX}/bin \ - -d ${PYTHONPREFIX_SITELIBDIR} \ - -p ${PREFIX}/${QT_PLUGINDIR_REL} \ - -q ${QMAKE} \ - --confirm-license \ - --sipdir ${SIPDIR} \ - --enable QtHelp \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtHelp API for QScintilla2 +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_OFF= --no-qsci-api +API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 +DEBUG_CONFIGURE_ON= --debug --trace .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= --no-qsci-api -PLIST_SUB+= API="@comment " -.else -LIB_DEPENDS+= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} - .include <bsd.port.mk> Modified: head/devel/py-qt4-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt4-qscintilla2/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-qscintilla2/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -18,45 +18,28 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui RUN_DEPENDS:= ${BUILD_DEPENDS} -# For staging support. -# TODO: Once all the PyQt ports start using configure-ng.py, this can be -# moved to bsd.pyqt.mk itself. DESTDIRNAME= INSTALL_ROOT - DISTINFO_FILE= ${QSCI2_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= yes USE_QT4= gui moc_build qmake_build +QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. -OPTIONS_DEFINE= API -OPTIONS_DEFAULT=API -API_DESC= Install binding API for QScintilla2 +OPTIONS_DEFINE= DEBUG +DEBUG_CONFIGURE_ON= --debug --trace OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci -ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ - --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} +CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ + --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MAPI) -ARGS+= -a /dev/null -PLIST_SUB+= API="@comment " -.else -ARGS+= -a ${QSCIDIR} -PLIST_SUB+= API="" -.endif - -.if defined(WITH_DEBUG) -ARGS+= -u -r -.endif do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} + ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} .include <bsd.port.mk> Modified: head/devel/py-qt4-qscintilla2/pkg-plist ============================================================================== --- head/devel/py-qt4-qscintilla2/pkg-plist Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-qscintilla2/pkg-plist Wed Jul 23 19:53:11 2014 (r362721) @@ -5,9 +5,11 @@ 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/qscilexeravs.sip share/py-sip/Qsci/qscilexerbash.sip share/py-sip/Qsci/qscilexerbatch.sip share/py-sip/Qsci/qscilexercmake.sip +share/py-sip/Qsci/qscilexercoffeescript.sip share/py-sip/Qsci/qscilexercpp.sip share/py-sip/Qsci/qscilexercsharp.sip share/py-sip/Qsci/qscilexercss.sip @@ -26,6 +28,7 @@ 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/qscilexerpo.sip share/py-sip/Qsci/qscilexerpostscript.sip share/py-sip/Qsci/qscilexerpov.sip share/py-sip/Qsci/qscilexerproperties.sip @@ -50,6 +53,6 @@ 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 +share/qt4/qsci/api/python/QScintilla2.api @dirrm share/py-sip/Qsci @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 Modified: head/devel/py-qt4-script/Makefile ============================================================================== --- head/devel/py-qt4-script/Makefile Wed Jul 23 19:29:58 2014 (r362720) +++ head/devel/py-qt4-script/Makefile Wed Jul 23 19:53:11 2014 (r362721) @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= script -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= devel python -MASTER_SITES= ${MASTER_SITES_PYQT4} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtScript module @@ -15,47 +11,19 @@ COMMENT= Python bindings for the Qt4 too BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtScript *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407231953.s6NJrBf7044188>