diff options
35 files changed, 43 insertions, 64 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index 95fe696ca51b..fe3fe76c1240 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= sql -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases devel python diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index 06a358b8827d..d4ae24beda34 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= assistant -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index 623a44279b00..9bb57ae49ee6 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= core -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py index df37278da5f5..d69b05ad1770 100644 --- a/devel/py-qt4-core/files/patch-configure.py +++ b/devel/py-qt4-core/files/patch-configure.py @@ -195,26 +195,6 @@ if opts.designer_plugin and "QtDesigner" in pyqt_modules: py_major = sipcfg.py_version >> 16 -@@ -975,9 +965,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 '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) -- else: -- sipconfig.inform("Qt Designer plugin disabled because Python library is static") -- opts.designer_plugin = False - - pysh_lib = ducfg.get("LDLIBRARY", "") - @@ -2301,9 +2285,9 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index b7074bb0cb7c..1d5cdc638966 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= dbus -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile index d3fe0991aeeb..75e9c6bfef49 100644 --- a/devel/py-qt4-dbussupport/Makefile +++ b/devel/py-qt4-dbussupport/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= dbussupport -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile index d050fb98d2ac..a39b521004d0 100644 --- a/devel/py-qt4-declarative/Makefile +++ b/devel/py-qt4-declarative/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= declarative -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index 594c22f13a9a..70829764fe70 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= designer -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index 72220c678401..de77468f29ce 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= designerplugin -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python @@ -23,5 +22,7 @@ USE_QT4= gui xml designer moc_build qmake_build OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace +PLIST_FILES= %%QT_PLUGINDIR%%/designer/libpyqt4.so + .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include <bsd.port.mk> diff --git a/devel/py-qt4-designerplugin/pkg-plist b/devel/py-qt4-designerplugin/pkg-plist deleted file mode 100644 index 2c0e5cce5408..000000000000 --- a/devel/py-qt4-designerplugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/designer/libpyqt4.so diff --git a/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile index a8e281ed88b2..1f43868b4ff0 100644 --- a/devel/py-qt4-help/Makefile +++ b/devel/py-qt4-help/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= help -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index bd88dd9ec9f7..664d83c8e0c7 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -3,7 +3,6 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index 8544a19c5e94..cee85c26bd9f 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= script -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile index 1d3f58ad2eb2..2cb593b0a373 100644 --- a/devel/py-qt4-scripttools/Makefile +++ b/devel/py-qt4-scripttools/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= scripttools -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 706ea0235e29..d8858b7a99c4 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= test -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile index 8c8df74170fc..499b1702338c 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 82a570c399c1..0ae90cd4691e 100644 --- a/devel/py-qt4/bsd.pyqt.mk +++ b/devel/py-qt4/bsd.pyqt.mk @@ -19,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.16.2 -PYQT4_VERSION= 4.11.1 -QSCI2_VERSION= 2.8.3 +SIP_VERSION= 4.16.5 +PYQT4_VERSION= 4.11.3 +QSCI2_VERSION= 2.8.4 SIP_DISTNAME= sip-${SIP_VERSION} PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION} diff --git a/devel/py-qt4/distinfo b/devel/py-qt4/distinfo index 55504ff18cf8..5cf3cf369996 100644 --- a/devel/py-qt4/distinfo +++ b/devel/py-qt4/distinfo @@ -1,2 +1,2 @@ -SHA256 (PyQt-x11-gpl-4.11.1.tar.gz) = df9d7358d70748efa5b84fa3fe9e182a80c39ac590157daaabcc2618df176da3 -SIZE (PyQt-x11-gpl-4.11.1.tar.gz) = 11118850 +SHA256 (PyQt-x11-gpl-4.11.3.tar.gz) = 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 +SIZE (PyQt-x11-gpl-4.11.3.tar.gz) = 11120237 diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 34619574fad6..7b467ba73da6 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,2 +1,2 @@ -SHA256 (sip-4.16.2.tar.gz) = a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce -SIZE (sip-4.16.2.tar.gz) = 793663 +SHA256 (sip-4.16.5.tar.gz) = a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87 +SIZE (sip-4.16.5.tar.gz) = 859672 diff --git a/devel/py-sip/files/patch-siputils.py b/devel/py-sip/files/patch-siputils.py new file mode 100644 index 000000000000..70061f0f4b59 --- /dev/null +++ b/devel/py-sip/files/patch-siputils.py @@ -0,0 +1,28 @@ +sip 4.16.5 has switched the Makefile lines that invoke the moc utility from +an invocation with an explicit source file name to "$<". + +This works with GNU make, but not make(1), where it $< evaluates to nothing +in this context. + +Switch back to the previous version to avoid having to depend on devel/gmake +(figuring out which ports need it is not trivial). +--- siputils.py ++++ siputils.py +@@ -1683,7 +1683,7 @@ + cpp = "moc_" + root + ".cpp" + + mfile.write("\n%s: %s\n" % (cpp, mf)) +- mfile.write("\t$(MOC) -o %s $<\n" % cpp) ++ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + + mfile.write("\n$(TARGET): $(OFILES)\n") + +@@ -1980,7 +1980,7 @@ + mf = os.path.join(self._src_dir, mf) + + mfile.write("\n%s: %s\n" % (cpp, mf)) +- mfile.write("\t$(MOC) -o %s $<\n" % cpp) ++ mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + + mfile.write("\n$(TARGET): $(OFILES)\n") + diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile index 38ae71c2ccc0..f59f87fe8c60 100644 --- a/devel/qscintilla2-designerplugin/Makefile +++ b/devel/qscintilla2-designerplugin/Makefile @@ -3,7 +3,6 @@ PORTNAME= designerplugin PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} @@ -22,6 +21,8 @@ HAS_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 +PLIST_FILES= %%QT_PLUGINDIR%%/designer/libqscintillaplugin.so + .include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" pre-configure: diff --git a/devel/qscintilla2-designerplugin/pkg-plist b/devel/qscintilla2-designerplugin/pkg-plist deleted file mode 100644 index 328a3973531c..000000000000 --- a/devel/qscintilla2-designerplugin/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%QT_PLUGINDIR%%/designer/libqscintillaplugin.so diff --git a/devel/qscintilla2/Makefile b/devel/qscintilla2/Makefile index 99172747a1ca..d6848880a3e6 100644 --- a/devel/qscintilla2/Makefile +++ b/devel/qscintilla2/Makefile @@ -3,7 +3,6 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo index 1beef363f07e..c6d9c210e0cc 100644 --- a/devel/qscintilla2/distinfo +++ b/devel/qscintilla2/distinfo @@ -1,2 +1,2 @@ -SHA256 (QScintilla-gpl-2.8.3.tar.gz) = fb94e6d61c3ccd4bf167d5f092629e619f7069d42207469458998b761a7cf505 -SIZE (QScintilla-gpl-2.8.3.tar.gz) = 3028154 +SHA256 (QScintilla-gpl-2.8.4.tar.gz) = 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f +SIZE (QScintilla-gpl-2.8.4.tar.gz) = 3031919 diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist index e354abb800af..d65adc109adf 100644 --- a/devel/qscintilla2/pkg-plist +++ b/devel/qscintilla2/pkg-plist @@ -50,8 +50,8 @@ %%QT_INCDIR%%/Qsci/qscistyledtext.h %%QT_LIBDIR%%/libqscintilla2.so %%QT_LIBDIR%%/libqscintilla2.so.11 -%%QT_LIBDIR%%/libqscintilla2.so.11.2 -%%QT_LIBDIR%%/libqscintilla2.so.11.2.0 +%%QT_LIBDIR%%/libqscintilla2.so.11.3 +%%QT_LIBDIR%%/libqscintilla2.so.11.3.0 %%QT_MKSPECDIR%%/features/qscintilla2.prf share/qt4/qsci/api/python/Python-2.4.api share/qt4/qsci/api/python/Python-2.5.api diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index d022779fb7d4..ec8870594f16 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= svg -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics devel python diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile index d0435e879048..681e413516a4 100644 --- a/misc/py-qt4-demo/Makefile +++ b/misc/py-qt4-demo/Makefile @@ -24,12 +24,6 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 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/multimedia/py-qt4-multimedia/Makefile b/multimedia/py-qt4-multimedia/Makefile index 5246dcc98fba..fb94ef8d4c29 100644 --- a/multimedia/py-qt4-multimedia/Makefile +++ b/multimedia/py-qt4-multimedia/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= multimedia -PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org diff --git a/multimedia/py-qt4-phonon/Makefile b/multimedia/py-qt4-phonon/Makefile index 746ee1b3a9f8..10bb68b5367e 100644 --- a/multimedia/py-qt4-phonon/Makefile +++ b/multimedia/py-qt4-phonon/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= phonon -PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile index f82000c86afa..1cd36fd8a318 100644 --- a/net/py-qt4-network/Makefile +++ b/net/py-qt4-network/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= network -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net devel python diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile index 510c17a647ab..8dd5366bff66 100644 --- a/textproc/py-qt4-xml/Makefile +++ b/textproc/py-qt4-xml/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= xml -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc devel python diff --git a/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile index 358b246055c6..9b4a8ca2fa55 100644 --- a/textproc/py-qt4-xmlpatterns/Makefile +++ b/textproc/py-qt4-xmlpatterns/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= xmlpatterns -PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org diff --git a/www/py-qt4-webkit/Makefile b/www/py-qt4-webkit/Makefile index 60fd57421edd..4dca88718590 100644 --- a/www/py-qt4-webkit/Makefile +++ b/www/py-qt4-webkit/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= webkit -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index 3904e35e4382..cc04047612e6 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= gui -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits devel python diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile index 4a05e47a9583..a7ee4e56fc22 100644 --- a/x11/py-qt4-opengl/Makefile +++ b/x11/py-qt4-opengl/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= opengl -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 devel python |