diff options
Diffstat (limited to 'devel')
26 files changed, 243 insertions, 85 deletions
diff --git a/devel/Makefile b/devel/Makefile index f6b4d22c567b..d6ca23568257 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2448,6 +2448,7 @@ SUBDIR += py-qt4-help SUBDIR += py-qt4-qscintilla2 SUBDIR += py-qt4-script + SUBDIR += py-qt4-scripttools SUBDIR += py-qt4-test SUBDIR += py-rbtree SUBDIR += py-repl diff --git a/devel/py-qt4-assistant/distinfo b/devel/py-qt4-assistant/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-assistant/distinfo +++ b/devel/py-qt4-assistant/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile index 9b88b9746cb8..1fb9b452c2a1 100644 --- a/devel/py-qt4-core/Makefile +++ b/devel/py-qt4-core/Makefile @@ -6,7 +6,6 @@ PORTNAME= core PORTVERSION= ${PYQT4_VERSION} -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_PYQT4} @@ -22,7 +21,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} HAS_CONFIGURE= yes USE_PYTHON= 2.5+ USE_QT_VER= 4 -QT_COMPONENTS= corelib qmake_build +QT_COMPONENTS= corelib qmake_build moc_build OPTIONS= API "Install QtCore API for QScintilla2" on \ DEBUG "Enable debugging in generated code" off \ @@ -65,6 +64,9 @@ PLIST_SUB+= SIP="" ARGS+= --trace .endif +post-extract: + rm -rf ${WRKSRC}/pyuic/uic/port_v3 + do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ ${PYTHON_CMD} configure.py ${ARGS} diff --git a/devel/py-qt4-core/distinfo b/devel/py-qt4-core/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-core/distinfo +++ b/devel/py-qt4-core/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-core/files/patch-configure.py b/devel/py-qt4-core/files/patch-configure.py index 6b67dc9245ed..2c32cb941c5b 100644 --- a/devel/py-qt4-core/files/patch-configure.py +++ b/devel/py-qt4-core/files/patch-configure.py @@ -1,6 +1,6 @@ ---- configure.py.orig 2008-11-08 21:55:49.000000000 +1000 -+++ configure.py 2009-01-03 23:09:03.000000000 +1000 -@@ -42,6 +42,10 @@ +--- configure.py.orig 2009-07-15 00:31:43.000000000 +1100 ++++ configure.py 2009-07-21 16:44:53.000000000 +1100 +@@ -41,6 +41,10 @@ import sipconfig @@ -10,7 +10,7 @@ +if freebsd: freebsd_port = os.environ['PYQT4_COMPONENT'] # Initialise the globals. - pyqt_version = 0x040404 + pyqt_version = 0x040502 @@ -74,7 +78,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. -@@ -310,14 +313,23 @@ +@@ -347,14 +350,23 @@ elif sipcfg.universal: sipconfig.inform("QtDesigner module disabled with universal binaries.") else: @@ -46,7 +46,7 @@ def code(self): cons_xtra_incdirs = [] -@@ -338,6 +350,10 @@ +@@ -380,6 +392,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) -@@ -521,19 +537,28 @@ +@@ -565,19 +581,28 @@ sipconfig.inform("Unable to find the following static plugins: %s" % ", ".join(opts.staticplugins)) # Generate the QScintilla API file. @@ -93,9 +93,9 @@ + + f.close() - def _static_plugins(self, mname): - """Return a tuple of the libraries (in platform neutral format) and the -@@ -604,7 +629,13 @@ + def _qpy_directories(self, mname): + """Return a tuple of the directories containing the header files and +@@ -666,19 +691,25 @@ return libs, libdirs def module_installs(self): @@ -108,9 +108,24 @@ + else: + return ["__init__.py", "pyqtconfig.py"] - def qpylibs(self): - # See which QPy libraries to build. -@@ -690,23 +721,43 @@ + def qpy_libs(self): + # See which QPy support libraries to build. + qpylibs = {} + +- if "QtCore" in pyqt_modules: ++ if freebsd_port == 'core': + qpylibs["QtCore"] = "qpycore.pro" + +- if "QtGui" in pyqt_modules: ++ if freebsd_port == 'gui': + qpylibs["QtGui"] = "qpygui.pro" + +- if "QtDesigner" in pyqt_modules: ++ if freebsd_port == 'designer': + qpylibs["QtDesigner"] = "qpydesigner.pro" + + # Run qmake to generate the Makefiles. +@@ -780,23 +811,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 +182,7 @@ if "QtXml" in pyqt_modules: sipconfig.inform("Creating pylupdate4 Makefile...") -@@ -743,7 +794,10 @@ +@@ -822,7 +873,10 @@ makefile.generate() tool.append("pyrcc") else: @@ -179,7 +194,7 @@ if opts.designer_plugin and "QtDesigner" in pyqt_modules: py_major = sipcfg.py_version >> 16 -@@ -766,11 +820,17 @@ +@@ -845,11 +899,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) @@ -198,11 +213,11 @@ if opts.designer_plugin: sipconfig.inform("Creating Qt Designer plugin Makefile...") -@@ -839,21 +899,44 @@ +@@ -921,21 +981,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)) +- sipconfig.inform("These PyQt modules will be built: %s." % ", ".join(pyqt_modules)) - sipconfig.inform("The PyQt Python package will be installed in %s." % opts.pyqtmoddir) - - if opts.designer_plugin: @@ -251,7 +266,7 @@ if opts.vendorcheck: sipconfig.inform("PyQt will only be usable with signed interpreters.") -@@ -1253,7 +1336,11 @@ +@@ -1341,7 +1424,11 @@ of libraries. extra_sip_flags is an optional list of additional flags to pass to SIP. """ @@ -264,7 +279,7 @@ mk_clean_dir(mname) -@@ -1325,7 +1412,11 @@ +@@ -1413,7 +1500,11 @@ sipconfig.error("Unable to create the C++ code.") # Generate the Makefile. @@ -277,7 +292,7 @@ installs = [] -@@ -1764,6 +1855,10 @@ +@@ -1868,6 +1959,10 @@ p.print_help() sys.exit(2) @@ -288,7 +303,7 @@ sipcfg.set_build_macros(macros) # Check Qt is what we need. -@@ -1771,7 +1866,7 @@ +@@ -1875,7 +1970,7 @@ # Check the licenses are compatible. check_license() @@ -297,7 +312,7 @@ # Check which modules to build. pyqt.check_modules() -@@ -1793,9 +1888,18 @@ +@@ -1897,9 +1992,18 @@ installs=[(pyqt.module_installs(), pyqt_modroot)] if opts.api: @@ -318,26 +333,28 @@ if opts.bigqt: xtra_modules.append("_qt") -@@ -1806,14 +1910,31 @@ +@@ -1910,14 +2014,33 @@ if opts.mwg_qwt_dir: xtra_modules.append("Qwt5") + if freebsd: + if freebsd_port == 'dbus': + s = pyqt.tools() -+ elif freebsd_port == 'designer': -+ s = pyqt.qpylibs() + [pyqt_modules[-1]] ++ elif freebsd_port in ('designer', 'gui'): ++ s = pyqt.qpy_libs() + [pyqt_modules[-1]] + elif freebsd_port == 'designerplugin': + s = pyqt.tools() ++ elif freebsd_port == 'xml': ++ s = [pyqt_modules[-1]] + pyqt.tools() + else: + s = [pyqt_modules[-1]] -+ if freebsd_port in ('core', 'xml'): -+ s += pyqt.tools() -+ else: s = pyqt.qpylibs() + pyqt_modules + xtra_modules + pyqt.tools() ++ if freebsd_port == 'core': ++ s = pyqt.qpy_libs() + [pyqt_modules[-1]] + pyqt.tools() ++ else: s = pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools() + sipconfig.ParentMakefile( configuration=sipcfg, -- subdirs=pyqt.qpylibs() + pyqt_modules + xtra_modules + pyqt.tools(), +- subdirs=pyqt.qpy_libs() + pyqt_modules + xtra_modules + pyqt.tools(), + subdirs=s, installs=installs ).generate() diff --git a/devel/py-qt4-core/pkg-plist b/devel/py-qt4-core/pkg-plist index 4836bec71646..eca4defd52ca 100644 --- a/devel/py-qt4-core/pkg-plist +++ b/devel/py-qt4-core/pkg-plist @@ -18,6 +18,12 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/indenter.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/indenter.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/indenter.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/misc.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/proxy_type.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler/qobjectcreator.pyo @@ -36,6 +42,9 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/__init__.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/__init__.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/__init__.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/driver.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/driver.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/driver.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/exceptions.pyo @@ -45,6 +54,27 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/objcreator.pyo +%%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/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 +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/load_plugin.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/proxy_base.pyo +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.py +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyc +%%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2/string_io.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/properties.pyo @@ -54,6 +84,9 @@ 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.pyo %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qaxcontainer.pyo @@ -143,6 +176,7 @@ bin/pyuic4 %%API%%share/qt4/qsci/api/python/QtCore.api %%SIP%%@dirrm share/py-sip/QtCore @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins +@dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/port_v2 @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Loader @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic/Compiler @dirrm %%PYTHON_SITELIBDIR%%/PyQt4/uic diff --git a/devel/py-qt4-dbus/distinfo b/devel/py-qt4-dbus/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-dbus/distinfo +++ b/devel/py-qt4-dbus/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-designer/distinfo b/devel/py-qt4-designer/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-designer/distinfo +++ b/devel/py-qt4-designer/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-designerplugin/distinfo b/devel/py-qt4-designerplugin/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-designerplugin/distinfo +++ b/devel/py-qt4-designerplugin/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-help/distinfo b/devel/py-qt4-help/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-help/distinfo +++ b/devel/py-qt4-help/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile index 57128e66f33a..a603c48ae2b2 100644 --- a/devel/py-qt4-qscintilla2/Makefile +++ b/devel/py-qt4-qscintilla2/Makefile @@ -6,7 +6,6 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} diff --git a/devel/py-qt4-qscintilla2/distinfo b/devel/py-qt4-qscintilla2/distinfo index c8b01acb0103..34a0b49d5da6 100644 --- a/devel/py-qt4-qscintilla2/distinfo +++ b/devel/py-qt4-qscintilla2/distinfo @@ -1,3 +1,3 @@ -MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87 -SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749 -SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902 +MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9 +SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213 +SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554 diff --git a/devel/py-qt4-qscintilla2/pkg-plist b/devel/py-qt4-qscintilla2/pkg-plist index 73b30296c2ff..edf0f1391824 100644 --- a/devel/py-qt4-qscintilla2/pkg-plist +++ b/devel/py-qt4-qscintilla2/pkg-plist @@ -11,6 +11,7 @@ %%SIP%%share/py-sip/Qsci/qscilexercpp.sip %%SIP%%share/py-sip/Qsci/qscilexercsharp.sip %%SIP%%share/py-sip/Qsci/qscilexercss.sip +%%SIP%%share/py-sip/Qsci/qscilexercustom.sip %%SIP%%share/py-sip/Qsci/qscilexerd.sip %%SIP%%share/py-sip/Qsci/qscilexerdiff.sip %%SIP%%share/py-sip/Qsci/qscilexerfortran.sip @@ -42,6 +43,8 @@ %%SIP%%share/py-sip/Qsci/qsciscintilla.sip %%SIP%%share/py-sip/Qsci/qsciscintillabase3.sip %%SIP%%share/py-sip/Qsci/qsciscintillabase4.sip +%%SIP%%share/py-sip/Qsci/qscistyle.sip +%%SIP%%share/py-sip/Qsci/qscistyledtext.sip %%API%%share/qt4/qsci/api/python/QScintilla2.api %%SIP%%@dirrm share/py-sip/Qsci @dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 diff --git a/devel/py-qt4-script/distinfo b/devel/py-qt4-script/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-script/distinfo +++ b/devel/py-qt4-script/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile new file mode 100644 index 000000000000..c57d75e70f98 --- /dev/null +++ b/devel/py-qt4-scripttools/Makefile @@ -0,0 +1,80 @@ +# New ports collection makefile for: py-qt4-scripttools +# Date created: 2009-07-12 +# Whom: Max Brazhnikov <makc@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= scripttools +PORTVERSION= ${PYQT4_VERSION} +PORTEPOCH= 1 +CATEGORIES= devel python +MASTER_SITES= ${MASTER_SITES_PYQT4} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt4- +DISTNAME= ${PYQT4_DISTNAME} + +MAINTAINER= kde@FreeBSD.org +COMMENT= Python bindings for the Qt4 toolkit, QtScriptTools module + +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= scripttools qmake_build + +OPTIONS= API "Install QtScript API for QScintilla2" on \ + DEBUG "Enable debugging in generated code" off \ + SIPFILES "Install the QtScript 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 QtScriptTools + +.include "../py-sip/files/bsd.pyqt.mk" +.include <bsd.port.pre.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}/QtScriptTools/Makefile + +.include <bsd.port.post.mk> diff --git a/devel/py-qt4-scripttools/distinfo b/devel/py-qt4-scripttools/distinfo new file mode 100644 index 000000000000..a312fab4a870 --- /dev/null +++ b/devel/py-qt4-scripttools/distinfo @@ -0,0 +1,3 @@ +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-qt4-scripttools/pkg-descr b/devel/py-qt4-scripttools/pkg-descr new file mode 100644 index 000000000000..7746c223c3df --- /dev/null +++ b/devel/py-qt4-scripttools/pkg-descr @@ -0,0 +1,4 @@ +PyQt4 is a set of Python bindings for Trolltech's Qt4 application framework. +This package provides the QtScript module. + +WWW: http://www.riverbankcomputing.co.uk/pyqt/ diff --git a/devel/py-qt4-scripttools/pkg-plist b/devel/py-qt4-scripttools/pkg-plist new file mode 100644 index 000000000000..3f16512cfe4f --- /dev/null +++ b/devel/py-qt4-scripttools/pkg-plist @@ -0,0 +1,6 @@ +%%PYTHON_SITELIBDIR%%/PyQt4/QtScriptTools.so +%%SIP%%share/py-sip/QtScriptTools/QtScriptToolsmod.sip +%%SIP%%share/py-sip/QtScriptTools/qscriptenginedebugger.sip +%%API%%share/qt4/qsci/api/python/QtScriptTools.api +%%SIP%%@dirrm share/py-sip/QtScriptTools +@dirrmtry %%PYTHON_SITELIBDIR%%/PyQt4 diff --git a/devel/py-qt4-test/distinfo b/devel/py-qt4-test/distinfo index 886226b81fb2..a312fab4a870 100644 --- a/devel/py-qt4-test/distinfo +++ b/devel/py-qt4-test/distinfo @@ -1,3 +1,3 @@ -MD5 (PyQt-x11-gpl-4.4.4.tar.gz) = 4bd346d56d10452e47ac71e2cbe04229 -SHA256 (PyQt-x11-gpl-4.4.4.tar.gz) = fc09c13b340078c7995fb2b6450c5b7de8ef9411962d311a1213e773c936509a -SIZE (PyQt-x11-gpl-4.4.4.tar.gz) = 6982063 +MD5 (PyQt-x11-gpl-4.5.4.tar.gz) = b721266d14c450dd7045025e042819ec +SHA256 (PyQt-x11-gpl-4.5.4.tar.gz) = b3d06c7bda701055769add93b48103ee35c6fc9a4b00c67599cb426f9efda5a8 +SIZE (PyQt-x11-gpl-4.5.4.tar.gz) = 6970552 diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index 93a3127aff03..01abaea1b310 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -25,6 +25,8 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR}\ -e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} +PORTDOCS= * + .include "files/bsd.pyqt.mk" .include <bsd.port.pre.mk> @@ -45,9 +47,8 @@ post-configure: post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} && cd ${WRKSRC} && ${INSTALL_DATA}\ - doc/sipref.txt doc/sipref.html\ - NEWS LICENSE ${DOCSDIR} + ${MKDIR} ${DOCSDIR} && cd ${WRKSRC}/doc/html && \ + ${COPYTREE_SHARE} \. ${DOCSDIR} .endif ${MKDIR} ${DATADIR} &&\ cd ${PYTHONPREFIX_SITELIBDIR} &&\ diff --git a/devel/py-sip/distinfo b/devel/py-sip/distinfo index 1dfe3d8c44ba..5b01d541f352 100644 --- a/devel/py-sip/distinfo +++ b/devel/py-sip/distinfo @@ -1,3 +1,3 @@ -MD5 (sip-4.7.9.tar.gz) = 597d7ff7edb42a18421c806ffd18a136 -SHA256 (sip-4.7.9.tar.gz) = 7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1 -SIZE (sip-4.7.9.tar.gz) = 471372 +MD5 (sip-4.8.2.tar.gz) = 7ae60712aa6b4095a8cdab11b437f8f0 +SHA256 (sip-4.8.2.tar.gz) = 2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9 +SIZE (sip-4.8.2.tar.gz) = 615394 diff --git a/devel/py-sip/files/bsd.pyqt.mk b/devel/py-sip/files/bsd.pyqt.mk index 9f79aafa79cf..5b9153722a89 100644 --- a/devel/py-sip/files/bsd.pyqt.mk +++ b/devel/py-sip/files/bsd.pyqt.mk @@ -13,12 +13,12 @@ MASTER_SITES_PYKDE4= ${MASTER_SITE_RIVERBANK}PyKDE4/ MASTER_SITES_QSCI1= ${MASTER_SITE_RIVERBANK}QScintilla1/ MASTER_SITES_QSCI2= ${MASTER_SITE_RIVERBANK}QScintilla2/ -SIP_VERSION= 4.7.9 -PYQT3_VERSION= 3.17.6 -PYQT4_VERSION= 4.4.4 -PYKDE3_VERSION= 3.16.2 +SIP_VERSION= 4.8.2 +PYQT3_VERSION= 3.18.1 +PYQT4_VERSION= 4.5.4 +PYKDE3_VERSION= 3.16.3 QSCI1_VERSION= 1.7.1 -QSCI2_VERSION= 2.3.2 +QSCI2_VERSION= 2.4 SIP_DISTNAME= sip-${SIP_VERSION} PYQT3_DISTNAME= PyQt-x11-gpl-${PYQT3_VERSION} diff --git a/devel/py-sip/pkg-plist b/devel/py-sip/pkg-plist index 65f3f38b4aa4..35b49c09faa2 100644 --- a/devel/py-sip/pkg-plist +++ b/devel/py-sip/pkg-plist @@ -7,10 +7,5 @@ bin/sip %%PYTHON_SITELIBDIR%%/sipdistutils.py %%PYTHON_SITELIBDIR%%/sipdistutils.pyc %%PYTHON_SITELIBDIR%%/sipdistutils.pyo -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/sipref.html -%%PORTDOCS%%%%DOCSDIR%%/sipref.txt @exec mkdir -p %D/%%DATADIR%% @dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/devel/qscintilla2-designerplugin/distinfo b/devel/qscintilla2-designerplugin/distinfo index c8b01acb0103..34a0b49d5da6 100644 --- a/devel/qscintilla2-designerplugin/distinfo +++ b/devel/qscintilla2-designerplugin/distinfo @@ -1,3 +1,3 @@ -MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87 -SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749 -SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902 +MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9 +SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213 +SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554 diff --git a/devel/qscintilla2/distinfo b/devel/qscintilla2/distinfo index c8b01acb0103..34a0b49d5da6 100644 --- a/devel/qscintilla2/distinfo +++ b/devel/qscintilla2/distinfo @@ -1,3 +1,3 @@ -MD5 (QScintilla-gpl-2.3.2.tar.gz) = 2e112d01988f2e044c43a1e7f5e1dd87 -SHA256 (QScintilla-gpl-2.3.2.tar.gz) = 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749 -SIZE (QScintilla-gpl-2.3.2.tar.gz) = 2146902 +MD5 (QScintilla-gpl-2.4.tar.gz) = dd69520ec91f1acb97a4eb74ddde37c9 +SHA256 (QScintilla-gpl-2.4.tar.gz) = 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213 +SIZE (QScintilla-gpl-2.4.tar.gz) = 2304554 diff --git a/devel/qscintilla2/pkg-plist b/devel/qscintilla2/pkg-plist index 8b25f052d08e..c222be54b14c 100644 --- a/devel/qscintilla2/pkg-plist +++ b/devel/qscintilla2/pkg-plist @@ -11,6 +11,7 @@ %%QT_INCDIR_REL%%/Qsci/qscilexercpp.h %%QT_INCDIR_REL%%/Qsci/qscilexercsharp.h %%QT_INCDIR_REL%%/Qsci/qscilexercss.h +%%QT_INCDIR_REL%%/Qsci/qscilexercustom.h %%QT_INCDIR_REL%%/Qsci/qscilexerd.h %%QT_INCDIR_REL%%/Qsci/qscilexerdiff.h %%QT_INCDIR_REL%%/Qsci/qscilexerfortran.h @@ -38,10 +39,12 @@ %%QT_INCDIR_REL%%/Qsci/qsciprinter.h %%QT_INCDIR_REL%%/Qsci/qsciscintilla.h %%QT_INCDIR_REL%%/Qsci/qsciscintillabase.h +%%QT_INCDIR_REL%%/Qsci/qscistyle.h +%%QT_INCDIR_REL%%/Qsci/qscistyledtext.h %%QT_LIBDIR_REL%%/libqscintilla2.so %%QT_LIBDIR_REL%%/libqscintilla2.so.5 -%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0 -%%QT_LIBDIR_REL%%/libqscintilla2.so.5.0.1 +%%QT_LIBDIR_REL%%/libqscintilla2.so.5.1 +%%QT_LIBDIR_REL%%/libqscintilla2.so.5.1.0 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README @@ -60,7 +63,9 @@ %%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaToDo.html %%PORTDOCS%%%%DOCSDIR%%/Scintilla/ScintillaUsage.html %%PORTDOCS%%%%DOCSDIR%%/Scintilla/Steps.html +%%PORTDOCS%%%%DOCSDIR%%/Scintilla/annotations.png %%PORTDOCS%%%%DOCSDIR%%/Scintilla/index.html +%%PORTDOCS%%%%DOCSDIR%%/Scintilla/styledmargin.png %%PORTDOCS%%%%DOCSDIR%%/html/annotated.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciAPIs-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciAPIs.html @@ -86,6 +91,8 @@ %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSS.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSharp-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCSharp.html +%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCustom-members.html +%%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerCustom.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerD.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciLexerDiff-members.html @@ -140,8 +147,13 @@ %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintilla.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase-members.html %%PORTDOCS%%%%DOCSDIR%%/html/classQsciScintillaBase.html -%%PORTDOCS%%%%DOCSDIR%%/html/dir_556434f8084a0975d5f9aa83df897544.html -%%PORTDOCS%%%%DOCSDIR%%/html/dir_e71f21f8efaf379e3645c15d5d7e326c.html +%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyle-members.html +%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyle.html +%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText-members.html +%%PORTDOCS%%%%DOCSDIR%%/html/classQsciStyledText.html +%%PORTDOCS%%%%DOCSDIR%%/html/classes.html +%%PORTDOCS%%%%DOCSDIR%%/html/dir_944256396c06c0295aa2eca7dcfea282.html +%%PORTDOCS%%%%DOCSDIR%%/html/dir_d32dfe2bcddd0b2d894b9fb13d6bdd4d.html %%PORTDOCS%%%%DOCSDIR%%/html/dirs.html %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png @@ -240,6 +252,7 @@ share/qt4/qsci/api/python/Python-2.5.api share/qt4/qsci/api/python/Python-2.6.api %%NLS%%share/qt4/translations/qscintilla_cs.qm %%NLS%%share/qt4/translations/qscintilla_de.qm +%%NLS%%share/qt4/translations/qscintilla_es.qm %%NLS%%share/qt4/translations/qscintilla_fr.qm %%NLS%%share/qt4/translations/qscintilla_pt_br.qm %%NLS%%share/qt4/translations/qscintilla_ru.qm |