diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2010-12-02 19:47:17 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-12-02 19:47:17 +0000 |
| commit | 43a46c6993b270c965c21db4fac822d938ec1475 (patch) | |
| tree | af45a12b238a5ed25cadc0e0fb5a4984cacebafc /devel | |
| parent | de0eaeceeccc6bcf986371e4c3367b326eac64a6 (diff) | |
| download | ports-43a46c6993b270c965c21db4fac822d938ec1475.tar.gz ports-43a46c6993b270c965c21db4fac822d938ec1475.zip | |
Notes
Diffstat (limited to 'devel')
72 files changed, 684 insertions, 272 deletions
diff --git a/devel/Makefile b/devel/Makefile index 376c0a670a91..0f97d349e7a5 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2861,6 +2861,7 @@ SUBDIR += py-qt4-assistant SUBDIR += py-qt4-core SUBDIR += py-qt4-dbus + SUBDIR += py-qt4-declarative SUBDIR += py-qt4-designer SUBDIR += py-qt4-designerplugin SUBDIR += py-qt4-help @@ -2972,6 +2973,7 @@ SUBDIR += qt4-assistant SUBDIR += qt4-assistant-adp SUBDIR += qt4-corelib + SUBDIR += qt4-declarative SUBDIR += qt4-designer SUBDIR += qt4-help SUBDIR += qt4-help-tools diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index e09927574879..f0dc2c65a651 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -7,7 +7,7 @@ # PORTNAME= dbus -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-assistant/distinfo +++ b/devel/py-qt4-assistant/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-core/distinfo +++ b/devel/py-qt4-core/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-core/files/Qt.py b/devel/py-qt4-core/files/Qt.py index f792582184d0..71a0d98b9d08 100644 --- a/devel/py-qt4-core/files/Qt.py +++ b/devel/py-qt4-core/files/Qt.py @@ -20,6 +20,10 @@ try: except ImportError: pass try: + from PyQt4.QtDeclarative import * +except ImportError: + pass +try: from PyQt4.QtDesigner import * except ImportError: pass diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py index 998a1712ca4a..371548abd2a8 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 2010-03-18 04:29:19.000000000 +1000 -+++ configure.py 2010-03-18 14:07:20.613873966 +1000 +--- ./configure.py.orig 2010-10-29 18:43:52.000000000 +0400 ++++ ./configure.py 2010-11-05 13:07:29.388903079 +0300 @@ -36,6 +36,10 @@ import sipconfig @@ -10,7 +10,7 @@ +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT'] # Initialise the globals. - pyqt_version = 0x040702 + pyqt_version = 0x040801 @@ -70,7 +74,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. -@@ -375,14 +378,23 @@ +@@ -382,14 +385,23 @@ elif sipcfg.universal: sipconfig.inform("QtDesigner module disabled with universal binaries.") else: @@ -46,7 +46,7 @@ def code(self): cons_xtra_incdirs = [] -@@ -408,6 +420,10 @@ +@@ -415,6 +427,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) -@@ -596,19 +612,28 @@ +@@ -616,19 +632,28 @@ sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins)) # Generate the QScintilla API file. @@ -76,26 +76,26 @@ + # aggregating like below would kill packaging + # instead the port installs the seperate module APIs + f = open("PyQt4.api", "w") -+ -+ for m in pyqt_modules: -+ api = open(m + ".api") - for l in api: - f.write("PyQt4." + l) -+ for l in api: -+ f.write("PyQt4." + l) ++ for m in pyqt_modules: ++ api = open(m + ".api") - api.close() - os.remove(m + ".api") -+ api.close() -+ os.remove(m + ".api") ++ for l in api: ++ f.write("PyQt4." + l) - f.close() ++ api.close() ++ os.remove(m + ".api") ++ + f.close() def _qpy_directories(self, mname, lib_name): """Return a 3-tuple of the directories containing the header files, the -@@ -700,19 +725,25 @@ +@@ -720,22 +745,28 @@ return libs, libdirs def module_installs(self): @@ -120,12 +120,16 @@ + if freebsd_port == 'gui': qpylibs["QtGui"] = "qpygui.pro" +- if "QtDeclarative" in pyqt_modules: ++ if freebsd_port == 'declarative': + qpylibs["QtDeclarative"] = "qpydeclarative.pro" + - if "QtDesigner" in pyqt_modules: + if freebsd_port == 'designer': qpylibs["QtDesigner"] = "qpydesigner.pro" # Run qmake to generate the Makefiles. -@@ -822,30 +853,58 @@ +@@ -845,30 +876,58 @@ # 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). @@ -186,7 +190,9 @@ - installs=[[os.path.basename(wrapper), opts.pyqtbindir]] - ) + sipconfig.inform("Creating pyuic4 Makefile...") -+ + +- makefile.generate() +- tool.append("pyuic") + makefile = sipconfig.PythonModuleMakefile( + configuration=sipcfg, + dstdir=uicdir, @@ -194,15 +200,13 @@ + dir="pyuic", + installs=[[os.path.basename(wrapper), opts.pyqtbindir]] + ) - -- makefile.generate() -- tool.append("pyuic") ++ + makefile.generate() + tool.append("pyuic") if "QtXml" in pyqt_modules: sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -873,7 +932,10 @@ +@@ -896,7 +955,10 @@ makefile.generate() tool.append("pyrcc") else: @@ -214,7 +218,7 @@ if opts.designer_plugin and "QtDesigner" in pyqt_modules: py_major = sipcfg.py_version >> 16 -@@ -896,11 +958,17 @@ +@@ -919,11 +981,17 @@ glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))): lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor) @@ -233,7 +237,7 @@ if opts.designer_plugin: sipconfig.inform("Creating Qt Designer plugin Makefile...") -@@ -994,8 +1062,13 @@ +@@ -1017,8 +1085,13 @@ 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) @@ -249,7 +253,7 @@ if opts.no_docstrings: sipconfig.inform("PyQt is being built without generated docstrings.") -@@ -1005,18 +1078,36 @@ +@@ -1028,18 +1101,36 @@ if opts.prot_is_public: sipconfig.inform("PyQt is being built with 'protected' redefined as 'public'.") @@ -291,7 +295,7 @@ if opts.vendorcheck: sipconfig.inform("PyQt will only be usable with signed interpreters.") -@@ -1493,7 +1584,11 @@ +@@ -1520,7 +1611,11 @@ of libraries. extra_sip_flags is an optional list of additional flags to pass to SIP. """ @@ -304,7 +308,7 @@ mk_clean_dir(mname) -@@ -1579,7 +1674,11 @@ +@@ -1606,7 +1701,11 @@ sipconfig.error("Unable to create the C++ code.") # Generate the Makefile. @@ -317,7 +321,7 @@ installs = [] -@@ -2072,6 +2171,10 @@ +@@ -2110,6 +2209,10 @@ p.print_help() sys.exit(2) @@ -328,7 +332,7 @@ sipcfg.set_build_macros(macros) # Check Qt is what we need. -@@ -2079,7 +2182,7 @@ +@@ -2117,7 +2220,7 @@ # Check the licenses are compatible. check_license() @@ -337,7 +341,7 @@ # Check which modules to build. pyqt.check_modules() -@@ -2101,9 +2204,18 @@ +@@ -2139,9 +2242,18 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] if opts.api: @@ -358,14 +362,14 @@ if opts.bigqt: xtra_modules.append("_qt") -@@ -2114,15 +2226,33 @@ +@@ -2152,15 +2264,33 @@ if opts.mwg_qwt_dir: xtra_modules.append("Qwt5") + if freebsd: + if freebsd_port == 'dbus': + s = pyqt.tools() -+ elif freebsd_port in ('designer', 'gui'): ++ elif freebsd_port in ('declarative', 'designer', 'gui'): + s = pyqt.qpy_libs() + [pyqt_modules[-1]] + elif freebsd_port == 'designerplugin': + s = pyqt.tools() diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist index 9c0d800275d4..8db0e5d8144d 100644 --- a/devel/py-qt4-core/pkg-plist +++ b/devel/py-qt4-core/pkg-plist @@ -57,12 +57,12 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/__init__.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/as_string.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/ascii_upper.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/encode_utf8.py -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/encode_utf8.pyc -%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/encode_utf8.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/invoke.pyo @@ -84,8 +84,8 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/uiparser.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/uiparser.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/uiparser.pyo -%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/phonon.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.pyc @@ -93,6 +93,9 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qscintilla.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qscintilla.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qscintilla.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtdeclarative.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtdeclarative.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtdeclarative.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo @@ -118,6 +121,7 @@ bin/pyuic4 %%SIP%%share/py-sip/QtCore/qdir.sip %%SIP%%share/py-sip/QtCore/qdiriterator.sip %%SIP%%share/py-sip/QtCore/qeasingcurve.sip +%%SIP%%share/py-sip/QtCore/qelapsedtimer.sip %%SIP%%share/py-sip/QtCore/qeventloop.sip %%SIP%%share/py-sip/QtCore/qeventtransition.sip %%SIP%%share/py-sip/QtCore/qfile.sip diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-dbus/distinfo +++ b/devel/py-qt4-dbus/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile new file mode 100644 index 000000000000..861c8cee2ec6 --- /dev/null +++ b/devel/py-qt4-declarative/Makefile @@ -0,0 +1,79 @@ +# New ports collection makefile for: py-qt4-declarative +# Date created: 2010-11-05 +# Whom: Max Brazhnikov <makc@FreeBSD.org> +# +# $FreeBSD$ + +PORTNAME= declarative +PORTVERSION= ${PYQT4_VERSION} +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 + +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+ +USE_QT_VER= 4 +QT_COMPONENTS= declarative qmake_build moc_build + +OPTIONS= API "Install QtDeclarative API for QScintilla2" on \ + DEBUG "Enable debugging in generated code" off \ + SIPFILES "Install the QtDeclarative SIP files" on \ + TRACING "Enable tracing in generated code" off + +PATCHDIR= ${PORTSDIR}/devel/py-qt4-core/files +OPTIONSFILE= ${PORT_DBDIR}/py-qt4-${PORTNAME}/options +SIPDIR= ${PREFIX}/share/py-sip +QSCIDIR= ${PREFIX}/share/qt4/qsci +CONFIGURE_ENV+= PYQT4_COMPONENT="${PORTNAME}" +ARGS= -b ${PREFIX}/bin\ + -d ${PYTHONPREFIX_SITELIBDIR}\ + -p ${PREFIX}/${QT_PLUGINDIR_REL}\ + -q ${QMAKE}\ + --confirm-license\ + --enable QtDeclarative + +.include "../py-sip/files/bsd.pyqt.mk" +.include <bsd.port.options.mk> + +.if defined(WITH_DEBUG) +ARGS+= --debug +.endif +.if defined(WITHOUT_API) +ARGS+= --no-qsci-api +PLIST_SUB+= API="@comment " +.else +LIB_DEPENDS+= qscintilla2.5:${PORTSDIR}/devel/qscintilla2 +ARGS+= --qsci-api --qsci-api-destdir=${QSCIDIR} +PLIST_SUB+= API="" +.endif +.if defined(WITHOUT_SIPFILES) +ARGS+= --no-sip-files +PLIST_SUB+= SIP="@comment " +.else +ARGS+= --sipdir ${SIPDIR} +PLIST_SUB+= SIP="" +.endif +.if defined(WITH_TRACING) +ARGS+= --trace +.endif + +do-configure: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ + ${PYTHON_CMD} configure.py ${ARGS} + +post-configure: + ${REINPLACE_CMD} -e 's|mkspecs/freebsd-g++|share/qt4/mkspecs/freebsd-g++|'\ + -e 's|CC = cc|CC = ${CC}|'\ + -e 's|CXX = c++|CXX = ${CXX}|'\ + -e 's|LINK = c++|LINK = ${CXX}|'\ + ${WRKSRC}/QtDeclarative/Makefile + +.include <bsd.port.mk> diff --git a/devel/py-qt4-declarative/distinfo b/devel/py-qt4-declarative/distinfo new file mode 100644 index 000000000000..6c04995bffe2 --- /dev/null +++ b/devel/py-qt4-declarative/distinfo @@ -0,0 +1,2 @@ +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-declarative/pkg-descr b/devel/py-qt4-declarative/pkg-descr new file mode 100644 index 000000000000..0c4c52eb8921 --- /dev/null +++ b/devel/py-qt4-declarative/pkg-descr @@ -0,0 +1,4 @@ +PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +This package provides the QtDeclarative module. + +WWW: http://www.riverbankcomputing.co.uk/pyqt/ diff --git a/devel/py-qt4-declarative/pkg-plist b/devel/py-qt4-declarative/pkg-plist new file mode 100644 index 000000000000..041bde932741 --- /dev/null +++ b/devel/py-qt4-declarative/pkg-plist @@ -0,0 +1,23 @@ +%%PYTHON_SITELIBDIR%%/PyQt4/QtDeclarative.so +%%SIP%%share/py-sip/QtDeclarative/QtDeclarativemod.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativecomponent.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativecontext.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeengine.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeerror.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeexpression.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeextensionplugin.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeimageprovider.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeitem.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativelist.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeparserstatus.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeproperty.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativepropertymap.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativepropertyvaluesource.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativescriptstring.sip +%%SIP%%share/py-sip/QtDeclarative/qdeclarativeview.sip +%%SIP%%share/py-sip/QtDeclarative/qpydeclarativelistproperty.sip +%%SIP%%share/py-sip/QtDeclarative/qpydeclarativepropertyvaluesource.sip +%%API%%share/qt4/qsci/api/python/QtDeclarative.api +%%SIP%%@dirrmtry share/py-sip/QtDeclarative +@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-designer/distinfo +++ b/devel/py-qt4-designer/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-designerplugin/distinfo +++ b/devel/py-qt4-designerplugin/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-help/distinfo b/devel/py-qt4-help/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-help/distinfo +++ b/devel/py-qt4-help/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-qscintilla2/distinfo b/devel/py-qt4-qscintilla2/distinfo index 91da430efc6e..fe240e107657 100644 --- a/devel/py-qt4-qscintilla2/distinfo +++ b/devel/py-qt4-qscintilla2/distinfo @@ -1,3 +1,2 @@ -MD5 (QScintilla-gpl-2.4.3.tar.gz) = b1c83d42398493bedb22f4df1868627d -SHA256 (QScintilla-gpl-2.4.3.tar.gz) = a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9 -SIZE (QScintilla-gpl-2.4.3.tar.gz) = 2368919 +SHA256 (QScintilla-gpl-2.4.5.tar.gz) = cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09 +SIZE (QScintilla-gpl-2.4.5.tar.gz) = 2372380 diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-script/distinfo +++ b/devel/py-qt4-script/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-scripttools/distinfo b/devel/py-qt4-scripttools/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-scripttools/distinfo +++ b/devel/py-qt4-scripttools/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo index 9a0976bb9c38..6c04995bffe2 100644 --- a/devel/py-qt4-test/distinfo +++ b/devel/py-qt4-test/distinfo @@ -1,3 +1,2 @@ -MD5 (PyQt-x11-gpl-4.7.3.tar.gz) = 42fdda73f07810abba002af8a939ee50 -SHA256 (PyQt-x11-gpl-4.7.3.tar.gz) = 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -SIZE (PyQt-x11-gpl-4.7.3.tar.gz) = 7803557 +SHA256 (PyQt-x11-gpl-4.8.1.tar.gz) = 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 +SIZE (PyQt-x11-gpl-4.8.1.tar.gz) = 9409175 diff --git a/devel/py-qt4/Makefile b/devel/py-qt4/Makefile index 757c6b3b84a6..b11142cf8979 100644 --- a/devel/py-qt4/Makefile +++ b/devel/py-qt4/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX2= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}- MAINTAINER= kde@FreeBSD.org -COMMENT?= The "meta-port" for PyQt4 +COMMENT= The "meta-port" for PyQt4 USE_PYTHON= yes @@ -32,6 +32,7 @@ RUN_DEPENDS+= ${PKGNAMEPREFIX2}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-c ${PKGNAMEPREFIX2}sql>=${PYQT4_VERSION}:${PORTSDIR}/databases/py-qt4-sql \ ${PKGNAMEPREFIX2}svg>=${PYQT4_VERSION}:${PORTSDIR}/graphics/py-qt4-svg \ ${PKGNAMEPREFIX2}test>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-test \ + ${PKGNAMEPREFIX2}declarative>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-declarative \ ${PKGNAMEPREFIX2}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer \ ${PKGNAMEPREFIX2}designerplugin>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designerplugin \ ${PKGNAMEPREFIX2}dbus>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-dbus \ diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 4cf73f9c565b..ed80d7ea1c65 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,3 +1,2 @@ -MD5 (sip-4.10.2.tar.gz) = 52d11ca9c1a0d0cddc9b89268bff5929 -SHA256 (sip-4.10.2.tar.gz) = 38d9f6d07f3a9fa967e60c1da11ffb04bd76f0f4fd4767d9c8a9bca11c0888ef -SIZE (sip-4.10.2.tar.gz) = 646683 +SHA256 (sip-4.11.2.tar.gz) = ced00216488aa4dd0728d706a551c36c694a26c95e85103ccc21913a8090373c +SIZE (sip-4.11.2.tar.gz) = 665000 diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk index a97c9cec86f5..b25155182e32 100644 --- a/devel/py-sip/files/bsd.pyqt.mk +++ b/devel/py-sip/files/bsd.pyqt.mk @@ -21,16 +21,20 @@ MASTER_SITES_QSCI1= ${MASTER_SITE_RIVERBANK}QScintilla1/ \ MASTER_SITES_QSCI2= ${MASTER_SITE_RIVERBANK}QScintilla2/ \ ${MASTER_SITE_FLUFFY}QScintilla2/ -SIP_VERSION= 4.10.2 -PYQT3_VERSION= 3.18.1 -PYQT4_VERSION= 4.7.3 -PYKDE3_VERSION= 3.16.6 +SIP_VERSION= 4.11.2 +#SIP_SNAP= -snapshot-20100102 +PYQT3_VERSION= 3.18.2 +PYQT3_SNAP= -snapshot-20091119 +PYQT4_VERSION= 4.8.1 +#PYQT4_SNAP= -snapshot-20100110 +PYKDE3_VERSION= 3.16.7 QSCI1_VERSION= 1.7.1 -QSCI2_VERSION= 2.4.3 +QSCI2_VERSION= 2.4.5 +#QSCI2_SNAP= -snapshot-20091222 -SIP_DISTNAME= sip-${SIP_VERSION} -PYQT3_DISTNAME= PyQt-x11-gpl-${PYQT3_VERSION} -PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION} +SIP_DISTNAME= sip-${SIP_VERSION}${SIP_SNAP} +PYQT3_DISTNAME= PyQt-x11-gpl-${PYQT3_VERSION}${PYQT3_SNAP} +PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION}${PYQT4_SNAP} PYKDE3_DISTNAME= PyKDE-${PYKDE3_VERSION} QSCI1_DISTNAME= QScintilla-1.71-gpl-${QSCI1_VERSION} -QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION} +QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}${QSCI2_SNAP} diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 913a6e81417a..2d1f008a0bc0 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ PORTNAME= qmake -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt4- @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= FILESDIR="${FILESDIR}" MAKE_JOBS_SAFE= yes -TODAY_CMD= /bin/date +%Y-%m-%d +TODAY_CMD= /bin/date +%Y-%m-%d EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ '${DISTNAME}/mkspecs' \ @@ -49,11 +49,23 @@ post-patch: -e 's|-pthread|${PTHREAD_LIBS}|' \ -e 's|uic|uic-qt4|' \ -e 's|moc|moc-qt4|' \ - ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf \ - ${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf \ - ${WRKSRC}/../mkspecs/freebsd-g++40/qmake.conf \ - ${WRKSRC}/../mkspecs/freebsd-icc/qmake.conf + ${WRKSRC}/../mkspecs/freebsd-*/qmake.conf @${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix + # Add mkspecs for all the available compilers. + @${CP} ${WRKSRC}/../mkspecs/common/g++.conf ${WRKSRC}/../mkspecs/common/clang.conf + @${REINPLACE_CMD} -e 's|gcc|clang|g' -e 's|g++|clang++|g' \ + ${WRKSRC}/../mkspecs/common/clang.conf +.for c in clang llvm + @${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++ ${WRKSRC}/../mkspecs/freebsd-${c} + @${REINPLACE_CMD} -e 's|g++|${c}|g' \ + ${WRKSRC}/../mkspecs/freebsd-${c}/qmake.conf +.endfor +.for v in 42 43 44 45 46 + @${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++40 ${WRKSRC}/../mkspecs/freebsd-g++${v} + @${REINPLACE_CMD} -e 's|40|${v}|g' \ + ${WRKSRC}/../mkspecs/freebsd-g++${v}/qmake.conf +.endfor + @${RM} -r ${WRKSRC}/../mkspecs/freebsd-g++40 do-configure: ${SED} -e 's|/usr/local|${PREFIX}|g' \ @@ -61,7 +73,8 @@ do-configure: < ${FILESDIR}/qconfig.cpp \ > ${WRKSRC:H}/src/corelib/global/qconfig.cpp ${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h - ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h +# ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h + ${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h .include <bsd.port.pre.mk> .include "${.CURDIR}/../../Mk/bsd.qt.mk" @@ -75,6 +88,6 @@ CXXFLAGS+= -fno-gcse .endif post-install: - ${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-g++ ${PREFIX}/share/qt4/mkspecs/default + ${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default .include <bsd.port.post.mk> diff --git a/devel/qmake4/files/qconfig.cpp b/devel/qmake4/files/qconfig.cpp index bcbbe10ff17b..4c9d87090657 100644 --- a/devel/qmake4/files/qconfig.cpp +++ b/devel/qmake4/files/qconfig.cpp @@ -15,6 +15,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=T #define QT_CONFIGURE_LIBRARIES_PATH "/usr/local/lib/qt4"; #define QT_CONFIGURE_BINARIES_PATH "/usr/local/bin"; #define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/qt4/plugins"; +#define QT_CONFIGURE_IMPORTS_PATH "/usr/local/lib/qt4/imports"; #define QT_CONFIGURE_DATA_PATH "/usr/local/share/qt4"; #define QT_CONFIGURE_TRANSLATIONS_PATH "/usr/local/share/qt4/translations"; #define QT_CONFIGURE_SETTINGS_PATH "/usr/local/etc/xdg"; diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index a8ac1e1930eb..b609f2263f41 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -7,15 +7,41 @@ share/qt4/mkspecs/aix-xlc-64/qmake.conf share/qt4/mkspecs/aix-xlc-64/qplatformdefs.h share/qt4/mkspecs/aix-xlc/qmake.conf share/qt4/mkspecs/aix-xlc/qplatformdefs.h +share/qt4/mkspecs/common/aix/qplatformdefs.h +share/qt4/mkspecs/common/armcc.conf +share/qt4/mkspecs/common/c89/qplatformdefs.h +share/qt4/mkspecs/common/clang.conf share/qt4/mkspecs/common/g++.conf share/qt4/mkspecs/common/linux.conf share/qt4/mkspecs/common/llvm.conf share/qt4/mkspecs/common/mac-g++.conf share/qt4/mkspecs/common/mac-llvm.conf share/qt4/mkspecs/common/mac.conf +share/qt4/mkspecs/common/posix/qplatformdefs.h share/qt4/mkspecs/common/qws.conf +share/qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknPopupFader.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknServerApp.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknUtils.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknsConstants.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknsItemID.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h +share/qt4/mkspecs/common/symbian/header-wrappers/AknsUtils.h +share/qt4/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h +share/qt4/mkspecs/common/symbian/header-wrappers/ApDataHandler.h +share/qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h +share/qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h +share/qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h share/qt4/mkspecs/common/symbian/qplatformdefs.h share/qt4/mkspecs/common/symbian/stl-off/new +share/qt4/mkspecs/common/symbian/symbian-makefile.conf +share/qt4/mkspecs/common/symbian/symbian-mmp.conf share/qt4/mkspecs/common/symbian/symbian.conf share/qt4/mkspecs/common/unix.conf share/qt4/mkspecs/common/wince/qmake.conf @@ -25,7 +51,6 @@ share/qt4/mkspecs/cygwin-g++/qplatformdefs.h share/qt4/mkspecs/darwin-g++/qmake.conf share/qt4/mkspecs/darwin-g++/qplatformdefs.h share/qt4/mkspecs/default -share/qt4/mkspecs/features/assistant.prf share/qt4/mkspecs/features/build_pass.prf share/qt4/mkspecs/features/dbusadaptors.prf share/qt4/mkspecs/features/dbusinterfaces.prf @@ -73,16 +98,27 @@ share/qt4/mkspecs/features/symbian/add_mmp_rules.prf share/qt4/mkspecs/features/symbian/application_icon.prf share/qt4/mkspecs/features/symbian/armcc_warnings.prf share/qt4/mkspecs/features/symbian/data_caging_paths.prf +share/qt4/mkspecs/features/symbian/debug.prf share/qt4/mkspecs/features/symbian/def_files.prf share/qt4/mkspecs/features/symbian/def_files_disabled.prf share/qt4/mkspecs/features/symbian/default_post.prf share/qt4/mkspecs/features/symbian/default_pre.prf +share/qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf share/qt4/mkspecs/features/symbian/epocallowdlldata.prf share/qt4/mkspecs/features/symbian/moc.prf +share/qt4/mkspecs/features/symbian/nested_exceptions.prf +share/qt4/mkspecs/features/symbian/opengl.prf share/qt4/mkspecs/features/symbian/platform_paths.prf share/qt4/mkspecs/features/symbian/qt.prf +share/qt4/mkspecs/features/symbian/qt_config.prf +share/qt4/mkspecs/features/symbian/release.prf +share/qt4/mkspecs/features/symbian/run_on_phone.prf +share/qt4/mkspecs/features/symbian/sis_targets.prf share/qt4/mkspecs/features/symbian/stl.prf share/qt4/mkspecs/features/symbian/stl_off.prf +share/qt4/mkspecs/features/symbian/symbian_building.prf +share/qt4/mkspecs/features/symbian/thread.prf +share/qt4/mkspecs/features/testcase.prf share/qt4/mkspecs/features/uic.prf share/qt4/mkspecs/features/uitools.prf share/qt4/mkspecs/features/unix/bsymbolic_functions.prf @@ -110,6 +146,7 @@ share/qt4/mkspecs/features/win32/embed_manifest_exe.prf share/qt4/mkspecs/features/win32/exceptions.prf share/qt4/mkspecs/features/win32/exceptions_off.prf share/qt4/mkspecs/features/win32/ltcg.prf +share/qt4/mkspecs/features/win32/msvc_mp.prf share/qt4/mkspecs/features/win32/opengl.prf share/qt4/mkspecs/features/win32/openvg.prf share/qt4/mkspecs/features/win32/qaxcontainer.prf @@ -123,14 +160,26 @@ share/qt4/mkspecs/features/win32/thread.prf share/qt4/mkspecs/features/win32/thread_off.prf share/qt4/mkspecs/features/win32/windows.prf share/qt4/mkspecs/features/yacc.prf +share/qt4/mkspecs/freebsd-clang/qmake.conf +share/qt4/mkspecs/freebsd-clang/qplatformdefs.h share/qt4/mkspecs/freebsd-g++/qmake.conf share/qt4/mkspecs/freebsd-g++/qplatformdefs.h share/qt4/mkspecs/freebsd-g++34/qmake.conf share/qt4/mkspecs/freebsd-g++34/qplatformdefs.h -share/qt4/mkspecs/freebsd-g++40/qmake.conf -share/qt4/mkspecs/freebsd-g++40/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++42/qmake.conf +share/qt4/mkspecs/freebsd-g++42/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++43/qmake.conf +share/qt4/mkspecs/freebsd-g++43/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++44/qmake.conf +share/qt4/mkspecs/freebsd-g++44/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++45/qmake.conf +share/qt4/mkspecs/freebsd-g++45/qplatformdefs.h +share/qt4/mkspecs/freebsd-g++46/qmake.conf +share/qt4/mkspecs/freebsd-g++46/qplatformdefs.h share/qt4/mkspecs/freebsd-icc/qmake.conf share/qt4/mkspecs/freebsd-icc/qplatformdefs.h +share/qt4/mkspecs/freebsd-llvm/qmake.conf +share/qt4/mkspecs/freebsd-llvm/qplatformdefs.h share/qt4/mkspecs/hpux-acc-64/qmake.conf share/qt4/mkspecs/hpux-acc-64/qplatformdefs.h share/qt4/mkspecs/hpux-acc-o64/qmake.conf @@ -212,6 +261,7 @@ share/qt4/mkspecs/macx-xcode/qmake.conf share/qt4/mkspecs/macx-xcode/qplatformdefs.h share/qt4/mkspecs/macx-xlc/qmake.conf share/qt4/mkspecs/macx-xlc/qplatformdefs.h +share/qt4/mkspecs/modules/README share/qt4/mkspecs/netbsd-g++/qmake.conf share/qt4/mkspecs/netbsd-g++/qplatformdefs.h share/qt4/mkspecs/openbsd-g++/qmake.conf @@ -220,6 +270,8 @@ share/qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf share/qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-arm-g++/qmake.conf share/qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h +share/qt4/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf +share/qt4/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-armv6-g++/qmake.conf share/qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h share/qt4/mkspecs/qws/linux-avr32-g++/qmake.conf @@ -283,6 +335,12 @@ share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm share/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml share/qt4/mkspecs/symbian-sbsv2/qmake.conf share/qt4/mkspecs/symbian-sbsv2/qplatformdefs.h +share/qt4/mkspecs/symbian/linux-armcc/features/default_post.prf +share/qt4/mkspecs/symbian/linux-armcc/qmake.conf +share/qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h +share/qt4/mkspecs/symbian/linux-gcce/features/default_post.prf +share/qt4/mkspecs/symbian/linux-gcce/qmake.conf +share/qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h share/qt4/mkspecs/tru64-cxx/qmake.conf share/qt4/mkspecs/tru64-cxx/qplatformdefs.h share/qt4/mkspecs/tru64-g++/qmake.conf @@ -297,6 +355,8 @@ share/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf share/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h share/qt4/mkspecs/unsupported/qnx-g++/qmake.conf share/qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/qws/qnx-641/qmake.conf +share/qt4/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h share/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf share/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h share/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf @@ -311,26 +371,22 @@ share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h share/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf share/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h +share/qt4/mkspecs/unsupported/win32-g++-cross/qmake.conf +share/qt4/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h share/qt4/mkspecs/win32-borland/qmake.conf share/qt4/mkspecs/win32-borland/qplatformdefs.h share/qt4/mkspecs/win32-g++/qmake.conf share/qt4/mkspecs/win32-g++/qplatformdefs.h share/qt4/mkspecs/win32-icc/qmake.conf share/qt4/mkspecs/win32-icc/qplatformdefs.h -share/qt4/mkspecs/win32-msvc.net/qmake.conf -share/qt4/mkspecs/win32-msvc.net/qplatformdefs.h -share/qt4/mkspecs/win32-msvc/features/incremental.prf -share/qt4/mkspecs/win32-msvc/features/incremental_off.prf -share/qt4/mkspecs/win32-msvc/qmake.conf -share/qt4/mkspecs/win32-msvc/qplatformdefs.h -share/qt4/mkspecs/win32-msvc2002/qmake.conf -share/qt4/mkspecs/win32-msvc2002/qplatformdefs.h share/qt4/mkspecs/win32-msvc2003/qmake.conf share/qt4/mkspecs/win32-msvc2003/qplatformdefs.h share/qt4/mkspecs/win32-msvc2005/qmake.conf share/qt4/mkspecs/win32-msvc2005/qplatformdefs.h share/qt4/mkspecs/win32-msvc2008/qmake.conf share/qt4/mkspecs/win32-msvc2008/qplatformdefs.h +share/qt4/mkspecs/win32-msvc2010/qmake.conf +share/qt4/mkspecs/win32-msvc2010/qplatformdefs.h share/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf share/qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h @@ -413,16 +469,14 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/wince50standard-mipsii-msvc2005 @dirrm share/qt4/mkspecs/wince50standard-armv4i-msvc2008 @dirrm share/qt4/mkspecs/wince50standard-armv4i-msvc2005 +@dirrm share/qt4/mkspecs/win32-msvc2010 @dirrm share/qt4/mkspecs/win32-msvc2008 @dirrm share/qt4/mkspecs/win32-msvc2005 @dirrm share/qt4/mkspecs/win32-msvc2003 -@dirrm share/qt4/mkspecs/win32-msvc2002 -@dirrm share/qt4/mkspecs/win32-msvc/features -@dirrm share/qt4/mkspecs/win32-msvc.net -@dirrm share/qt4/mkspecs/win32-msvc @dirrm share/qt4/mkspecs/win32-icc @dirrm share/qt4/mkspecs/win32-g++ @dirrm share/qt4/mkspecs/win32-borland +@dirrm share/qt4/mkspecs/unsupported/win32-g++-cross @dirrm share/qt4/mkspecs/unsupported/vxworks-simpentium-g++ @dirrm share/qt4/mkspecs/unsupported/vxworks-simpentium-dcc @dirrm share/qt4/mkspecs/unsupported/vxworks-ppc-g++ @@ -430,6 +484,7 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/unsupported/qws/qnx-ppc-g++ @dirrm share/qt4/mkspecs/unsupported/qws/qnx-i386-g++ @dirrm share/qt4/mkspecs/unsupported/qws/qnx-generic-g++ +@dirrm share/qt4/mkspecs/unsupported/qws/qnx-641 @dirrm share/qt4/mkspecs/unsupported/qws @dirrm share/qt4/mkspecs/unsupported/qnx-g++ @dirrm share/qt4/mkspecs/unsupported/linux-scratchbox2-g++ @@ -439,10 +494,15 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/unixware-cc @dirrm share/qt4/mkspecs/tru64-g++ @dirrm share/qt4/mkspecs/tru64-cxx +@dirrm share/qt4/mkspecs/symbian/linux-gcce/features +@dirrm share/qt4/mkspecs/symbian/linux-gcce +@dirrm share/qt4/mkspecs/symbian/linux-armcc/features +@dirrm share/qt4/mkspecs/symbian/linux-armcc @dirrm share/qt4/mkspecs/symbian-sbsv2/flm/qt @dirrm share/qt4/mkspecs/symbian-sbsv2/flm @dirrm share/qt4/mkspecs/symbian-sbsv2 @dirrm share/qt4/mkspecs/symbian-abld +@dirrm share/qt4/mkspecs/symbian @dirrm share/qt4/mkspecs/solaris-g++-64 @dirrm share/qt4/mkspecs/solaris-g++ @dirrm share/qt4/mkspecs/solaris-cc-stlport @@ -470,11 +530,13 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/qws/linux-cellon-g++ @dirrm share/qt4/mkspecs/qws/linux-avr32-g++ @dirrm share/qt4/mkspecs/qws/linux-armv6-g++ +@dirrm share/qt4/mkspecs/qws/linux-arm-gnueabi-g++ @dirrm share/qt4/mkspecs/qws/linux-arm-g++ @dirrm share/qt4/mkspecs/qws/freebsd-generic-g++ @dirrm share/qt4/mkspecs/qws @dirrm share/qt4/mkspecs/openbsd-g++ @dirrm share/qt4/mkspecs/netbsd-g++ +@dirrm share/qt4/mkspecs/modules @dirrm share/qt4/mkspecs/macx-xlc @dirrm share/qt4/mkspecs/macx-xcode @dirrm share/qt4/mkspecs/macx-pbuilder @@ -510,10 +572,16 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/hpux-acc-o64 @dirrm share/qt4/mkspecs/hpux-acc-64 @dirrm share/qt4/mkspecs/hpux-acc +@dirrm share/qt4/mkspecs/freebsd-llvm @dirrm share/qt4/mkspecs/freebsd-icc -@dirrm share/qt4/mkspecs/freebsd-g++40 +@dirrm share/qt4/mkspecs/freebsd-g++46 +@dirrm share/qt4/mkspecs/freebsd-g++45 +@dirrm share/qt4/mkspecs/freebsd-g++44 +@dirrm share/qt4/mkspecs/freebsd-g++43 +@dirrm share/qt4/mkspecs/freebsd-g++42 @dirrm share/qt4/mkspecs/freebsd-g++34 @dirrm share/qt4/mkspecs/freebsd-g++ +@dirrm share/qt4/mkspecs/freebsd-clang @dirrm share/qt4/mkspecs/features/win32 @dirrm share/qt4/mkspecs/features/unix @dirrm share/qt4/mkspecs/features/symbian @@ -523,7 +591,11 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h @dirrm share/qt4/mkspecs/cygwin-g++ @dirrm share/qt4/mkspecs/common/wince @dirrm share/qt4/mkspecs/common/symbian/stl-off +@dirrm share/qt4/mkspecs/common/symbian/header-wrappers @dirrm share/qt4/mkspecs/common/symbian +@dirrm share/qt4/mkspecs/common/posix +@dirrm share/qt4/mkspecs/common/c89 +@dirrm share/qt4/mkspecs/common/aix @dirrm share/qt4/mkspecs/common @dirrm share/qt4/mkspecs/aix-xlc-64 @dirrm share/qt4/mkspecs/aix-xlc diff --git a/devel/qscintilla2-designerplugin/distinfo b/devel/qscintilla2-designerplugin/distinfo index 91da430efc6e..fe240e107657 100644 --- a/devel/qscintilla2-designerplugin/distinfo +++ b/devel/qscintilla2-designerplugin/distinfo @@ -1,3 +1,2 @@ -MD5 (QScintilla-gpl-2.4.3.tar.gz) = b1c83d42398493bedb22f4df1868627d -SHA256 (QScintilla-gpl-2.4.3.tar.gz) = a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9 -SIZE (QScintilla-gpl-2.4.3.tar.gz) = 2368919 +SHA256 (QScintilla-gpl-2.4.5.tar.gz) = cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09 +SIZE (QScintilla-gpl-2.4.5.tar.gz) = 2372380 diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo index 91da430efc6e..fe240e107657 100644 --- a/devel/qscintilla2/distinfo +++ b/devel/qscintilla2/distinfo @@ -1,3 +1,2 @@ -MD5 (QScintilla-gpl-2.4.3.tar.gz) = b1c83d42398493bedb22f4df1868627d -SHA256 (QScintilla-gpl-2.4.3.tar.gz) = a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9 -SIZE (QScintilla-gpl-2.4.3.tar.gz) = 2368919 +SHA256 (QScintilla-gpl-2.4.5.tar.gz) = cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09 +SIZE (QScintilla-gpl-2.4.5.tar.gz) = 2372380 diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist index e257a9a20684..b10b3054afd0 100644 --- a/devel/qscintilla2/pkg-plist +++ b/devel/qscintilla2/pkg-plist @@ -45,8 +45,8 @@ %%QT_INCDIR_REL%%/Qsci/qscistyledtext.h %%QT_LIBDIR_REL%%/libqscintilla2.so %%QT_LIBDIR_REL%%/libqscintilla2.so.5 -%%QT_LIBDIR_REL%%/libqscintilla2.so.5.3 -%%QT_LIBDIR_REL%%/libqscintilla2.so.5.3.0 +%%QT_LIBDIR_REL%%/libqscintilla2.so.5.4 +%%QT_LIBDIR_REL%%/libqscintilla2.so.5.4.1 %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/Scintilla/Design.html @@ -157,8 +157,8 @@ %%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText.html %%PORTDOCS%%%%DOCSDIR%%/html/classes.html -%%PORTDOCS%%%%DOCSDIR%%/html/dir_2b8548572807eceec6720569394e58d6.html -%%PORTDOCS%%%%DOCSDIR%%/html/dir_247b66aa290261b71b593aa2827bed18.html +%%PORTDOCS%%%%DOCSDIR%%/html/dir_932a03c217234c6de0e43dd88967b856.html +%%PORTDOCS%%%%DOCSDIR%%/html/dir_f096b17edcc96dd7c2d14ba22ae31afc.html %%PORTDOCS%%%%DOCSDIR%%/html/dirs.html %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png diff --git a/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index b3ff0ec775b9..78602bfc6338 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -6,10 +6,13 @@ # PORTNAME= assistant -PORTVERSION= ${QT4_VERSION} +PORTVERSION= 4.6.3 CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -adp +DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION} +DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser, adp compat version @@ -17,40 +20,21 @@ COMMENT= Qt documentation browser, adp compat version USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib \ gui network xml doc dbus -QT_NONSTANDARD= yes -QT_DIST= yes MAKE_JOBS_SAFE= yes -HAS_CONFIGURE= yes - ALL_TARGET= first -CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH -MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ - PATH=${WRKSRC}/bin:$$PATH - -DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ - src/activeqt src/multimedia src/opengl src/openvg src/phonon \ - src/qt3support src/s60installs src/s60main src/script \ - src/scripttools src/sql src/svg src/testlib src/tools \ - src/winmain src/xmlpatterns src/3rdparty/clucene \ - src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ - src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \ - src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -.for dne in ${DO_NOT_EXTRACT} -EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' -.endfor - -BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}/compat -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure + +WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/} + +PLIST_FILES= bin/assistant_adp pre-configure: - ${MKDIR} ${WRKSRC}/mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc - ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc + ${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_BINS]|${PREFIX}/bin|g' \ + ${WRKSRC}/compat.pro + +do-configure: + @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${QMAKE} -spec ${QMAKESPEC} QT_CONFIG+="dbus" \ + QT_PRODUCT="OpenSource" ${QMAKEFLAGS} .include <bsd.port.mk> diff --git a/devel/qt4-assistant-adp/distinfo b/devel/qt4-assistant-adp/distinfo new file mode 100644 index 000000000000..4df6d7db0dc5 --- /dev/null +++ b/devel/qt4-assistant-adp/distinfo @@ -0,0 +1,2 @@ +SHA256 (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d +SIZE (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = 329896 diff --git a/devel/qt4-assistant-adp/files/patch-compat.pro b/devel/qt4-assistant-adp/files/patch-compat.pro new file mode 100644 index 000000000000..0b0d324e04a3 --- /dev/null +++ b/devel/qt4-assistant-adp/files/patch-compat.pro @@ -0,0 +1,18 @@ +--- ./compat.pro.orig 2010-08-12 11:50:10.000000000 -0400 ++++ ./compat.pro 2010-08-12 11:52:50.000000000 -0400 +@@ -66,8 +66,6 @@ + translations/assistant_adp_zh_CN.ts \ + translations/assistant_adp_zh_TW.ts + +-unix:!contains(QT_CONFIG, zlib):LIBS += -lz +- + contains(CONFIG, static): { + win32 { + exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { +@@ -81,3 +79,6 @@ + } + } + } ++ ++target.path = $$[QT_INSTALL_BINS] ++INSTALLS += target diff --git a/devel/qt4-assistant-adp/pkg-plist b/devel/qt4-assistant-adp/pkg-plist deleted file mode 100644 index 8d78e0a63206..000000000000 --- a/devel/qt4-assistant-adp/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/assistant_adp -%%DEBUG%%bin/assistant_adp.debug diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index df89e51b46b3..b4f6bc23e404 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -7,7 +7,7 @@ # PORTNAME= assistant -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -32,7 +32,7 @@ DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ src/activeqt src/dbus src/multimedia src/opengl src/openvg \ src/phonon src/qt3support src/s60installs src/s60main \ src/script src/scripttools src/svg src/testlib src/tools \ - src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \ + src/winmain src/xmlpatterns src/3rdparty/clucene \ src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \ src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon EXTRACT_AFTER_ARGS= | ${TAR} -xf - @@ -49,7 +49,7 @@ pre-configure: ${REINPLACE_CMD} \ -e 's|^TARGET.*|TARGET=assistant-qt4|g' \ ${BUILD_WRKSRC}/${PORTNAME}.pro - ${MKDIR} ${WRKSRC}/mkspecs + ${MKDIR} ${WRKSRC}/mkspecs/modules ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 320f29d030c2..779403bb4332 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -7,8 +7,7 @@ # PORTNAME= corelib -PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-corelib/files/patch-configure b/devel/qt4-corelib/files/patch-configure index 78e61e71ec52..4acea3d789c5 100644 --- a/devel/qt4-corelib/files/patch-configure +++ b/devel/qt4-corelib/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2009-09-21 14:25:12.859259834 +0200 -+++ configure 2009-09-21 14:47:16.335016833 +0200 -@@ -5886,7 +5886,6 @@ +--- configure.orig 2010-05-10 13:47:34.842989306 +0200 ++++ configure 2010-05-10 13:51:54.767296452 +0200 +@@ -6291,7 +6291,6 @@ QT_CONFIG="$QT_CONFIG phonon-backend" fi else @@ -8,7 +8,7 @@ fi # disable accessibility -@@ -5925,7 +5924,6 @@ +@@ -6343,7 +6342,6 @@ # enable opengl if [ "$CFG_OPENGL" = "no" ]; then @@ -16,7 +16,7 @@ else QT_CONFIG="$QT_CONFIG opengl" fi -@@ -6355,7 +6353,6 @@ +@@ -6812,7 +6810,6 @@ if [ "$CFG_XMLPATTERNS" = "yes" ]; then QT_CONFIG="$QT_CONFIG xmlpatterns" else @@ -24,10 +24,10 @@ fi if [ "$CFG_MULTIMEDIA" = "no" ]; then -@@ -6864,10 +6861,8 @@ - [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" +@@ -7364,10 +7361,8 @@ [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" + [ "$CFG_S60" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60" -[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" @@ -35,7 +35,7 @@ if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -6876,34 +6871,21 @@ +@@ -7376,35 +7371,21 @@ fi # X11/Unix/Mac only configs @@ -68,6 +68,7 @@ -[ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" -[ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" -[ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" +-[ "$CFG_XVIDEO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XVIDEO" -[ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" -[ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" diff --git a/devel/qt4-corelib/files/patch-kqueue b/devel/qt4-corelib/files/patch-kqueue index 7023db2cc4dc..7a30d8092f8c 100644 --- a/devel/qt4-corelib/files/patch-kqueue +++ b/devel/qt4-corelib/files/patch-kqueue @@ -1,8 +1,6 @@ -diff --git src/corelib/io/qfilesystemwatcher_kqueue.cpp src/corelib/io/qfilesystemwatcher_kqueue.cpp -index 99c165e..ce79cf7 100644 ---- src/corelib/io/qfilesystemwatcher_kqueue.cpp -+++ src/corelib/io/qfilesystemwatcher_kqueue.cpp -@@ -133,6 +133,14 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths, +--- src/corelib/io/qfilesystemwatcher_kqueue.cpp.orig 2010-11-06 04:55:18.000000000 +0300 ++++ src/corelib/io/qfilesystemwatcher_kqueue.cpp 2010-11-11 00:05:11.550910992 +0300 +@@ -133,6 +133,14 @@ perror("QKqueueFileSystemWatcherEngine::addPaths: open"); continue; } @@ -17,7 +15,7 @@ index 99c165e..ce79cf7 100644 QT_STATBUF st; if (QT_FSTAT(fd, &st) == -1) { -@@ -157,7 +165,7 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths, +@@ -157,7 +165,7 @@ EV_SET(&kev, fd, EVFILT_VNODE, @@ -26,7 +24,7 @@ index 99c165e..ce79cf7 100644 NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | NOTE_RENAME | NOTE_REVOKE, 0, 0); -@@ -180,6 +188,8 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths, +@@ -180,6 +188,8 @@ idToPath.insert(id, path); } @@ -35,7 +33,7 @@ index 99c165e..ce79cf7 100644 if (!isRunning()) start(); else -@@ -203,19 +213,7 @@ QStringList QKqueueFileSystemWatcherEngine::removePaths(const QStringList &paths +@@ -203,19 +213,7 @@ if (x.isEmpty() || x != path) continue; @@ -56,13 +54,13 @@ index 99c165e..ce79cf7 100644 it.remove(); if (id < 0) -@@ -225,11 +223,11 @@ QStringList QKqueueFileSystemWatcherEngine::removePaths(const QStringList &paths +@@ -225,11 +223,11 @@ } if (pathToID.isEmpty()) { -+ locker.unlock(); - stop(); -- locker.unlock(); +- stop(); + locker.unlock(); ++ stop(); wait(); - locker.relock(); } else { @@ -70,7 +68,7 @@ index 99c165e..ce79cf7 100644 write(kqpipe[1], "@", 1); } -@@ -243,19 +241,18 @@ void QKqueueFileSystemWatcherEngine::stop() +@@ -243,19 +241,18 @@ void QKqueueFileSystemWatcherEngine::run() { @@ -95,7 +93,7 @@ index 99c165e..ce79cf7 100644 int fd = kev.ident; DEBUG() << "QKqueueFileSystemWatcherEngine: processing kevent" << kev.ident << kev.filter; -@@ -287,6 +284,8 @@ void QKqueueFileSystemWatcherEngine::run() +@@ -287,6 +284,8 @@ break; } } else { @@ -104,7 +102,22 @@ index 99c165e..ce79cf7 100644 int id = fd; QString path = idToPath.value(id); if (path.isEmpty()) { -@@ -315,30 +314,15 @@ void QKqueueFileSystemWatcherEngine::run() +@@ -295,12 +294,12 @@ + path = idToPath.value(id); + if (path.isEmpty()) { + DEBUG() << "QKqueueFileSystemWatcherEngine: received a kevent for a file we're not watching"; +- goto process_next_event; ++ continue; + } + } + if (kev.filter != EVFILT_VNODE) { + DEBUG() << "QKqueueFileSystemWatcherEngine: received a kevent with the wrong filter"; +- goto process_next_event; ++ continue; + } + + if ((kev.fflags & (NOTE_DELETE | NOTE_REVOKE | NOTE_RENAME)) != 0) { +@@ -315,31 +314,15 @@ else emit fileChanged(path, true); } else { @@ -131,6 +144,7 @@ index 99c165e..ce79cf7 100644 } - - // are there any more? +-process_next_event: - r = kevent(kqfd, 0, 0, &kev, 1, &ZeroTimeout); - } while (r > 0); + } diff --git a/devel/qt4-corelib/pkg-message b/devel/qt4-corelib/pkg-message index 73e2b9581e01..e4a340d65abd 100644 --- a/devel/qt4-corelib/pkg-message +++ b/devel/qt4-corelib/pkg-message @@ -1,13 +1,13 @@ ===================================================================== -Qt4 can be built with optional support for: +Qt 4 can be built with optional support for: - Common UNIX Printing System (CUPS) - Network Audio System (NAS) - Qt style that renders using GTK (QGTKSTYLE) -In order to enable them, you need add +In order to enable them, you have to add QT4_OPTIONS= CUPS NAS QGTKSTYLE -to your /etc/make.conf and compile devel/qt4-corelib and +to your /etc/make.conf and compile devel/qt4-corelib and x11-toolkits/qt4-gui ports. Attention! Whenever you change the QT4_OPTIONS both diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index 8cbeffe02d9c..2ae15120ef1f 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -56,6 +56,7 @@ include/qt4/Qt/qdebug.h include/qt4/Qt/qdir.h include/qt4/Qt/qdiriterator.h include/qt4/Qt/qeasingcurve.h +include/qt4/Qt/qelapsedtimer.h include/qt4/Qt/qendian.h include/qt4/Qt/qeventloop.h include/qt4/Qt/qeventtransition.h @@ -212,6 +213,7 @@ include/qt4/QtCore/QDir include/qt4/QtCore/QDirIterator include/qt4/QtCore/QDynamicPropertyChangeEvent include/qt4/QtCore/QEasingCurve +include/qt4/QtCore/QElapsedTimer include/qt4/QtCore/QEvent include/qt4/QtCore/QEventLoop include/qt4/QtCore/QEventTransition @@ -425,6 +427,7 @@ include/qt4/QtCore/QtCleanUpFunction include/qt4/QtCore/QtConcurrentFilter include/qt4/QtCore/QtConcurrentMap include/qt4/QtCore/QtConcurrentRun +include/qt4/QtCore/QtConfig include/qt4/QtCore/QtContainerFwd include/qt4/QtCore/QtCore include/qt4/QtCore/QtDebug @@ -490,6 +493,7 @@ include/qt4/QtCore/qdebug.h include/qt4/QtCore/qdir.h include/qt4/QtCore/qdiriterator.h include/qt4/QtCore/qeasingcurve.h +include/qt4/QtCore/qelapsedtimer.h include/qt4/QtCore/qendian.h include/qt4/QtCore/qeventloop.h include/qt4/QtCore/qeventtransition.h diff --git a/devel/qt4-declarative/Makefile b/devel/qt4-declarative/Makefile new file mode 100644 index 000000000000..2b5f2205468a --- /dev/null +++ b/devel/qt4-declarative/Makefile @@ -0,0 +1,62 @@ +# New ports collection makefile for: qt4-declarative +# Date created: 23 May 2010 +# Whom: avilla@FreeBSD.org +# +# $FreeBSD$ +# + +PORTNAME= declarative +DISTVERSION= ${QT4_VERSION} +CATEGORIES?= devel +PKGNAMEPREFIX= qt4- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt4 framework for building highly dynamic user interfaces + +USE_QT_VER= 4 +QT_COMPONENTS= qmake_build moc_build rcc_build uic_build corelib gui network \ + opengl script sql svg xml xmlpatterns +QT_NONSTANDARD= yes +QT_DIST= yes +MAKE_JOBS_SAFE= yes + +HAS_CONFIGURE= yes +USE_LDCONFIG= ${PREFIX}/lib/qt4 + +ALL_TARGET= first +CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH +MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ + PATH=${WRKSRC}/bin:$$PATH + +DO_NOT_EXTRACT= demos doc examples mkspecs qmake tools translations \ + src/activeqt src/dbus src/multimedia src/opengl src/openvg \ + src/phonon src/qt3support src/s60installs src/s60main \ + src/scripttools src/svg src/testlib src/tools src/winmain \ + src/xml src/3rdparty/clucene src/3rdparty/freetype \ + src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ + src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit +EXTRACT_AFTER_ARGS= | ${TAR} -xf - +.for dne in ${DO_NOT_EXTRACT} +EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' +.endfor + +BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure + +pre-configure: + ${MKDIR} ${WRKSRC}/mkspecs + ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake + ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc + ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic + +post-configure: + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile + ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ + -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ + -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ + ${WRKSRC}/lib/pkgconfig/QtDeclarative.pc + +.include <bsd.port.mk> diff --git a/devel/qt4-declarative/pkg-descr b/devel/qt4-declarative/pkg-descr new file mode 100644 index 000000000000..36bc69717e98 --- /dev/null +++ b/devel/qt4-declarative/pkg-descr @@ -0,0 +1,12 @@ +Qt is a C++ toolkit for application development. It lets application +developers target all major operating systems with a single application +source code. + +Qt provides a platform-independent API to all central platform functionality: +GUI, database access, networking, file handling, etc. The Qt library +encapsulates the different APIs of different operating systems, providing +the application programmer with a single, common API for all operating systems. +The native C APIs are encapsulated in a set of well-designed, fully +object-oriented C++ classes. + +WWW: http://qt.nokia.com/products/qt/index.html diff --git a/devel/qt4-declarative/pkg-plist b/devel/qt4-declarative/pkg-plist new file mode 100644 index 000000000000..a23ebe0fb8ae --- /dev/null +++ b/devel/qt4-declarative/pkg-plist @@ -0,0 +1,79 @@ +include/qt4/Qt/QtDeclarative +include/qt4/Qt/qdeclarative.h +include/qt4/Qt/qdeclarativecomponent.h +include/qt4/Qt/qdeclarativecontext.h +include/qt4/Qt/qdeclarativeengine.h +include/qt4/Qt/qdeclarativeerror.h +include/qt4/Qt/qdeclarativeexpression.h +include/qt4/Qt/qdeclarativeextensioninterface.h +include/qt4/Qt/qdeclarativeextensionplugin.h +include/qt4/Qt/qdeclarativeimageprovider.h +include/qt4/Qt/qdeclarativeinfo.h +include/qt4/Qt/qdeclarativeitem.h +include/qt4/Qt/qdeclarativelist.h +include/qt4/Qt/qdeclarativenetworkaccessmanagerfactory.h +include/qt4/Qt/qdeclarativeparserstatus.h +include/qt4/Qt/qdeclarativeprivate.h +include/qt4/Qt/qdeclarativeproperty.h +include/qt4/Qt/qdeclarativepropertymap.h +include/qt4/Qt/qdeclarativepropertyvalueinterceptor.h +include/qt4/Qt/qdeclarativepropertyvaluesource.h +include/qt4/Qt/qdeclarativescriptstring.h +include/qt4/Qt/qdeclarativeview.h +include/qt4/QtDeclarative/QDeclarativeAttachedPropertiesFunc +include/qt4/QtDeclarative/QDeclarativeComponent +include/qt4/QtDeclarative/QDeclarativeContext +include/qt4/QtDeclarative/QDeclarativeEngine +include/qt4/QtDeclarative/QDeclarativeError +include/qt4/QtDeclarative/QDeclarativeExpression +include/qt4/QtDeclarative/QDeclarativeExtensionInterface +include/qt4/QtDeclarative/QDeclarativeExtensionPlugin +include/qt4/QtDeclarative/QDeclarativeImageProvider +include/qt4/QtDeclarative/QDeclarativeInfo +include/qt4/QtDeclarative/QDeclarativeItem +include/qt4/QtDeclarative/QDeclarativeListProperty +include/qt4/QtDeclarative/QDeclarativeListReference +include/qt4/QtDeclarative/QDeclarativeNetworkAccessManagerFactory +include/qt4/QtDeclarative/QDeclarativeParserStatus +include/qt4/QtDeclarative/QDeclarativeProperties +include/qt4/QtDeclarative/QDeclarativeProperty +include/qt4/QtDeclarative/QDeclarativePropertyMap +include/qt4/QtDeclarative/QDeclarativePropertyValueInterceptor +include/qt4/QtDeclarative/QDeclarativePropertyValueSource +include/qt4/QtDeclarative/QDeclarativeScriptString +include/qt4/QtDeclarative/QDeclarativeTypeInfo +include/qt4/QtDeclarative/QDeclarativeView +include/qt4/QtDeclarative/QtDeclarative +include/qt4/QtDeclarative/qdeclarative.h +include/qt4/QtDeclarative/qdeclarativecomponent.h +include/qt4/QtDeclarative/qdeclarativecontext.h +include/qt4/QtDeclarative/qdeclarativeengine.h +include/qt4/QtDeclarative/qdeclarativeerror.h +include/qt4/QtDeclarative/qdeclarativeexpression.h +include/qt4/QtDeclarative/qdeclarativeextensioninterface.h +include/qt4/QtDeclarative/qdeclarativeextensionplugin.h +include/qt4/QtDeclarative/qdeclarativeimageprovider.h +include/qt4/QtDeclarative/qdeclarativeinfo.h +include/qt4/QtDeclarative/qdeclarativeitem.h +include/qt4/QtDeclarative/qdeclarativelist.h +include/qt4/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h +include/qt4/QtDeclarative/qdeclarativeparserstatus.h +include/qt4/QtDeclarative/qdeclarativeprivate.h +include/qt4/QtDeclarative/qdeclarativeproperty.h +include/qt4/QtDeclarative/qdeclarativepropertymap.h +include/qt4/QtDeclarative/qdeclarativepropertyvalueinterceptor.h +include/qt4/QtDeclarative/qdeclarativepropertyvaluesource.h +include/qt4/QtDeclarative/qdeclarativescriptstring.h +include/qt4/QtDeclarative/qdeclarativeview.h +lib/qt4/libQtDeclarative.la +lib/qt4/libQtDeclarative.prl +lib/qt4/libQtDeclarative.so +lib/qt4/libQtDeclarative.so.4 +lib/qt4/libQtDeclarative.so.%%SHLIB_SHVER%% +lib/qt4/libQtDeclarative.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtDeclarative.so.%%SHLIB_VER%%.debug +libdata/pkgconfig/QtDeclarative.pc +@dirrmtry lib/qt4 +@dirrm include/qt4/QtDeclarative +@dirrmtry include/qt4/Qt +@dirrmtry include/qt4 diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 57f4746cdd2d..9db78498a1c5 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -7,7 +7,7 @@ # PORTNAME= designer -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -16,7 +16,8 @@ COMMENT= Qt ui editor USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistant_run \ - qt3support corelib gui network script sql xml webkit + qt3support corelib declarative gui network script sql xml \ + webkit QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes @@ -52,7 +53,7 @@ pre-configure: # fix build when previous version is installed ${REINPLACE_CMD} -e '/^CONFIG/s|depend_prl||' \ ${BUILD_WRKSRC}/src/components/lib/lib.pro - ${MKDIR} ${WRKSRC}/mkspecs + ${MKDIR} ${WRKSRC}/mkspecs/modules ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index 21d0f2aeb1d3..aa3957c99c88 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -98,6 +98,8 @@ lib/qt4/libQtUiTools.a lib/qt4/libQtUiTools.prl %%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so %%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so.debug +%%QT_PLUGINDIR_REL%%/designer/libqdeclarativeview.so +%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqdeclarativeview.so.debug %%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so %%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so.debug %%QT_PLUGINDIR_REL%%/designer/libqwebview.so diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 3d69a053c06a..ad29da63574e 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= help -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index b054292d1f04..65d6825c532d 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -6,7 +6,7 @@ # PORTNAME= help -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index d75aa4b7a112..851ca9ba2e13 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -7,57 +7,54 @@ # PORTNAME= libQtAssistantClient -PORTVERSION= ${QT4_VERSION} +PORTVERSION= 4.6.3 CATEGORIES?= devel +MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- +DISTNAME= qt-assistant-qassistantclient-library-compat-src-${PORTVERSION} +DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration library USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui network -QT_NONSTANDARD= yes -QT_DIST= yes MAKE_JOBS_SAFE= yes -HAS_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/lib/qt4 +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} ALL_TARGET= first -CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH -MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ - PATH=${WRKSRC}/bin:$$PATH -DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ - src/activeqt src/dbus src/gui src/multimedia src/opengl \ - src/openvg src/phonon src/qt3support src/s60installs \ - src/s60main src/script src/scripttools src/sql src/svg \ - src/testlib src/tools src/winmain src/xml src/xmlpatterns \ - src/3rdparty/clucene src/3rdparty/freetype \ - src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ - src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit -EXTRACT_AFTER_ARGS= | ${TAR} -xf - -.for dne in ${DO_NOT_EXTRACT} -EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' -.endfor - -BUILD_WRKSRC= ${WRKSRC}/tools/assistant/compat/lib -INSTALL_WRKSRC= ${BUILD_WRKSRC} -EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure +WRKSRC= ${WRKDIR}/${DISTNAME:C/src/version/} +BUILD_WRKSRC= ${WRKSRC}/lib +INSTALL_WRKSRC= ${BUILD_WRKSRC} pre-configure: - ${REINPLACE_CMD} -E -e 's|"(.*)assistant"|"\1assistant-qt4"|g' \ - ${BUILD_WRKSRC}/qassistantclient.cpp - ${MKDIR} ${WRKSRC}/mkspecs - ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake - ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc - ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc + ${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \ + -e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \ + ${BUILD_WRKSRC}/lib.pro + +do-configure: + @cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${QMAKE} -spec ${QMAKESPEC} CONFIG+="create_prl link_prl" \ + VERSION="${PORTVERSION}" ${QMAKEFLAGS} post-configure: ${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ -E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \ - ${WRKSRC}/lib/pkgconfig/QtAssistantClient.pc + ${BUILD_WRKSRC}/lib/pkgconfig/QtAssistantClient.pc + +pre-build: + ${MKDIR} ${BUILD_WRKSRC}/QtAssistant + ${CP} ${BUILD_WRKSRC}/qassistantclient_global.h \ + ${BUILD_WRKSRC}/QtAssistant + +post-install: + ${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${PREFIX}/${QT_INCDIR_REL}/QtAssistant + ${INSTALL_DATA} ${FILESDIR}/QtAssistant ${PREFIX}/${QT_INCDIR_REL}/QtAssistant + ${MKDIR} ${PREFIX}/share/qt4/mkspecs/features + ${INSTALL_DATA} ${WRKSRC}/features/assistant.prf ${PREFIX}/share/qt4/mkspecs/features .include <bsd.port.mk> diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo new file mode 100644 index 000000000000..4df6d7db0dc5 --- /dev/null +++ b/devel/qt4-libqtassistantclient/distinfo @@ -0,0 +1,2 @@ +SHA256 (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d +SIZE (KDE/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz) = 329896 diff --git a/devel/qt4-libqtassistantclient/files/QAssistantClient b/devel/qt4-libqtassistantclient/files/QAssistantClient new file mode 100644 index 000000000000..a7105499f5f2 --- /dev/null +++ b/devel/qt4-libqtassistantclient/files/QAssistantClient @@ -0,0 +1 @@ +#include "qassistantclient.h" diff --git a/devel/qt4-libqtassistantclient/files/QtAssistant b/devel/qt4-libqtassistantclient/files/QtAssistant new file mode 100644 index 000000000000..8d371175e0a8 --- /dev/null +++ b/devel/qt4-libqtassistantclient/files/QtAssistant @@ -0,0 +1,5 @@ +#ifndef QT_QTASSISTANT_MODULE_H +#define QT_QTASSISTANT_MODULE_H +#include <QtNetwork/QtNetwork> +#include "qassistantclient.h" +#endif diff --git a/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro b/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro new file mode 100644 index 000000000000..aa1f42c22c46 --- /dev/null +++ b/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro @@ -0,0 +1,34 @@ +--- ./lib/lib.pro.orig 2010-06-18 05:01:10.000000000 -0400 ++++ ./lib/lib.pro 2010-08-13 05:16:02.000000000 -0400 +@@ -1,11 +1,6 @@ + TEMPLATE = lib + QT += network + TARGET = QtAssistantClient +-isEmpty(QT_MAJOR_VERSION) { +- VERSION=4.3.0 +-} else { +- VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} +-} + + CONFIG += qt warn_on + mac|win32:CONFIG += debug_and_release +@@ -16,8 +11,8 @@ + qassistantclient_global.h + SOURCES = qassistantclient.cpp + +-DESTDIR = ../../../../lib +-DLLDESTDIR = ../../../../bin ++DESTDIR = lib ++DLLDESTDIR = bin + + unix { + QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB +@@ -62,7 +57,7 @@ + } + + qt_install_headers { +- assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES ++ assistant_headers.files = $$HEADERS + assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant + INSTALLS += assistant_headers + } diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index aa018988c3d6..dd7c2827e8ee 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -5,10 +5,13 @@ include/qt4/QtAssistant/qassistantclient_global.h lib/qt4/libQtAssistantClient.prl lib/qt4/libQtAssistantClient.so lib/qt4/libQtAssistantClient.so.4 -lib/qt4/libQtAssistantClient.so.%%SHLIB_SHVER%% -lib/qt4/libQtAssistantClient.so.%%SHLIB_VER%% -%%DEBUG%%lib/qt4/libQtAssistantClient.so.%%SHLIB_VER%%.debug +lib/qt4/libQtAssistantClient.so.4.6 +lib/qt4/libQtAssistantClient.so.4.6.3 libdata/pkgconfig/QtAssistantClient.pc +share/qt4/mkspecs/features/assistant.prf +@dirrmtry share/qt4/mkspecs/features +@dirrmtry share/qt4/mkspecs +@dirrmtry share/qt4 @dirrmtry lib/qt4 @dirrm include/qt4/QtAssistant @dirrmtry include/qt4 diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 4344e918f706..454cd40f67d0 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -7,7 +7,7 @@ # PORTNAME= linguist -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-linguist/files/patch-tools__linguist__lrelease__main.cpp b/devel/qt4-linguist/files/patch-tools__linguist__lrelease__main.cpp new file mode 100644 index 000000000000..80b1a3431f2b --- /dev/null +++ b/devel/qt4-linguist/files/patch-tools__linguist__lrelease__main.cpp @@ -0,0 +1,10 @@ +--- ./tools/linguist/lrelease/main.cpp.orig 2010-11-06 04:55:12.000000000 +0300 ++++ ./tools/linguist/lrelease/main.cpp 2010-11-11 17:08:48.303472069 +0300 +@@ -45,6 +45,7 @@ + #ifndef QT_BOOTSTRAPPED + #include <QtCore/QCoreApplication> + #include <QtCore/QTranslator> ++#include <QtCore/QLibraryInfo> + #endif + #include <QtCore/QDebug> + #include <QtCore/QDir> diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist index 72b61be39f1d..0e04bc7e5372 100644 --- a/devel/qt4-linguist/pkg-plist +++ b/devel/qt4-linguist/pkg-plist @@ -11,6 +11,7 @@ share/qt4/phrasebooks/dutch.qph share/qt4/phrasebooks/finnish.qph share/qt4/phrasebooks/french.qph share/qt4/phrasebooks/german.qph +share/qt4/phrasebooks/hungarian.qph share/qt4/phrasebooks/italian.qph share/qt4/phrasebooks/japanese.qph share/qt4/phrasebooks/norwegian.qph diff --git a/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index 7abdb2b4c9e0..b86e8df44251 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -7,7 +7,7 @@ # PORTNAME= makeqpf -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index fc41e9a0f73b..25086b301f24 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -7,7 +7,7 @@ # PORTNAME= moc -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 63aeb56e1dab..5b95bfc88e76 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -7,7 +7,7 @@ # PORTNAME= porting -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index 04c4e53425b6..d62636ea063a 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -7,7 +7,7 @@ # PORTNAME= qdbusviewer -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index d43507b57366..f25cb4112760 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qdoc3 -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES= devel textproc PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index 3e242a6249b7..53da5024f7fe 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -7,8 +7,7 @@ # PORTNAME= qt3support -PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 0f78039db352..d77e50e25fb7 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -7,7 +7,7 @@ # PORTNAME= qtestlib -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index 716acd4e2ce5..be874f2bce4c 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -1,5 +1,6 @@ include/qt4/Qt/QtTest include/qt4/Qt/qbenchmark.h +include/qt4/Qt/qbenchmarkmetric.h include/qt4/Qt/qsignalspy.h include/qt4/Qt/qtest.h include/qt4/Qt/qtest_global.h @@ -50,6 +51,7 @@ include/qt4/QtTest/QTestXunitStreamer include/qt4/QtTest/QtTest include/qt4/QtTest/QtTestGui include/qt4/QtTest/qbenchmark.h +include/qt4/QtTest/qbenchmarkmetric.h include/qt4/QtTest/qsignalspy.h include/qt4/QtTest/qtest.h include/qt4/QtTest/qtest_global.h diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index e9b1f6da1197..b8fc3bd5e262 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -7,7 +7,7 @@ # PORTNAME= qvfb -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index b2331a902c8b..a0048bc97311 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -7,7 +7,7 @@ # PORTNAME= rcc -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 4df30657bae0..943207d93485 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -7,7 +7,7 @@ # PORTNAME= script -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-script/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-wtf-Platform.h b/devel/qt4-script/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-wtf-Platform.h deleted file mode 100644 index 8fe1023f35f4..000000000000 --- a/devel/qt4-script/files/patch-src-3rdparty-javascriptcore-JavaScriptCore-wtf-Platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-06-02 06:03:12.000000000 +0400 -+++ ./src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-06-09 01:21:29.281286595 +0400 -@@ -723,7 +723,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) -+#if (PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD) || PLATFORM(SOLARIS) || PLATFORM(HPUX))) - #define WTF_USE_JSVALUE64 1 - #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) - #define WTF_USE_JSVALUE64 1 diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index f77915860efd..4b76c5b2967a 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= scripttools -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index 81cf08afb4a6..66f8b5656abe 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -7,7 +7,7 @@ # PORTNAME= uic -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index ec50717ec0cb..de05ab3c6a3f 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -7,7 +7,7 @@ # PORTNAME= uic3 -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES?= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 41a3efa8329d..e865376025e3 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qt4 -PORTVERSION= ${QT4_VERSION} +DISTVERSION= ${QT4_VERSION} CATEGORIES= devel MASTER_SITES= # empty DISTFILES= # none @@ -21,11 +21,14 @@ OPTIONS= CODECS "Enable support for CN, JP, KR, TW" off \ DEMO "Install demonstration and example programs" off USE_QT_VER= 4 -QT_COMPONENTS= accessible assistant assistant-adp assistantclient \ - clucene corelib dbus designer doc help gui iconengines \ - imageformats inputmethods multimedia network opengl \ - qdbusviewer qt3support qtconfig qtestlib qvfb script \ - scripttools sql svg webkit xml xmlpatterns xmlpatterns-tool +QT_COMPONENTS= accessible assistant clucene corelib \ + dbus declarative designer doc \ + graphicssystems-opengl gui help \ + iconengines imageformats inputmethods \ + multimedia network opengl phonon phonon-gst \ + qdbusviewer qt3support qtconfig qtestlib qvfb \ + script scripttools sql svg webkit \ + xml xmlpatterns xmlpatterns-tool NO_BUILD= yes diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo index aab5d042edc8..3294519c7713 100644 --- a/devel/qt4/distinfo +++ b/devel/qt4/distinfo @@ -1,3 +1,2 @@ -MD5 (KDE/qt-everywhere-opensource-src-4.6.3.tar.gz) = 5c69f16d452b0bb3d44bc3c10556c072 -SHA256 (KDE/qt-everywhere-opensource-src-4.6.3.tar.gz) = f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768 -SIZE (KDE/qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 +SHA256 (KDE/qt-everywhere-opensource-src-4.7.1.tar.gz) = 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a +SIZE (KDE/qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 diff --git a/devel/qt4/files/patch-configure b/devel/qt4/files/patch-configure index 561fe8153583..9dc2e49c1af9 100644 --- a/devel/qt4/files/patch-configure +++ b/devel/qt4/files/patch-configure @@ -1,18 +1,18 @@ ---- ./configure.orig 2010-01-15 20:01:30.000000000 +0300 -+++ ./configure 2010-01-20 10:20:34.848078900 +0300 -@@ -2261,11 +2261,6 @@ - chmod 755 "$outpath/bin/syncqt" - fi +--- configure.old 2010-09-10 05:04:46.000000000 -0400 ++++ configure 2010-09-28 00:52:09.000000000 -0400 +@@ -2351,11 +2351,6 @@ + fi + done - # symlink the mkspecs directory - mkdir -p "$outpath/mkspecs" -- rm -f "$outpath"/mkspecs/* +- rm -rf "$outpath"/mkspecs/* - ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" - rm -f "$outpath/mkspecs/default" - # symlink the doc directory - rm -rf "$outpath/doc" -@@ -2296,7 +2291,7 @@ + # Special case for mkspecs/features directory. + # To be able to place .prf files into a shadow build directory, +@@ -2394,7 +2389,7 @@ # find a make command if [ -z "$MAKE" ]; then MAKE= @@ -21,16 +21,7 @@ if "$WHICH" $mk >/dev/null 2>&1; then MAKE=`"$WHICH" $mk` break -@@ -2946,7 +2941,7 @@ - fi - - QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` --TEST_COMPILER="$CC" -+TEST_COMPILER="$CXX" - [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER - if [ -z "$TEST_COMPILER" ]; then - echo "ERROR: Cannot set the compiler for the configuration tests" -@@ -4296,7 +4291,7 @@ +@@ -4466,7 +4461,7 @@ } # build qmake @@ -39,7 +30,7 @@ echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -5059,14 +5054,6 @@ +@@ -5391,14 +5386,6 @@ X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" fi @@ -51,6 +42,6 @@ - echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." - exit 1 - fi + fi - # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) - if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then + # X11/MINGW OpenGL |