Date: Sun, 3 Feb 2013 18:16:08 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311475 - in head: databases/py-qt4-sql devel devel/py-qt4 devel/py-qt4-assistant devel/py-qt4-core devel/py-qt4-core/files devel/py-qt4-dbus devel/py-qt4-dbussupport devel/py-qt4-decla... Message-ID: <201302031816.r13IG8bC080299@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Sun Feb 3 18:16:07 2013 New Revision: 311475 URL: http://svnweb.freebsd.org/changeset/ports/311475 Log: KDE/FreeBSD team presents: SIP 4.14.3 QScintilla 2.7 PyQt 4.9.6 The area51 repository features commits by jhale and myself. Changes: - Trim Makefile header - Convert to new option framework Added: head/devel/py-qt4-dbussupport/ - copied from r311474, head/devel/py-qt4-dbus/ head/devel/py-qt4/bsd.pyqt.mk (contents, props changed) - copied, changed from r311474, head/devel/py-sip/files/bsd.pyqt.mk Deleted: head/devel/py-qt4-dbussupport/pkg-plist head/devel/py-sip/files/ head/misc/py-qt4-demo/pkg-plist head/misc/py-qt4-doc/pkg-plist Modified: head/databases/py-qt4-sql/Makefile (contents, props changed) head/databases/py-qt4-sql/pkg-descr (contents, props changed) head/devel/Makefile head/devel/py-qt4-assistant/Makefile (contents, props changed) head/devel/py-qt4-assistant/pkg-descr (contents, props changed) head/devel/py-qt4-core/Makefile (contents, props changed) head/devel/py-qt4-core/files/patch-configure.py (contents, props changed) head/devel/py-qt4-core/pkg-descr (contents, props changed) head/devel/py-qt4-core/pkg-plist (contents, props changed) head/devel/py-qt4-dbus/Makefile (contents, props changed) head/devel/py-qt4-dbus/pkg-descr (contents, props changed) head/devel/py-qt4-dbus/pkg-plist (contents, props changed) head/devel/py-qt4-dbussupport/Makefile (contents, props changed) head/devel/py-qt4-dbussupport/pkg-descr (contents, props changed) head/devel/py-qt4-declarative/Makefile (contents, props changed) head/devel/py-qt4-declarative/pkg-descr (contents, props changed) head/devel/py-qt4-designer/Makefile (contents, props changed) head/devel/py-qt4-designer/pkg-descr (contents, props changed) head/devel/py-qt4-designerplugin/Makefile (contents, props changed) head/devel/py-qt4-designerplugin/pkg-descr (contents, props changed) head/devel/py-qt4-help/Makefile (contents, props changed) head/devel/py-qt4-help/pkg-descr (contents, props changed) head/devel/py-qt4-qscintilla2/Makefile (contents, props changed) head/devel/py-qt4-qscintilla2/pkg-descr (contents, props changed) head/devel/py-qt4-script/Makefile (contents, props changed) head/devel/py-qt4-script/pkg-descr (contents, props changed) head/devel/py-qt4-scripttools/Makefile (contents, props changed) head/devel/py-qt4-scripttools/pkg-descr (contents, props changed) head/devel/py-qt4-test/Makefile (contents, props changed) head/devel/py-qt4-test/pkg-descr (contents, props changed) head/devel/py-qt4/Makefile (contents, props changed) head/devel/py-qt4/distinfo (contents, props changed) head/devel/py-qt4/pkg-descr (contents, props changed) head/devel/py-sip/Makefile (contents, props changed) head/devel/py-sip/distinfo (contents, props changed) head/devel/qscintilla2-designerplugin/Makefile (contents, props changed) head/devel/qscintilla2/Makefile head/devel/qscintilla2/distinfo (contents, props changed) head/devel/qscintilla2/pkg-plist (contents, props changed) head/graphics/py-qt4-svg/Makefile (contents, props changed) head/graphics/py-qt4-svg/pkg-descr (contents, props changed) head/misc/py-qt4-demo/Makefile (contents, props changed) head/misc/py-qt4-demo/pkg-descr (contents, props changed) head/misc/py-qt4-doc/Makefile (contents, props changed) head/misc/py-qt4-doc/pkg-descr (contents, props changed) head/multimedia/py-qt4-multimedia/Makefile (contents, props changed) head/multimedia/py-qt4-multimedia/pkg-descr (contents, props changed) head/multimedia/py-qt4-phonon/Makefile (contents, props changed) head/multimedia/py-qt4-phonon/pkg-descr (contents, props changed) head/net/py-qt4-network/Makefile (contents, props changed) head/net/py-qt4-network/pkg-descr (contents, props changed) head/net/py-qt4-network/pkg-plist (contents, props changed) head/textproc/py-qt4-xml/Makefile (contents, props changed) head/textproc/py-qt4-xml/pkg-descr (contents, props changed) head/textproc/py-qt4-xmlpatterns/Makefile (contents, props changed) head/textproc/py-qt4-xmlpatterns/pkg-descr (contents, props changed) head/www/py-qt4-webkit/Makefile (contents, props changed) head/www/py-qt4-webkit/pkg-descr (contents, props changed) head/www/py-qt4-webkit/pkg-plist (contents, props changed) head/x11-toolkits/py-qt4-gui/Makefile (contents, props changed) head/x11-toolkits/py-qt4-gui/pkg-descr (contents, props changed) head/x11-toolkits/py-qt4-gui/pkg-plist (contents, props changed) head/x11/py-qt4-opengl/Makefile (contents, props changed) head/x11/py-qt4-opengl/pkg-descr (contents, props changed) Modified: head/databases/py-qt4-sql/Makefile ============================================================================== --- head/databases/py-qt4-sql/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/databases/py-qt4-sql/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-sql -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= sql PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -24,46 +20,42 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= sql qmake_build -OPTIONS= API "Install QtSql API for QScintilla2" on +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtSql API for QScintilla2 -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../../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 \ --sipdir ${SIPDIR} \ - --enable QtSql + --enable QtSql \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -.include "../../devel/py-sip/files/bsd.pyqt.mk" +.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> -.if defined(WITHOUT_API) +.if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " .else -LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2:${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|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/QtSql/Makefile - .include <bsd.port.mk> Modified: head/databases/py-qt4-sql/pkg-descr ============================================================================== --- head/databases/py-qt4-sql/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/databases/py-qt4-sql/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the QtSql module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -3565,6 +3565,7 @@ SUBDIR += py-qt4-assistant SUBDIR += py-qt4-core SUBDIR += py-qt4-dbus + SUBDIR += py-qt4-dbussupport SUBDIR += py-qt4-declarative SUBDIR += py-qt4-designer SUBDIR += py-qt4-designerplugin Modified: head/devel/py-qt4-assistant/Makefile ============================================================================== --- head/devel/py-qt4-assistant/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-assistant/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-assistant -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= assistant PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -25,46 +21,43 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= assistantclient qmake_build -OPTIONS= API "Install QtAssistant API for QScintilla2" on +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtAssistant API for QScintilla2 -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../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 \ --sipdir ${SIPDIR} \ - --enable QtAssistant + --enable QtAssistant \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -.include "../py-sip/files/bsd.pyqt.mk" +.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> -.if defined(WITHOUT_API) + +.if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " .else -LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2:${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|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/QtAssistant/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-assistant/pkg-descr ============================================================================== --- head/devel/py-qt4-assistant/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-assistant/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. -This package provides the QAssistant module. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. +This package provides the QtAssistant module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-core/Makefile ============================================================================== --- head/devel/py-qt4-core/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-core/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-core -# Date created: 2007-02-19 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= core PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -24,49 +20,52 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= corelib qmake_build moc_build -OPTIONS= API "Install QtCore API for QScintilla2" on +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtCore API for QScintilla2 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 \ --sipdir ${SIPDIR} \ - --enable QtCore + --enable QtCore \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -.include "../py-sip/files/bsd.pyqt.mk" +.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> -.if defined(WITHOUT_API) +.if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " .else -LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} PLIST_SUB+= API="" .endif -post-extract: - rm -rf ${WRKSRC}/pyuic/uic/port_v3 +.if defined(WITH_DEBUG) +ARGS+= --debug --trace +.endif + +post-patch: + ${RM} -rf ${WRKSRC}/pyuic/uic/port_v3 do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ ${PYTHON_CMD} configure.py ${ARGS} post-configure: - ${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/QtCore/Makefile + ${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 ${PYTHONPREFIX_SITELIBDIR}/PyQt4 &&\ Modified: head/devel/py-qt4-core/files/patch-configure.py ============================================================================== --- head/devel/py-qt4-core/files/patch-configure.py Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-core/files/patch-configure.py Sun Feb 3 18:16:07 2013 (r311475) @@ -1,6 +1,6 @@ ---- ./configure.py.orig 2011-08-02 06:18:51.000000000 -0300 -+++ ./configure.py 2011-09-11 16:22:52.000000000 -0300 -@@ -352,7 +352,7 @@ +--- ./configure.py.orig 2012-06-26 09:09:24.000000000 -0400 ++++ ./configure.py 2012-08-30 22:06:19.000000000 -0400 +@@ -358,7 +358,7 @@ # Note that the order in which we check is important for the # consolidated module - a module's dependencies must be checked first. @@ -8,8 +8,8 @@ + check_module("QtCore", "qobject.h", "new QObject()") check_module("QtGui", "qwidget.h", "new QWidget()") - check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") -@@ -627,21 +627,6 @@ + if qt_version < 0x050000: check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") +@@ -648,21 +648,6 @@ if opts.staticplugins: sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins)) @@ -31,7 +31,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 -@@ -732,6 +717,9 @@ +@@ -756,6 +741,9 @@ return libs, libdirs def module_installs(self): @@ -41,7 +41,7 @@ return [os.path.join(src_dir, "__init__.py"), "pyqtconfig.py"] def qpy_libs(self): -@@ -861,40 +849,41 @@ +@@ -888,40 +876,41 @@ makefile.generate() tool.append("elementtree") @@ -49,19 +49,18 @@ - # 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 "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 - 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 + use_arch = opts.use_arch @@ -112,16 +111,17 @@ if "QtXml" in pyqt_modules: sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -945,7 +934,7 @@ - # We need to work out how to specify the right framework - # version. - link = "-framework Python" -- elif "--enable-shared" in ducfg.get("CONFIG_ARGS", ""): -+ else: +@@ -977,9 +966,6 @@ + # include the ABI information. + abi = "" + else: +- dynamic_pylib = "--enable-shared" in config_args +- +- 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)): -@@ -955,9 +944,6 @@ +@@ -990,9 +976,6 @@ opts.designer_plugin = False link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi) @@ -131,7 +131,23 @@ pysh_lib = ducfg.get("LDLIBRARY", "") -@@ -2205,6 +2191,9 @@ +@@ -1378,6 +1361,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") +@@ -1954,6 +1938,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) +@@ -2273,6 +2258,9 @@ p.print_help() sys.exit(2) @@ -141,7 +157,7 @@ sipcfg.set_build_macros(macros) # Check Qt is what we need. -@@ -2234,9 +2223,9 @@ +@@ -2302,9 +2290,9 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] if opts.api: @@ -153,7 +169,7 @@ if opts.bigqt: xtra_modules.append("_qt") -@@ -2249,7 +2238,7 @@ +@@ -2317,7 +2305,7 @@ sipconfig.ParentMakefile( configuration=sipcfg, Modified: head/devel/py-qt4-core/pkg-descr ============================================================================== --- head/devel/py-qt4-core/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-core/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the QtCore module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-core/pkg-plist ============================================================================== --- head/devel/py-qt4-core/pkg-plist Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-core/pkg-plist Sun Feb 3 18:16:07 2013 (r311475) @@ -21,9 +21,9 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_metaclass.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_metaclass.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_metaclass.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.pyo @@ -125,6 +125,7 @@ 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/qfiledevice.sip share/py-sip/QtCore/qfileinfo.sip share/py-sip/QtCore/qfilesystemwatcher.sip share/py-sip/QtCore/qfinalstate.sip @@ -187,6 +188,7 @@ 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/qurlquery.sip share/py-sip/QtCore/quuid.sip share/py-sip/QtCore/qvariant.sip share/py-sip/QtCore/qvariantanimation.sip Modified: head/devel/py-qt4-dbus/Makefile ============================================================================== --- head/devel/py-qt4-dbus/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-dbus/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-dbus -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= dbus PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -14,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org -COMMENT= Python bindings for the Qt4 toolkit, D-BUS module +COMMENT= Python bindings for the Qt4 toolkit, QtDBus module BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus @@ -24,37 +20,51 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ -USE_QT4= corelib qmake_build moc_build -USE_XORG= x11 xext +USE_QT4= dbus qmake_build -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtDBus API for QScintilla2 -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../py-qt4-core/files OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" +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 \ - --enable QtCore + --sipdir ${SIPDIR} \ + --enable QtDBus \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" + +.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+= qscintilla2:${PORTSDIR}/devel/qscintilla2 +ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} +PLIST_SUB+= API="" +.endif .if defined(WITH_DEBUG) ARGS+= --debug --trace .endif -.include "../py-sip/files/bsd.pyqt.mk" - do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ ${PYTHON_CMD} configure.py ${ARGS} post-configure: - ${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/dbus/Makefile + ${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-dbus/pkg-descr ============================================================================== --- head/devel/py-qt4-dbus/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-dbus/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the D-BUS module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-dbus/pkg-plist ============================================================================== --- head/devel/py-qt4-dbus/pkg-plist Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-dbus/pkg-plist Sun Feb 3 18:16:07 2013 (r311475) @@ -1 +1,19 @@ -%%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so +%%PYTHON_SITELIBDIR%%/PyQt4/QtDBus.so +share/py-sip/QtDBus/QtDBusmod.sip +share/py-sip/QtDBus/qdbusabstractadaptor.sip +share/py-sip/QtDBus/qdbusabstractinterface.sip +share/py-sip/QtDBus/qdbusargument.sip +share/py-sip/QtDBus/qdbusconnection.sip +share/py-sip/QtDBus/qdbusconnectioninterface.sip +share/py-sip/QtDBus/qdbuserror.sip +share/py-sip/QtDBus/qdbusextratypes.sip +share/py-sip/QtDBus/qdbusinterface.sip +share/py-sip/QtDBus/qdbusmessage.sip +share/py-sip/QtDBus/qdbuspendingcall.sip +share/py-sip/QtDBus/qdbusservicewatcher.sip +share/py-sip/QtDBus/qdbusunixfiledescriptor.sip +share/py-sip/QtDBus/qpydbuspendingreply.sip +share/py-sip/QtDBus/qpydbusreply.sip +%%API%%share/qt4/qsci/api/python/QtDBus.api +@dirrm share/py-sip/QtDBus +@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 Modified: head/devel/py-qt4-dbussupport/Makefile ============================================================================== --- head/devel/py-qt4-dbus/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-dbussupport/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,13 +1,7 @@ -# New ports collection makefile for: py-qt4-dbus -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# # $FreeBSD$ -PORTNAME= dbus +PORTNAME= dbussupport PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 -PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- @@ -16,6 +10,8 @@ DISTNAME= ${PYQT4_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, D-BUS module +CONFLICTS_INSTALL= py*-qt4-dbus-4.9.1* + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \ @@ -23,38 +19,37 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} HAS_CONFIGURE= yes +USE_PKGCONFIG= build USE_PYTHON= 2.5+ USE_QT4= corelib qmake_build moc_build -USE_XORG= x11 xext -BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} -INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} +BUILD_WRKSRC= ${WRKSRC}/dbus +INSTALL_WRKSRC= ${WRKSRC}/dbus -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../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 \ - --enable QtCore + --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 -.include "../py-sip/files/bsd.pyqt.mk" +post-patch: + ${REINPLACE_CMD} -e '/6f29b27e48/d' ${WRKSRC}/configure.py do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ ${PYTHON_CMD} configure.py ${ARGS} -post-configure: - ${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/dbus/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-dbussupport/pkg-descr ============================================================================== --- head/devel/py-qt4-dbus/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-dbussupport/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the D-BUS module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-declarative/Makefile ============================================================================== --- head/devel/py-qt4-declarative/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-declarative/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,7 @@ -# New ports collection makefile for: py-qt4-declarative -# Date created: 2010-11-05 -# Whom: Max Brazhnikov <makc@FreeBSD.org> -# # $FreeBSD$ PORTNAME= declarative PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- @@ -24,46 +19,49 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= declarative qmake_build moc_build -OPTIONS= API "Install QtDeclarative API for QScintilla2" on +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtDeclarative API for QScintilla2 -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../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 \ --sipdir ${SIPDIR} \ - --enable QtDeclarative + --enable QtDeclarative \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -.include "../py-sip/files/bsd.pyqt.mk" +.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> -.if defined(WITHOUT_API) +.if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " .else -LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2:${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|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/QtDeclarative/Makefile + ${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-declarative/pkg-descr ============================================================================== --- head/devel/py-qt4-declarative/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-declarative/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the QtDeclarative module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-designer/Makefile ============================================================================== --- head/devel/py-qt4-designer/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-designer/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-designer -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= designer PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -26,13 +22,14 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= gui xml designer moc_build qmake_build -OPTIONS= API "Install QtDesigner API for QScintilla2" on +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtDesigner API for QScintilla2 -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../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} \ @@ -40,33 +37,35 @@ ARGS= -b ${PREFIX}/bin \ --confirm-license \ --sipdir ${SIPDIR} \ --no-designer-plugin \ - --enable QtDesigner + --enable QtDesigner \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -.include "../py-sip/files/bsd.pyqt.mk" +.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> -.if defined(WITHOUT_API) +.if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " .else -LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2:${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|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/QtDesigner/Makefile + ${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-designer/pkg-descr ============================================================================== --- head/devel/py-qt4-designer/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-designer/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the QtDesigner module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-designerplugin/Makefile ============================================================================== --- head/devel/py-qt4-designerplugin/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-designerplugin/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-designerplugin -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= designerplugin PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -27,30 +23,24 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= gui xml designer moc_build qmake_build -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files -OPTIONSFILE?= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options -CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" +PATCHDIR= ${.CURDIR}/../py-qt4-core/files ARGS= -b ${PREFIX}/bin \ -d ${PYTHONPREFIX_SITELIBDIR} \ -p ${PREFIX}/${QT_PLUGINDIR_REL} \ -q ${QMAKE} \ --confirm-license \ - --enable QtDesigner + --enable QtDesigner \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" + +.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .if defined(WITH_DEBUG) ARGS+= --debug --trace .endif -.include "../py-sip/files/bsd.pyqt.mk" - 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}|'\ - ${WRKSRC}/designer/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-designerplugin/pkg-descr ============================================================================== --- head/devel/py-qt4-designerplugin/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-designerplugin/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the QtDesigner plugin. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-help/Makefile ============================================================================== --- head/devel/py-qt4-help/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-help/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,13 +1,7 @@ -# New ports collection makefile for: py-qt4-help -# Date created: 2009-02-13 -# Whom: Max Brazhnikov <makc@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= help PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- @@ -24,46 +18,42 @@ HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT4= help qmake_build -OPTIONS= API "Install QtHelp API for QScintilla2" on +OPTIONS_DEFINE= API +OPTIONS_DEFAULT=API +API_DESC= Install QtHelp API for QScintilla2 -PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +PATCHDIR= ${.CURDIR}/../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 \ --sipdir ${SIPDIR} \ - --enable QtHelp + --enable QtHelp \ + CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -.if defined(WITH_DEBUG) -ARGS+= --debug --trace -.endif - -.include "../../devel/py-sip/files/bsd.pyqt.mk" +.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.options.mk> -.if defined(WITHOUT_API) +.if empty(PORT_OPTIONS:MAPI) ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " .else -LIB_DEPENDS+= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2:${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|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ - -e 's|CC = cc|CC = ${CC}|'\ - -e 's|CXX = c++|CXX = ${CXX}|'\ - -e 's|LINK = c++|LINK = ${CXX}|'\ - ${WRKSRC}/QtHelp/Makefile - .include <bsd.port.mk> Modified: head/devel/py-qt4-help/pkg-descr ============================================================================== --- head/devel/py-qt4-help/pkg-descr Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-help/pkg-descr Sun Feb 3 18:16:07 2013 (r311475) @@ -1,4 +1,4 @@ -PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +PyQt4 is a set of Python bindings for Digia's Qt4 application framework. This package provides the QtHelp module. WWW: http://www.riverbankcomputing.co.uk/software/pyqt/ Modified: head/devel/py-qt4-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt4-qscintilla2/Makefile Sun Feb 3 17:31:49 2013 (r311474) +++ head/devel/py-qt4-qscintilla2/Makefile Sun Feb 3 18:16:07 2013 (r311475) @@ -1,12 +1,8 @@ -# New ports collection makefile for: py-qt4-qscintilla2 -# Date created: 2007-02-20 -# Whom: Danny Pansters <danny@ricin.com> -# +# Created by: Danny Pansters <danny@ricin.com> # $FreeBSD$ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} @@ -16,7 +12,7 @@ DISTNAME= ${QSCI2_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for QScintilla2 (PyQt4), QSci module -LIB_DEPENDS= qscintilla2.8:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302031816.r13IG8bC080299>