diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-07-23 19:53:11 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-07-23 19:53:11 +0000 |
| commit | c3f9087c486683a6de3d8f1db91050bdb8340e45 (patch) | |
| tree | 4e541e979a7f5bac477f1b27f24bd820268cd256 | |
| parent | 25a105eeedb0ea4d81483bde3499155ebdc93c58 (diff) | |
| download | ports-c3f9087c486683a6de3d8f1db91050bdb8340e45.tar.gz ports-c3f9087c486683a6de3d8f1db91050bdb8340e45.zip | |
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
Notes
Notes:
svn path=/head/; revision=362721
44 files changed, 317 insertions, 1043 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index ebd4d2b529af..fe3fe76c1240 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -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 toolkit, QtSql module 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> diff --git a/databases/sqliteman/Makefile b/databases/sqliteman/Makefile index 6113dd38fe3c..8e62d5ee2354 100644 --- a/databases/sqliteman/Makefile +++ b/databases/sqliteman/Makefile @@ -3,7 +3,7 @@ PORTNAME= sqliteman PORTVERSION= 1.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases MASTER_SITES= SF diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 1af3a52fee36..8bf7b2848af3 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -3,7 +3,7 @@ PORTNAME= tora PORTVERSION= 2.1.3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SF diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile index d2b827869ae8..8f181ff5900f 100644 --- a/devel/p5-perlqt/Makefile +++ b/devel/p5-perlqt/Makefile @@ -2,6 +2,7 @@ PORTNAME= perlqt PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde perl5 MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src PKGNAMEPREFIX= p5- diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index dc918694db69..d4ae24beda34 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -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}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s 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> diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index 4f3cdb30a4fe..8a7f5e887f2d 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -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 toolkit, QtCore module 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> diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py index f1cdd685880e..df37278da5f5 100644 --- a/devel/py-qt4-core/files/patch-configure.py +++ b/devel/py-qt4-core/files/patch-configure.py @@ -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() - diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index 6ed0d72c8928..1d5cdc638966 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -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}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s 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> diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile index 61c0e4c270e8..75e9c6bfef49 100644 --- a/devel/py-qt4-dbussupport/Makefile +++ b/devel/py-qt4-dbussupport/Makefile @@ -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}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s 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> diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile index 89c8ca393e27..a39b521004d0 100644 --- a/devel/py-qt4-declarative/Makefile +++ b/devel/py-qt4-declarative/Makefile @@ -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}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s 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> diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index 710e013a749a..70829764fe70 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -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>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-q ${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> diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index e851393627ae..4e14a7bb3fd4 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -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>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4 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> diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile index 49cda85dd54a..1f43868b4ff0 100644 --- a/devel/py-qt4-help/Makefile +++ b/devel/py-qt4-help/Makefile @@ -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 toolkit, QtHelp module 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> diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index 1a2f2afba929..79b3ef46cc02 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -18,45 +18,28 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-s ${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> diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist index 5c50521bc4cb..fd58a5960880 100644 --- a/devel/py-qt4-qscintilla2/pkg-plist +++ b/devel/py-qt4-qscintilla2/pkg-plist @@ -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 diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index fa3c413131f8..cee85c26bd9f 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -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 toolkit, QtScript module 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 +PYQT4_DIST= yes USE_QT4= moc_build script qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtScript 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 QtScript \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtScript 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> diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile index ea4658b133af..2cb593b0a373 100644 --- a/devel/py-qt4-scripttools/Makefile +++ b/devel/py-qt4-scripttools/Makefile @@ -1,12 +1,8 @@ # $FreeBSD$ PORTNAME= scripttools -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, QtScriptTools module @@ -14,47 +10,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtScriptTools module 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 QtScriptTools +PYQT4_DIST= yes USE_QT4= moc_build scripttools qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtScriptTools 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 QtScriptTools \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtScriptTools 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> diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 9a50a4e725d7..d8858b7a99c4 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -2,13 +2,8 @@ # $FreeBSD$ PORTNAME= test -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, QtTest module @@ -16,47 +11,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtTest module 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 QtTest +PYQT4_DIST= yes USE_QT4= moc_build gui qtestlib qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtTest 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 QtTest \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtTest 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> diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile index 4ecda7b3cdeb..647cc3f764bf 100644 --- a/devel/py-qt4/Makefile +++ b/devel/py-qt4/Makefile @@ -3,7 +3,6 @@ PORTNAME= qt4 PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= # empty PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-qt4/bsd.pyqt.mk b/devel/py-qt4/bsd.pyqt.mk index 4ede21c1a513..fe82606e22ac 100644 --- a/devel/py-qt4/bsd.pyqt.mk +++ b/devel/py-qt4/bsd.pyqt.mk @@ -2,6 +2,11 @@ # # $FreeBSD$ # +# Port variables: +# PYQT4_DIST - This port is part of PyQt4 itself. Variables and +# targets are then set assuming a certain tarball and +# port layout. +# PYQT_MAINTAINER= kde@FreeBSD.org @@ -14,9 +19,9 @@ MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \ MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ ${MASTER_SITE_GENTOO:S,%SUBDIR%,distfiles,} -SIP_VERSION= 4.15.2 -PYQT4_VERSION= 4.10.3 -QSCI2_VERSION= 2.7.2 +SIP_VERSION= 4.16.2 +PYQT4_VERSION= 4.11.1 +QSCI2_VERSION= 2.8.3 SIP_DISTNAME= sip-${SIP_VERSION} PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION} @@ -79,3 +84,39 @@ test_DESC= Python bindings for QtTest module webkit_DESC= Python bindings for QtWebKit module xml_DESC= Python bindings for QtXml module xmlpatterns_DESC= Python bindings for QtXmlPatterns module + +.if defined(PYQT4_DIST) +PORTVERSION= ${PYQT4_VERSION} +MASTER_SITES= ${MASTER_SITES_PYQT4} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- +DISTNAME= ${PYQT4_DISTNAME} + +DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} +HAS_CONFIGURE= yes +USE_PYTHON= yes + +QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. + +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_ARGS+=-b ${PREFIX}/bin \ + -d ${PYTHONPREFIX_SITELIBDIR} \ + -q ${QMAKE} \ + --confirm-license \ + --sipdir ${SIPDIR} + +# One of the things PyQt4 looks for to determine whether to build the Qt DBus +# main loop module (py-qt4-dbussupport) is whether the dbus/ directory is +# present. Only extract it for that port then. +.if ${PORTNAME} != "dbussupport" +EXTRACT_AFTER_ARGS+= --exclude "${DISTNAME}/dbus" +.endif # ${PORTNAME} != "dbussupport" + +.if !target(do-configure) +do-configure: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} +.endif # !target(do-configure) +.endif # defined(PYQT4_DIST) diff --git a/devel/py-qt4/distinfo b/devel/py-qt4/distinfo index 68d28f711118..55504ff18cf8 100644 --- a/devel/py-qt4/distinfo +++ b/devel/py-qt4/distinfo @@ -1,2 +1,2 @@ -SHA256 (PyQt-x11-gpl-4.10.3.tar.gz) = a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 -SIZE (PyQt-x11-gpl-4.10.3.tar.gz) = 11187362 +SHA256 (PyQt-x11-gpl-4.11.1.tar.gz) = df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 +SIZE (PyQt-x11-gpl-4.11.1.tar.gz) = 11118850 diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index 34685bd223c2..32c739767d95 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -3,7 +3,6 @@ PORTNAME= sip PORTVERSION= ${SIP_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_SIP} ${MASTER_SITE_LOCAL} @@ -18,7 +17,7 @@ PYTHON_PY3K_PLIST_HACK= yes DATADIR= ${PREFIX}/share/py-${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ +CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ -e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ @@ -26,23 +25,17 @@ ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ PORTDOCS= * -OPTIONS_DEFINE= DOCS DEBUG +OPTIONS_DEFINE= DOCS DEBUG +DEBUG_CONFIGURE_ON= --debug .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDEBUG} -ARGS+= -u -.endif do-configure: - cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${ARGS} + cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} post-install: -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ ${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR} -.endif ${MKDIR} ${STAGEDIR}${DATADIR} &&\ cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} &&\ ${PYTHON_CMD} -c "import sipconfig" &&\ diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 1bab3a6db4dd..34619574fad6 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,2 +1,2 @@ -SHA256 (sip-4.15.2.tar.gz) = b418cfdc3fabdd9175e7c29bab935812075d325ba5e0f693ec84b5473b802624 -SIZE (sip-4.15.2.tar.gz) = 773688 +SHA256 (sip-4.16.2.tar.gz) = a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce +SIZE (sip-4.16.2.tar.gz) = 793663 diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile index c7cfb275c907..d6848880a3e6 100644 --- a/devel/qscintilla2/Makefile +++ b/devel/qscintilla2/Makefile @@ -42,17 +42,14 @@ post-patch: .endif post-install: -.if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC} &&\ ${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${STAGEDIR}${DOCSDIR}/Scintilla &&\ ${INSTALL_DATA} NEWS README ${STAGEDIR}${DOCSDIR} &&\ ${INSTALL_DATA} doc/html-Qt4Qt5/* ${STAGEDIR}${DOCSDIR}/html &&\ ${INSTALL_DATA} doc/Scintilla/* ${STAGEDIR}${DOCSDIR}/Scintilla -.endif -.if ${PORT_OPTIONS:MEXAMPLES} cd ${WRKSRC}/example-Qt4Qt5 &&\ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/images &&\ ${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR} &&\ ${INSTALL_DATA} images/* ${STAGEDIR}${EXAMPLESDIR}/images -.endif + .include <bsd.port.mk> diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo index d7d19fa320c9..1beef363f07e 100644 --- a/devel/qscintilla2/distinfo +++ b/devel/qscintilla2/distinfo @@ -1,2 +1,2 @@ -SHA256 (QScintilla-gpl-2.7.2.tar.gz) = 14b47d686dc1586321f84fcf3c9a911ddaace37a1cb0b1e6a6195e252e5bb69c -SIZE (QScintilla-gpl-2.7.2.tar.gz) = 2842625 +SHA256 (QScintilla-gpl-2.8.3.tar.gz) = fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505 +SIZE (QScintilla-gpl-2.8.3.tar.gz) = 3028154 diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist index 096c97763a22..96f712ced0eb 100644 --- a/devel/qscintilla2/pkg-plist +++ b/devel/qscintilla2/pkg-plist @@ -5,9 +5,11 @@ %%QT_INCDIR%%/Qsci/qscidocument.h %%QT_INCDIR%%/Qsci/qsciglobal.h %%QT_INCDIR%%/Qsci/qscilexer.h +%%QT_INCDIR%%/Qsci/qscilexeravs.h %%QT_INCDIR%%/Qsci/qscilexerbash.h %%QT_INCDIR%%/Qsci/qscilexerbatch.h %%QT_INCDIR%%/Qsci/qscilexercmake.h +%%QT_INCDIR%%/Qsci/qscilexercoffeescript.h %%QT_INCDIR%%/Qsci/qscilexercpp.h %%QT_INCDIR%%/Qsci/qscilexercsharp.h %%QT_INCDIR%%/Qsci/qscilexercss.h @@ -26,6 +28,7 @@ %%QT_INCDIR%%/Qsci/qscilexeroctave.h %%QT_INCDIR%%/Qsci/qscilexerpascal.h %%QT_INCDIR%%/Qsci/qscilexerperl.h +%%QT_INCDIR%%/Qsci/qscilexerpo.h %%QT_INCDIR%%/Qsci/qscilexerpostscript.h %%QT_INCDIR%%/Qsci/qscilexerpov.h %%QT_INCDIR%%/Qsci/qscilexerproperties.h @@ -46,9 +49,10 @@ %%QT_INCDIR%%/Qsci/qscistyle.h %%QT_INCDIR%%/Qsci/qscistyledtext.h %%QT_LIBDIR%%/libqscintilla2.so -%%QT_LIBDIR%%/libqscintilla2.so.9 -%%QT_LIBDIR%%/libqscintilla2.so.9.0 -%%QT_LIBDIR%%/libqscintilla2.so.9.0.2 +%%QT_LIBDIR%%/libqscintilla2.so.11 +%%QT_LIBDIR%%/libqscintilla2.so.11.2 +%%QT_LIBDIR%%/libqscintilla2.so.11.2.0 +%%QT_MKSPECDIR%%/features/qscintilla2.prf share/qt4/qsci/api/python/Python-2.4.api share/qt4/qsci/api/python/Python-2.5.api share/qt4/qsci/api/python/Python-2.6.api @@ -56,17 +60,18 @@ share/qt4/qsci/api/python/Python-2.7.api share/qt4/qsci/api/python/Python-3.1.api share/qt4/qsci/api/python/Python-3.2.api share/qt4/qsci/api/python/Python-3.3.api +share/qt4/qsci/api/python/Python-3.4.api %%NLS%%share/qt4/translations/qscintilla_cs.qm %%NLS%%share/qt4/translations/qscintilla_de.qm %%NLS%%share/qt4/translations/qscintilla_es.qm %%NLS%%share/qt4/translations/qscintilla_fr.qm %%NLS%%share/qt4/translations/qscintilla_pt_br.qm -%%NLS%%share/qt4/translations/qscintilla_ru.qm %%NLS%%@dirrmtry share/qt4/translations @dirrmtry share/qt4/qsci/api/python @dirrmtry share/qt4/qsci/api @dirrmtry share/qt4/qsci @dirrmtry share/qt4 +@dirrmtry %%QT_MKSPECDIR%%/features @dirrmtry %%QT_LIBDIR%% @dirrm %%QT_INCDIR%%/Qsci @dirrmtry %%QT_INCDIR%% diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile index 13e1b0206e7a..c4ae6ca0612e 100644 --- a/devel/ruby-qtruby/Makefile +++ b/devel/ruby-qtruby/Makefile @@ -2,6 +2,7 @@ PORTNAME= qtruby PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde ruby MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile index f2f3f44f7acf..acef8f751b8d 100644 --- a/devel/smokeqt/Makefile +++ b/devel/smokeqt/Makefile @@ -2,6 +2,7 @@ PORTNAME= smokeqt PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile index c13977e9b97e..62caceaa42df 100644 --- a/devel/universalindentgui/Makefile +++ b/devel/universalindentgui/Makefile @@ -3,6 +3,7 @@ PORTNAME= universalindentgui PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION} diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index 053962f0207b..ec8870594f16 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= svg -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= graphics 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, QtSvg module @@ -15,47 +11,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtSvg module 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 QtSvg +PYQT4_DIST= yes USE_QT4= moc_build svg qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtSvg 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 QtSvg \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtSvg 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> diff --git a/math/octave/Makefile b/math/octave/Makefile index bae8e7cae128..6ce465918b9c 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave PORTVERSION= 3.8.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= octave diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile index 7951e053680c..29f09a2e3ac6 100644 --- a/misc/py-qt4-demo/Makefile +++ b/misc/py-qt4-demo/Makefile @@ -17,15 +17,18 @@ USE_PYTHON= yes EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 -OPTIONS_DEFINE= PYQT4 -PYQT4_DESC= Install all PyQt4 components - .include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .for component in ${PYQT4_COMPONENTS:Ndemo} PYQT4_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-${component}>=0:${PORTSDIR}/${${component}_PORT} .endfor +# Remove some empty __pycache__/ directories that are wrongly part of the +# tarball and cause check-plist failures. +post-patch: + ${RMDIR} ${WRKSRC}/examples/opengl/textures/__pycache__ + ${RMDIR} ${WRKSRC}/examples/widgets/stylesheet/__pycache__ + do-build: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/examples diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist index 70b32a87a948..035fc9f2e91d 100644 --- a/misc/py-qt4-demo/pkg-plist +++ b/misc/py-qt4-demo/pkg-plist @@ -101,7 +101,6 @@ %%EXAMPLESDIR%%/dbus/remotecontrolledcar/controller/controller.ui %%EXAMPLESDIR%%/dbus/remotecontrolledcar/controller/ui_controller.py %%EXAMPLESDIR%%/dbus/remotecontrolledcar/controller/ui_controller.pyc -%%EXAMPLESDIR%%/declarative/modelviews/objectlistmodel/__pycache__/objectlistmodel_rc3.cpython-33.pyc %%EXAMPLESDIR%%/declarative/modelviews/objectlistmodel/objectlistmodel.py %%EXAMPLESDIR%%/declarative/modelviews/objectlistmodel/objectlistmodel.pyc %%EXAMPLESDIR%%/declarative/modelviews/objectlistmodel/objectlistmodel.qrc @@ -236,26 +235,6 @@ %%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc2.pyc %%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc3.py %%EXAMPLESDIR%%/demos/embeddeddialogs/embeddeddialogs_rc3.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/colors.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/demoitem.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/demoitemanimation.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/demoscene.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/demotextitem.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/examplecontent.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/guide.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/guidecircle.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/guideline.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/headingitem.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/imageitem.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/itemcircleanimation.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/letteritem.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/mainwindow.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/menucontent.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/menumanager.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/qtdemo_rc3.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/scanitem.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/score.cpython-33.pyc -%%EXAMPLESDIR%%/demos/qtdemo/__pycache__/textbutton.cpython-33.pyc %%EXAMPLESDIR%%/demos/qtdemo/colors.py %%EXAMPLESDIR%%/demos/qtdemo/colors.pyc %%EXAMPLESDIR%%/demos/qtdemo/demoitem.py @@ -957,6 +936,8 @@ %%EXAMPLESDIR%%/webkit/simpleselector/ui_window.py %%EXAMPLESDIR%%/webkit/simpleselector/ui_window.pyc %%EXAMPLESDIR%%/webkit/simpleselector/window.ui +%%EXAMPLESDIR%%/webkit/webftpclient.py +%%EXAMPLESDIR%%/webkit/webftpclient.pyc %%EXAMPLESDIR%%/widgets/README %%EXAMPLESDIR%%/widgets/analogclock.py %%EXAMPLESDIR%%/widgets/analogclock.pyc diff --git a/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile index 339be5728423..fb94ef8d4c29 100644 --- a/multimedia/py-qt4-multimedia/Makefile +++ b/multimedia/py-qt4-multimedia/Makefile @@ -2,11 +2,7 @@ # $FreeBSD$ PORTNAME= multimedia -PORTVERSION= ${PYQT4_VERSION} CATEGORIES= multimedia 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, Multimedia module @@ -14,47 +10,19 @@ COMMENT= Python bindings for the Qt4 toolkit, Multimedia module 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 QtMultimedia +PYQT4_DIST= yes USE_QT4= moc_build multimedia qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtMultimedia 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 QtMultimedia \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtMultimedia 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> diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile index 91e1480f8ab0..10bb68b5367e 100644 --- a/multimedia/py-qt4-phonon/Makefile +++ b/multimedia/py-qt4-phonon/Makefile @@ -1,12 +1,7 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia 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, Phonon module @@ -14,47 +9,19 @@ COMMENT= Python bindings for the Qt4 toolkit, Phonon module 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 phonon +PYQT4_DIST= yes USE_QT4= moc_build phonon qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install Phonon 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 phonon \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install Phonon 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> diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile index a1db64a6a0bc..1cd36fd8a318 100644 --- a/net/py-qt4-network/Makefile +++ b/net/py-qt4-network/Makefile @@ -2,13 +2,8 @@ # $FreeBSD$ PORTNAME= network -PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net 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, QtNetwork module @@ -16,47 +11,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtNetwork module 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 QtNetwork +PYQT4_DIST= yes USE_QT4= moc_build network qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtNetwork 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 QtNetwork \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtNetwork 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> diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile index bd3dc554f24b..8dd5366bff66 100644 --- a/textproc/py-qt4-xml/Makefile +++ b/textproc/py-qt4-xml/Makefile @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= xml -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= textproc 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, QtXml module @@ -15,47 +11,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtXml module 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 QtXml +PYQT4_DIST= yes USE_QT4= xml qmake_build moc_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtXml 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 QtXml \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtXml 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> diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile index d1e7a2d10c62..9b4a8ca2fa55 100644 --- a/textproc/py-qt4-xmlpatterns/Makefile +++ b/textproc/py-qt4-xmlpatterns/Makefile @@ -2,11 +2,7 @@ # $FreeBSD$ PORTNAME= xmlpatterns -PORTVERSION= ${PYQT4_VERSION} CATEGORIES= textproc 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, QtXmlPatterns module @@ -14,47 +10,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtXmlPatterns module BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip RUN_DEPENDS= ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml -DISTINFO_FILE= ${PYQT4_DISTINFO_FILE} -HAS_CONFIGURE= yes -USE_PYTHON= yes +CONFIGURE_ARGS= --enable QtXmlPatterns +PYQT4_DIST= yes USE_QT4= moc_build xmlpatterns qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtXmlPatterns 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 QtXmlPatterns \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtXmlPatterns 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> diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile index 3e66698ca556..4dca88718590 100644 --- a/www/py-qt4-webkit/Makefile +++ b/www/py-qt4-webkit/Makefile @@ -2,11 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= ${PYQT4_VERSION} CATEGORIES= www 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, QtWebKit module @@ -14,47 +10,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtWebKit module 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 QtWebKit +PYQT4_DIST= yes USE_QT4= qmake_build gui moc_build network webkit -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtWebKit 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 QtWebKit \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtWebKit 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> diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index ab444e8754b5..cc04047612e6 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= gui -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= x11-toolkits 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, QtGui module @@ -15,59 +11,22 @@ COMMENT= Python bindings for the Qt4 toolkit, QtGui module 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 QtGui +PYQT4_DIST= yes USE_QT4= gui imageformats_run inputmethods_run iconengines_run \ qmake_build moc_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtGui 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 QtGui \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtGui 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 - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.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/QtGui/Makefile +BROKEN_sparc64= Does not compile on sparc64 +.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/py-qt4-gui/pkg-plist b/x11-toolkits/py-qt4-gui/pkg-plist index d84e831c8dd2..6ac895990699 100644 --- a/x11-toolkits/py-qt4-gui/pkg-plist +++ b/x11-toolkits/py-qt4-gui/pkg-plist @@ -1,5 +1,6 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtGui.so share/py-sip/QtGui/QtGuimod.sip +share/py-sip/QtGui/opengl_types.sip share/py-sip/QtGui/qabstractbutton.sip share/py-sip/QtGui/qabstractitemdelegate.sip share/py-sip/QtGui/qabstractitemview.sip diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile index b6aa97c96c72..538c182e5c04 100644 --- a/x11/leechcraft/Makefile +++ b/x11/leechcraft/Makefile @@ -3,6 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.65 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ DISTNAME= ${PORTNAME}-${PORTVERSION} diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile index 58999b0d6403..a7ee4e56fc22 100644 --- a/x11/py-qt4-opengl/Makefile +++ b/x11/py-qt4-opengl/Makefile @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= opengl -PORTVERSION= ${PYQT4_VERSION} PORTEPOCH= 1 CATEGORIES= x11 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, QtOpenGL module @@ -15,54 +11,19 @@ COMMENT= Python bindings for the Qt4 toolkit, QtOpenGL module 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 QtOpenGL +PYQT4_DIST= yes USE_QT4= moc_build opengl qmake_build -OPTIONS_DEFINE= API +OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API -API_DESC= Install QtOpenGL 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 QtOpenGL \ - CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +API_DESC= Install QtOpenGL 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} - -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/QtOpenGL/Makefile - .include <bsd.port.mk> diff --git a/x11/py-qt4-opengl/pkg-plist b/x11/py-qt4-opengl/pkg-plist index daece4e4972a..1da4a58318b2 100644 --- a/x11/py-qt4-opengl/pkg-plist +++ b/x11/py-qt4-opengl/pkg-plist @@ -1,6 +1,5 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtOpenGL.so share/py-sip/QtOpenGL/QtOpenGLmod.sip -share/py-sip/QtOpenGL/opengl_types.sip share/py-sip/QtOpenGL/qgl.sip share/py-sip/QtOpenGL/qglbuffer.sip share/py-sip/QtOpenGL/qglcolormap.sip |