Add PyQt-3.7 for Qt3, addon modules which depend on the base module.

13 files changed, 345 insertions, 0 deletions

diff --git a/x11/py-qt3-modules/DESCR b/x11/py-qt3-modules/DESCR
new file mode 100644
index 00000000000..5749991f597
--- /dev/null
+++ b/x11/py-qt3-modules/DESCR
@@ -0,0 +1,6 @@
+These are the Python bindings for Qt.  You must also have the SIP Python
+bindings generator installed.
+
+The homepage is http://www.riverbankcomputing.co.uk/pyqt/.
+
+The homepage of SIP is http://www.riverbankcomputing.co.uk/sip/.
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
new file mode 100644
index 00000000000..08f6b7a121a
--- /dev/null
+++ b/x11/py-qt3-modules/Makefile
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+#
+
+DISTNAME=		PyQt-x11-gpl-3.7
+PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.7
+CATEGORIES=		x11
+MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
+
+MAINTAINER=		tech-pkg@netbsd.org
+HOMEPAGE=		http://www.riverbankcomputing.co.uk/pyqt/
+COMMENT=		Python binding for qt3
+
+USE_BUILDLINK2=		yes
+USE_X11=		yes
+USE_LIBTOOL=		yes
+USE_GMAKE=		yes
+
+CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN}
+
+PYTHON_VERSIONS_ACCEPTED=	22pth 21pth
+PY_PATCHPLIST=	yes
+
+MAKE_ENV+=	QTPREFIX=${QTDIR}
+
+do-configure:
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${PYTHONBIN} build.py ${CONFIGURE_ARGS})
+
+PYQTMODULES=	qtcanvas qtgl qtnetwork qtsql qttable qtui qtxml
+
+do-install:
+	(for f in ${PYQTMODULES}; do \
+		(cd ${WRKSRC}/$${f} && ( \
+			${INSTALL_DATA} $${f}.py ${PREFIX}/${PYSITELIB}; \
+			${LIBTOOL} --mode=install ${INSTALL_DATA} \
+				lib$${f}cmodule.la ${PREFIX}/${PYSITELIB} \
+			) \
+		); \
+	 done)
+
+.include "../../lang/python/extension.mk"
+.include "../../x11/py-qt3-base/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-modules/PLIST b/x11/py-qt3-modules/PLIST
new file mode 100644
index 00000000000..85f7e077826
--- /dev/null
+++ b/x11/py-qt3-modules/PLIST
@@ -0,0 +1,43 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+${PYSITELIB}/libqtcanvascmodule.a
+${PYSITELIB}/libqtcanvascmodule.la
+${PYSITELIB}/libqtcanvascmodule.so
+${PYSITELIB}/libqtcanvascmodule.so.1
+${PYSITELIB}/libqtcanvascmodule.so.1.0
+${PYSITELIB}/libqtglcmodule.a
+${PYSITELIB}/libqtglcmodule.la
+${PYSITELIB}/libqtglcmodule.so
+${PYSITELIB}/libqtglcmodule.so.1
+${PYSITELIB}/libqtglcmodule.so.1.0
+${PYSITELIB}/libqtnetworkcmodule.a
+${PYSITELIB}/libqtnetworkcmodule.la
+${PYSITELIB}/libqtnetworkcmodule.so
+${PYSITELIB}/libqtnetworkcmodule.so.1
+${PYSITELIB}/libqtnetworkcmodule.so.1.0
+${PYSITELIB}/libqtsqlcmodule.a
+${PYSITELIB}/libqtsqlcmodule.la
+${PYSITELIB}/libqtsqlcmodule.so
+${PYSITELIB}/libqtsqlcmodule.so.1
+${PYSITELIB}/libqtsqlcmodule.so.1.0
+${PYSITELIB}/libqttablecmodule.a
+${PYSITELIB}/libqttablecmodule.la
+${PYSITELIB}/libqttablecmodule.so
+${PYSITELIB}/libqttablecmodule.so.1
+${PYSITELIB}/libqttablecmodule.so.1.0
+${PYSITELIB}/libqtuicmodule.a
+${PYSITELIB}/libqtuicmodule.la
+${PYSITELIB}/libqtuicmodule.so
+${PYSITELIB}/libqtuicmodule.so.1
+${PYSITELIB}/libqtuicmodule.so.1.0
+${PYSITELIB}/libqtxmlcmodule.a
+${PYSITELIB}/libqtxmlcmodule.la
+${PYSITELIB}/libqtxmlcmodule.so
+${PYSITELIB}/libqtxmlcmodule.so.1
+${PYSITELIB}/libqtxmlcmodule.so.1.0
+${PYSITELIB}/qtcanvas.py
+${PYSITELIB}/qtgl.py
+${PYSITELIB}/qtnetwork.py
+${PYSITELIB}/qtsql.py
+${PYSITELIB}/qttable.py
+${PYSITELIB}/qtui.py
+${PYSITELIB}/qtxml.py
diff --git a/x11/py-qt3-modules/buildlink2.mk b/x11/py-qt3-modules/buildlink2.mk
new file mode 100644
index 00000000000..f5501ea8028
--- /dev/null
+++ b/x11/py-qt3-modules/buildlink2.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+.if !defined(PY_QT3_MODULES_BUILDLINK2_MK)
+PY_QT3_MODULES_BUILDLINK2_MK=	# defined
+
+.include "../../lang/python/pyversion.mk"
+
+BUILDLINK_PACKAGES+=		pyqt3modules
+BUILDLINK_DEPENDS.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules-[0-9]*
+BUILDLINK_PKGSRCDIR.pyqt3modules?=	../../x11/py-qt3-modules
+
+.include "../../x11/py-qt3-base/buildlink2.mk"
+
+.endif	# PY_QT3_MODULES_BUILDLINK2_MK
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
new file mode 100644
index 00000000000..30368000a47
--- /dev/null
+++ b/x11/py-qt3-modules/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+SHA1 (PyQt-x11-gpl-3.7.tar.gz) = 190d1f1b25a696fa2e4fa0327a24c63ef1495e46
+Size (PyQt-x11-gpl-3.7.tar.gz) = 728162 bytes
+SHA1 (patch-aa) = 12591c485bc40951e0110e96de7ea3df1cf99827
+SHA1 (patch-ab) = 1377a0a957e303606cb2e91a871c598ce62ff8f1
+SHA1 (patch-ac) = 8d19db64550e62edf4033fe22cda60656c94d778
+SHA1 (patch-ad) = 4bbaef81440a50da21155698c143ade376e84286
+SHA1 (patch-ae) = 0f485c9798cb8a33e9f932772a9a9049298d8f9e
+SHA1 (patch-af) = 573913ef5b019d103aae9ee1d3765136a28ed725
+SHA1 (patch-ag) = d21b4707c15ceb3101c9521b0a065372dd8f517e
+SHA1 (patch-ah) = e864fd2ac963ba1a8b3b2a1b98c9ce2ad9debe8e
diff --git a/x11/py-qt3-modules/patches/patch-aa b/x11/py-qt3-modules/patches/patch-aa
new file mode 100644
index 00000000000..1db256c5786
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-aa
@@ -0,0 +1,94 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- build.py.orig	2003-07-05 12:52:49.000000000 +0200
++++ build.py	2003-07-22 15:42:01.000000000 +0200
+@@ -50,7 +50,7 @@
+ pyVersNr = None
+ makefileGen = None
+ makeBin = None
+-buildModules = ["qt"]
++buildModules = []
+ proPatches = {}
+ makefilePatches = {}
+ tempBuildDir = None
+@@ -162,12 +162,13 @@
+     global pyFullVers, pyVersNr
+ 
+     pyFullVers = string.split(sys.version)[0]
++    pyFullVersn = string.replace(pyFullVers, 'p', '.');
+ 
+-    vl = string.split(re.findall("[0-9.]*",pyFullVers)[0],".")
++    vl = string.split(re.findall("[0-9.]*",pyFullVersn)[0],".")
+     major = vl[0]
+     minor = vl[1]
+ 
+-    pyVers = major + "." + minor
++    pyVers = sys.version[0:3]
+     pyVersNr = int(major) * 10 + int(minor)
+ 
+     global platMake, platCopy, platMkdir, platRmdir
+@@ -592,7 +593,7 @@
+         incdirs = incdirs + " " + escape(qtIncDir)
+ 
+     # Find the QScintilla header files.
+-    if qtVersion >= 0x030000:
++    if 0:
+         global sciIncDir
+ 
+         if not sciIncDir:
+@@ -717,7 +718,7 @@
+     print "Type 'no' to decline the terms of the license."
+     print
+ 
+-    while 1:
++    while 0:
+         try:
+             resp = raw_input("Do you accept the terms of the license? ")
+         except:
+@@ -997,7 +998,7 @@
+         buildMakefile("qttest.pro")
+ 
+         # Check the location of the QScintilla library.
+-        if sciVersion >= 0:
++        if 0:
+             global sciLibDir
+ 
+             if not sciLibDir:
+@@ -1551,23 +1552,23 @@
+         subdirs = subdirs + " qtpe"
+ 
+     # See which version of pyuic to build.
+-    proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
++#    proPatches["BINDIR"] = [re.compile("@BL_BINDIR@",re.M), escape(platBinDir)]
+ 
+-    if qtVersion >= 0x030000:
+-        inform("Creating Makefile for pyuic3.")
+-        subdirs = subdirs + " pyuic3"
+-        olddir = pushDir("pyuic3")
+-    elif qtVersion >= 0x020000:
+-        inform("Creating Makefile for pyuic2.")
+-        subdirs = subdirs + " pyuic2"
+-        olddir = pushDir("pyuic2")
+-
+-    buildMakefile("pyuic.pro")
+-    fixInstallTarget()
+-    popDir(olddir)
++#    if qtVersion >= 0x030000:
++#        inform("Creating Makefile for pyuic3.")
++#        subdirs = subdirs + " pyuic3"
++#        olddir = pushDir("pyuic3")
++#    elif qtVersion >= 0x020000:
++#        inform("Creating Makefile for pyuic2.")
++#        subdirs = subdirs + " pyuic2"
++#        olddir = pushDir("pyuic2")
++
++#    buildMakefile("pyuic.pro")
++#    fixInstallTarget()
++#    popDir(olddir)
+ 
+     # Build pylupdate if Qt v3.0 or later.
+-    if qtVersion >= 0x030000:
++    if 0:
+         inform("Creating Makefile for pylupdate3.")
+         subdirs = subdirs + " pylupdate3"
+         olddir = pushDir("pylupdate3")
diff --git a/x11/py-qt3-modules/patches/patch-ab b/x11/py-qt3-modules/patches/patch-ab
new file mode 100644
index 00000000000..05dcc564b6e
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qtcanvasmod.sip.orig	2003-07-05 12:53:05.000000000 +0200
++++ sip/qtcanvasmod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -57,12 +57,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
++sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
+ sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
+ 
+ sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ac b/x11/py-qt3-modules/patches/patch-ac
new file mode 100644
index 00000000000..06260db33c1
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qtglmod.sip.orig	2003-07-05 12:53:05.000000000 +0200
++++ sip/qtglmod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -58,12 +58,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt opengl warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
++sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
+ sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
+ 
+ sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ad b/x11/py-qt3-modules/patches/patch-ad
new file mode 100644
index 00000000000..1dcb6a03a51
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qtnetworkmod.sip.orig	2003-07-05 12:53:05.000000000 +0200
++++ sip/qtnetworkmod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -61,12 +61,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
++sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
+ sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
+ 
+ sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ae b/x11/py-qt3-modules/patches/patch-ae
new file mode 100644
index 00000000000..cba5b403317
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qtsqlmod.sip.orig	2003-07-05 12:53:05.000000000 +0200
++++ sip/qtsqlmod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -74,12 +74,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqttablecmodule -lqtcmodule -L@BL_SIPMODDIR@ -lsip
++sip3:unix:LIBS += -L@BL_DESTDIR@ ../qttable/libqttablecmodule.la -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
+ sip3:win32:LIBS += @BL_DESTDIR@\libqttablec.lib @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
+ 
+ sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-af b/x11/py-qt3-modules/patches/patch-af
new file mode 100644
index 00000000000..6f0fcfbcbb0
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qttablemod.sip.orig	2003-07-05 12:53:06.000000000 +0200
++++ sip/qttablemod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -57,12 +57,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
++sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
+ sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
+ 
+ sip4:win32:LIBS += @BL_PYLIB@
diff --git a/x11/py-qt3-modules/patches/patch-ag b/x11/py-qt3-modules/patches/patch-ag
new file mode 100644
index 00000000000..642ac0609df
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qtuimod.sip.orig	2003-07-05 12:53:06.000000000 +0200
++++ sip/qtuimod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -58,12 +58,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip -lqui
++sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip -lqui
+ sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@ $$(QTDIR)\lib\qui.lib
+ 
+ sip4:unix:LIBS += -lqui
diff --git a/x11/py-qt3-modules/patches/patch-ah b/x11/py-qt3-modules/patches/patch-ah
new file mode 100644
index 00000000000..bb8bc11fc46
--- /dev/null
+++ b/x11/py-qt3-modules/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+
+--- sip/qtxmlmod.sip.orig	2003-07-05 12:53:05.000000000 +0200
++++ sip/qtxmlmod.sip	2003-07-22 15:20:50.000000000 +0200
+@@ -67,12 +67,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = @BL_TARGET@
+-DESTDIR = @BL_DESTDIR@
++#DESTDIR = @BL_DESTDIR@
+ CONFIG += qt warn_off @BL_DEBUG@ @BL_SIP@ @BL_DLL@ @BL_THREAD@
+ INCLUDEPATH = @BL_INCLUDEPATH@
+ DEFINES = SIP_MAKE_MODULE_DLL @BL_DEFINES@
+ 
+-sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -lsip
++sip3:unix:LIBS += -L@BL_DESTDIR@ -lqtcmodule -L@BL_SIPMODDIR@ -Wl,-R@BL_SIPMODDIR@ -lsip
+ sip3:win32:LIBS += @BL_DESTDIR@\libqtc.lib @BL_SIPMODDIR@\libsip.lib @BL_PYLIB@
+ 
+ sip4:win32:LIBS += @BL_PYLIB@