diff options
34 files changed, 271 insertions, 239 deletions
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index cf61f3f70c47..d6defef1b40c 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= sql -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= databases devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtSql module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtSql.api" diff --git a/databases/py-qt4-sql/distinfo b/databases/py-qt4-sql/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/databases/py-qt4-sql/distinfo +++ b/databases/py-qt4-sql/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile index ff4530231cc8..80f7296fbe65 100644 --- a/devel/py-qt4-assistant/Makefile +++ b/devel/py-qt4-assistant/Makefile @@ -5,20 +5,20 @@ # $FreeBSD$ PORTNAME= assistant -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtAssistant module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ + ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -36,8 +36,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -48,7 +50,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtAssistant.api" diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-assistant/distinfo +++ b/devel/py-qt4-assistant/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index 39cae21ffabe..6cb5439e3657 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -5,18 +5,18 @@ # $FreeBSD$ PORTNAME= core -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtCore module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip RUN_DEPENDS= ${BUILD_DEPENDS} HAS_CONFIGURE= yes @@ -34,8 +34,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -46,7 +48,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtCore.api" diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-core/distinfo +++ b/devel/py-qt4-core/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py index 8e5a1c5eda50..fc83a48e06ac 100644 --- a/devel/py-qt4-core/files/patch-configure.py +++ b/devel/py-qt4-core/files/patch-configure.py @@ -1,5 +1,5 @@ ---- configure.py.orig 2007-07-30 18:11:39.000000000 +0200 -+++ configure.py 2007-09-29 18:26:58.000000000 +0200 +--- configure.py.orig 2007-12-05 18:36:11.000000000 +0100 ++++ configure.py 2007-12-06 21:12:28.000000000 +0100 @@ -29,6 +29,10 @@ import sipconfig @@ -10,8 +10,8 @@ +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT'] # Initialise the globals. - pyqt_version = 0x040300 -@@ -62,7 +66,6 @@ + pyqt_version = 0x040303 +@@ -61,7 +65,6 @@ dbuslibdirs = [] dbuslibs = [] @@ -19,7 +19,7 @@ # Under Windows qmake and the Qt DLLs must be into the system PATH otherwise # the dynamic linker won't be able to resolve the symbols. On other systems we # assume we can just run qmake by using its full pathname. -@@ -276,14 +279,23 @@ +@@ -288,14 +291,23 @@ elif sipcfg.universal: sipconfig.inform("QtDesigner module disabled with universal binaries.") else: @@ -46,7 +46,7 @@ def code(self): cons_xtra_incdirs = [] -@@ -304,6 +316,10 @@ +@@ -316,6 +328,10 @@ cons_xtra_libs.extend(sp_libs) generate_code("QtCore") @@ -57,7 +57,7 @@ else: generate_code("QtCore", extra_include_dirs=sp_incdirs, extra_lib_dirs=sp_libdirs, extra_libs=sp_libs) -@@ -472,19 +488,28 @@ +@@ -487,19 +503,28 @@ sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins)) # Generate the QScintilla API file. @@ -95,7 +95,7 @@ def _static_plugins(self, mname): """Return a tuple of the libraries (in platform neutral format) and the -@@ -555,7 +580,13 @@ +@@ -570,7 +595,13 @@ return libs, libdirs def module_installs(self): @@ -110,7 +110,7 @@ def qpylibs(self): # See which QPy libraries to build. -@@ -641,23 +672,43 @@ +@@ -656,23 +687,43 @@ # 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). @@ -167,7 +167,7 @@ if "QtXml" in pyqt_modules: sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -694,7 +745,10 @@ +@@ -709,7 +760,10 @@ makefile.generate() tool.append("pyrcc") else: @@ -179,7 +179,7 @@ if "QtDesigner" in pyqt_modules: enabled = True -@@ -719,11 +773,17 @@ +@@ -734,11 +788,17 @@ glob.glob("%s/lib/libpython%d.%d*" % (ducfg["prefix"], py_major, py_minor))): lib_dir_flag = quote("-L%s/lib" % ducfg["prefix"]) link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor) @@ -198,8 +198,8 @@ if enabled: sipconfig.inform("Creating Qt Designer plugin Makefile...") -@@ -791,19 +851,44 @@ - sipconfig.inform("The %s %s library is in %s." % (lib_type, qt_lib, qt_libdir)) +@@ -806,19 +866,44 @@ + sipconfig.inform("The %s Qt libraries are in %s." % (lib_type, qt_libdir)) sipconfig.inform("The Qt binaries are in %s." % qt_bindir) sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir) - sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules)) @@ -250,7 +250,7 @@ if opts.vendorcheck: sipconfig.inform("PyQt will only be usable with signed interpreters.") -@@ -1171,7 +1256,11 @@ +@@ -1186,7 +1271,11 @@ of libraries. extra_sip_flags is an optional list of additional flags to pass to SIP. """ @@ -263,7 +263,7 @@ mk_clean_dir(mname) -@@ -1243,7 +1332,11 @@ +@@ -1258,7 +1347,11 @@ sipconfig.error("Unable to create the C++ code.") # Generate the Makefile. @@ -276,7 +276,7 @@ installs = [] -@@ -1786,13 +1879,25 @@ +@@ -1679,6 +1772,10 @@ p.print_help() sys.exit(2) @@ -287,23 +287,16 @@ sipcfg.set_build_macros(macros) # Check Qt is what we need. - pyqt = check_qt_installation(macros) +@@ -1686,7 +1783,7 @@ # Check the licenses are compatible. -- check_license() -+ if not freebsd: -+ check_license() -+ else: -+ print -+ sipconfig.inform("NOTE: This port uses the GPL licensed version of PyQt4.") -+ sipconfig.inform("If you require a commercial license or are unsure, please") -+ sipconfig.inform("read http://www.riverbankcomputing.co.uk/pyqt/index.php\n") -+ print -+ # Sorry, we can't hang auto builds for confirmation and GPL doesn't need it - + check_license() +- ++ # Check which modules to build. pyqt.check_modules() -@@ -1815,9 +1920,18 @@ + +@@ -1708,9 +1805,18 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] if opts.api: @@ -324,7 +317,7 @@ if opts.bigqt: xtra_modules.append("_qt") -@@ -1828,14 +1942,31 @@ +@@ -1721,14 +1827,31 @@ if opts.mwg_qwt_dir: xtra_modules.append("Qwt5") diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist index c28cbe56bdbc..cc4f089415a3 100644 --- a/devel/py-qt4-core/pkg-plist +++ b/devel/py-qt4-core/pkg-plist @@ -132,7 +132,7 @@ bin/pyuic4 @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic %%SIPFILES%%@dirrm %%SIPDIR%%/QtCore -@dirrm %%PYTHON_SITELIBDIR%%/PyQt4 +@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 %%API%%@dirrmtry share/qt4/qsci/api/python %%API%%@dirrmtry share/qt4/qsci/api %%API%%@dirrmtry share/qt4/qsci diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile index a55d15106b34..d2fc6e9e05ce 100644 --- a/devel/py-qt4-dbus/Makefile +++ b/devel/py-qt4-dbus/Makefile @@ -5,21 +5,21 @@ # $FreeBSD$ PORTNAME= dbus -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, D-BUS module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \ - ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core -RUN_DEPENDS= ${BUILD_DEPENDS} +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 \ + ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -34,8 +34,10 @@ OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-dbus/distinfo +++ b/devel/py-qt4-dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile index 49ce1ebf716d..232a0af7ec4f 100644 --- a/devel/py-qt4-designer/Makefile +++ b/devel/py-qt4-designer/Makefile @@ -5,21 +5,21 @@ # $FreeBSD$ PORTNAME= designer -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtDesigner module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \ - ${PYTHON_SITELIBDIR}/PyQt4/QtScript.so:${PORTSDIR}/devel/py-qt4-script +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ + ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \ + ${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -37,8 +37,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -49,7 +51,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtDesigner.api" diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-designer/distinfo +++ b/devel/py-qt4-designer/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-designerplugin/Makefile b/devel/py-qt4-designerplugin/Makefile index 5cfa0311afd5..f5a810dd72d8 100644 --- a/devel/py-qt4-designerplugin/Makefile +++ b/devel/py-qt4-designerplugin/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= designerplugin -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtDesigner plugin -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -32,8 +32,10 @@ OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-designerplugin/distinfo +++ b/devel/py-qt4-designerplugin/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile index 94a324895e82..44e39ae92745 100644 --- a/devel/py-qt4-script/Makefile +++ b/devel/py-qt4-script/Makefile @@ -5,18 +5,19 @@ # $FreeBSD$ PORTNAME= script -PORTVERSION= 4.3.1 +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtScript module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -34,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -46,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtScript.api" diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-script/distinfo +++ b/devel/py-qt4-script/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile index 80a3dd1cac70..4d42013767d9 100644 --- a/devel/py-qt4-test/Makefile +++ b/devel/py-qt4-test/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= test -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtTest module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtTest.api" diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/devel/py-qt4-test/distinfo +++ b/devel/py-qt4-test/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index 021c3d87ee9d..0c3e8c9268f4 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= svg -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= graphics devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtSvg module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtSvg.api" diff --git a/graphics/py-qt4-svg/distinfo b/graphics/py-qt4-svg/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/graphics/py-qt4-svg/distinfo +++ b/graphics/py-qt4-svg/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile index 8e55ff432c69..9736c55392b5 100644 --- a/misc/py-qt4-demo/Makefile +++ b/misc/py-qt4-demo/Makefile @@ -5,16 +5,16 @@ # $FreeBSD$ PORTNAME= demo -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= misc devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com -COMMENT= Python bindings for the Qt4 toolkit, demo and other examples +MAINTAINER= ${PYQT_MAINTAINER} +COMMENT= Python bindings for the Qt4 toolkit, Qt demo and examples USE_PYTHON= yes @@ -23,24 +23,25 @@ OPTIONS= PYQT4 "Install any missing PyQt4 components" on OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if !defined(WITHOUT_PYQT4) -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core \ - ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \ - ${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \ - ${PYTHON_SITELIBDIR}/PyQt4/QtAssistant.so:${PORTSDIR}/devel/py-qt4-assistant \ - ${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \ - ${PYTHON_SITELIBDIR}/PyQt4/QtScript.so:${PORTSDIR}/devel/py-qt4-script \ - ${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \ - ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \ - ${PYTHON_SITELIBDIR}/PyQt4/QtTest.so:${PORTSDIR}/devel/py-qt4-test \ - ${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \ - ${LOCALBASE}/lib/qt4/plugins/designer/libpythonplugin.so:${PORTSDIR}/devel/py-qt4-designerplugin \ - ${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus +RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core \ + ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ + ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network \ + ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \ + ${PKGNAMEPREFIX}assistant>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-assistant \ + ${PKGNAMEPREFIX}opengl>=${PYQT4_VERSION}:${PORTSDIR}/x11/py-qt4-opengl \ + ${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script \ + ${PKGNAMEPREFIX}sql>=${PYQT4_VERSION}:${PORTSDIR}/databases/py-qt4-sql \ + ${PKGNAMEPREFIX}svg>=${PYQT4_VERSION}:${PORTSDIR}/graphics/py-qt4-svg \ + ${PKGNAMEPREFIX}test>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-test \ + ${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer \ + ${PKGNAMEPREFIX}designerplugin>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designerplugin \ + ${PKGNAMEPREFIX}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus .if !defined(NOPORTDOCS) -RUN_DEPENDS+= ${LOCALBASE}/share/doc/py-qt4/pyqt4ref.html:${PORTSDIR}/misc/py-qt4-doc +RUN_DEPENDS+= ${PKGNAMEPREFIX}doc>=${PYQT4_VERSION}:${PORTSDIR}/misc/py-qt4-doc .endif .endif diff --git a/misc/py-qt4-demo/distinfo b/misc/py-qt4-demo/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/misc/py-qt4-demo/distinfo +++ b/misc/py-qt4-demo/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/misc/py-qt4-demo/pkg-plist b/misc/py-qt4-demo/pkg-plist index 4f90c740ecad..bb025dabae16 100644 --- a/misc/py-qt4-demo/pkg-plist +++ b/misc/py-qt4-demo/pkg-plist @@ -501,7 +501,7 @@ @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/draganddrop @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice/images @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/collidingmice -@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images +@dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot/images/ @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview/dragdroprobot @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphicsview @dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/itemviews/chart diff --git a/misc/py-qt4-doc/Makefile b/misc/py-qt4-doc/Makefile index 659a635f5cd4..31eddf5ff345 100644 --- a/misc/py-qt4-doc/Makefile +++ b/misc/py-qt4-doc/Makefile @@ -5,15 +5,15 @@ # $FreeBSD$ PORTNAME= doc -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= misc devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, documentation NO_BUILD= yes @@ -25,10 +25,14 @@ do-install: .if !defined(NOPORTDOCS) cd ${WRKSRC} &&\ ${MKDIR} ${DOCSDIR} &&\ - ${INSTALL_DATA} ChangeLog NEWS README THANKS ${DOCSDIR} &&\ + ${INSTALL_DATA} ChangeLog GPL_EXCEPTION.TXT\ + GPL_EXCEPTION_ADDENDUM.TXT LICENSE NEWS\ + OPENSOURCE-NOTICE.TXT README THANKS\ + ${DOCSDIR} &&\ ${CP} -R doc/ ${DOCSDIR} .else @${ECHO} "NOPORTDOCS is set -- installing nothing." .endif +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.mk> diff --git a/misc/py-qt4-doc/distinfo b/misc/py-qt4-doc/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/misc/py-qt4-doc/distinfo +++ b/misc/py-qt4-doc/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/misc/py-qt4-doc/pkg-plist b/misc/py-qt4-doc/pkg-plist index a86bb0fc6c7c..37139bb85ce7 100644 --- a/misc/py-qt4-doc/pkg-plist +++ b/misc/py-qt4-doc/pkg-plist @@ -1,5 +1,9 @@ %%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION.TXT +%%PORTDOCS%%%%DOCSDIR%%/GPL_EXCEPTION_ADDENDUM.TXT +%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/OPENSOURCE-NOTICE.TXT %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/THANKS %%PORTDOCS%%%%DOCSDIR%%/default.css @@ -143,6 +147,7 @@ %%PORTDOCS%%%%DOCSDIR%%/html/images/qcolor-rgb.png %%PORTDOCS%%%%DOCSDIR%%/html/images/qcolor-saturation.png %%PORTDOCS%%%%DOCSDIR%%/html/images/qcolor-value.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/qcolumnview.png %%PORTDOCS%%%%DOCSDIR%%/html/images/qconicalgradient.png %%PORTDOCS%%%%DOCSDIR%%/html/images/qdesktopwidget.png %%PORTDOCS%%%%DOCSDIR%%/html/images/qerrormessage.png @@ -284,6 +289,8 @@ %%PORTDOCS%%%%DOCSDIR%%/html/images/system-tray.png %%PORTDOCS%%%%DOCSDIR%%/html/images/taskmenuextension-example-faded.png %%PORTDOCS%%%%DOCSDIR%%/html/images/tcpstream.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/texttable-merge.png +%%PORTDOCS%%%%DOCSDIR%%/html/images/texttable-split.png %%PORTDOCS%%%%DOCSDIR%%/html/images/threadsandobjects.png %%PORTDOCS%%%%DOCSDIR%%/html/images/udppackets.png %%PORTDOCS%%%%DOCSDIR%%/html/images/whatsthis.png diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile index a242a70ec6b8..93dd2587672c 100644 --- a/net/py-qt4-network/Makefile +++ b/net/py-qt4-network/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= network -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= net devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtNetwork module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtNetwork.api" @@ -67,8 +69,8 @@ ARGS+= --trace ARGS+= --enable QtNetwork do-configure: - ( cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ - ${PYTHON_CMD} configure.py ${ARGS} ) + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ + ${PYTHON_CMD} configure.py ${ARGS} post-configure: ${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ diff --git a/net/py-qt4-network/distinfo b/net/py-qt4-network/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/net/py-qt4-network/distinfo +++ b/net/py-qt4-network/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile index 1076e3571425..47f2edd3fb03 100644 --- a/textproc/py-qt4-xml/Makefile +++ b/textproc/py-qt4-xml/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= xml -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= textproc devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtXml module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtXml.api" diff --git a/textproc/py-qt4-xml/distinfo b/textproc/py-qt4-xml/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/textproc/py-qt4-xml/distinfo +++ b/textproc/py-qt4-xml/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile index fc2ac9cdb95b..f64b924711bc 100644 --- a/x11-toolkits/py-qt4-gui/Makefile +++ b/x11-toolkits/py-qt4-gui/Makefile @@ -5,24 +5,24 @@ # $FreeBSD$ PORTNAME= gui -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= x11-toolkits devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= ${PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtGui module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtCore.so:${PORTSDIR}/devel/py-qt4-core +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT_VER= 4 -QT_COMPONENTS= gui imageformats iconengines qmake +QT_COMPONENTS= gui imageformats inputmethods iconengines qmake OPTIONS= API "Install QtGui API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtGui.api" diff --git a/x11-toolkits/py-qt4-gui/distinfo b/x11-toolkits/py-qt4-gui/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/x11-toolkits/py-qt4-gui/distinfo +++ b/x11-toolkits/py-qt4-gui/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile index 04783dc4922b..73be1bd0c789 100644 --- a/x11/py-qt4-opengl/Makefile +++ b/x11/py-qt4-opengl/Makefile @@ -5,19 +5,19 @@ # $FreeBSD$ PORTNAME= opengl -PORTVERSION= 4.3.1 -PORTREVISION= # zero +PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 + CATEGORIES= x11 devel python -MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \ - http://freebsd.ricin.com/ports/distfiles/ +MASTER_SITES= ${MASTER_SITES_PYQT4} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- -DISTNAME= PyQt-x11-gpl-${PORTVERSION} +DISTNAME= ${PYQT4_DISTNAME} -MAINTAINER= danny@ricin.com +MAINTAINER= {PYQT_MAINTAINER} COMMENT= Python bindings for the Qt4 toolkit, QtOpenGL module -BUILD_DEPENDS= ${LOCALBASE}/bin/sip:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui HAS_CONFIGURE= yes USE_PYTHON= 2.5+ @@ -35,8 +35,10 @@ SIPDIR= ${PREFIX}/share/py-sip CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" ARGS= -b ${PREFIX}/bin\ -d ${PYTHON_SITELIBDIR}\ - -q ${QT_PREFIX}/bin/qmake-qt4 + -q ${QT_PREFIX}/bin/qmake-qt4\ + --confirm-license +.include "../../devel/py-sip/files/bsd.pyqt.mk" .include <bsd.port.pre.mk> .if defined(WITH_DEBUG) @@ -47,7 +49,7 @@ ARGS+= --no-qsci-api PLIST_SUB+= API="@comment " PLIST_SUB+= APIFILE="@comment " .else -LIB_DEPENDS+= qscintilla2.2:${PORTSDIR}/devel/qscintilla2 +LIB_DEPENDS+= qscintilla2.3:${PORTSDIR}/devel/qscintilla2 ARGS+= --qsci-api PLIST_SUB+= API="" PLIST_SUB+= APIFILE="share/qt4/qsci/api/python/QtOpenGL.api" diff --git a/x11/py-qt4-opengl/distinfo b/x11/py-qt4-opengl/distinfo index 7f92e8fa957f..8c72753540f7 100644 --- a/x11/py-qt4-opengl/distinfo +++ b/x11/py-qt4-opengl/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.3.1.tar.gz) = 5d0095d7f08a973b4a04e09e7f6ab568 -SHA256 (PyQt-x11-gpl-4.3.1.tar.gz) = ed65a89360746a6e07113441a66fbcc545570391ae382fc1004b2f728805d861 -SIZE (PyQt-x11-gpl-4.3.1.tar.gz) = 6176590 +MD5 (PyQt-x11-gpl-4.3.3.tar.gz) = a2ead359f57d84c24bdd10de387e80b4 +SHA256 (PyQt-x11-gpl-4.3.3.tar.gz) = d36383e40a983f4d5d53b38bb85409e55a82e3aac0d7296abe68d913befa1e55 +SIZE (PyQt-x11-gpl-4.3.3.tar.gz) = 6191266 |