On all of these create symlinks from the libraries installed under PYSITELIB

to QTDIR/lib as qmake builds libtool archives that reference themselves
as coming from QTDIR/lib.
XXX - This really should be fixed in qmake.conf or something and not in
each package but for now it fixes 5 broken packages (these + devel/eric3)

3 files changed, 50 insertions, 4 deletions

diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index 08f6b7a121a..72008ed5348 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/08/19 04:35:04 jmc Exp $
 #
 
 DISTNAME=		PyQt-x11-gpl-3.7
 PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.7
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
 
@@ -19,6 +20,8 @@ CONFIGURE_ARGS=		-q ${QTDIR} -m ${GMAKE} -p ${SIPBIN}
 
 PYTHON_VERSIONS_ACCEPTED=	22pth 21pth
 PY_PATCHPLIST=	yes
+QTLIBDIR=	${QTDIR:S/${BUILDLINK_PREFIX.qt3-libs}\///}/lib
+PLIST_SUBST+=	QTLIBDIR=${QTLIBDIR}
 
 MAKE_ENV+=	QTPREFIX=${QTDIR}
 
@@ -28,6 +31,8 @@ do-configure:
 
 PYQTMODULES=	qtcanvas qtgl qtnetwork qtsql qttable qtui qtxml
 
+# XXX - hack. Shouldn't need the symlinks as qmake should let us build
+# proper libraries that install outside of QTDIR more easily.
 do-install:
 	(for f in ${PYQTMODULES}; do \
 		(cd ${WRKSRC}/$${f} && ( \
@@ -37,6 +42,12 @@ do-install:
 			) \
 		); \
 	 done)
+	(for f in ${PYQTMODULES}; do \
+		(cd ${PREFIX}/${PYSITELIB}; for i in lib$${f}cmodule.*; do \
+			${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \
+				${PREFIX}/${QTLIBDIR}/$$i; done \
+		); \
+	done)
 
 .include "../../lang/python/extension.mk"
 .include "../../x11/py-qt3-base/buildlink2.mk"
diff --git a/x11/py-qt3-modules/PLIST b/x11/py-qt3-modules/PLIST
index 85f7e077826..cb90b76a0ea 100644
--- a/x11/py-qt3-modules/PLIST
+++ b/x11/py-qt3-modules/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:04 jmc Exp $
 ${PYSITELIB}/libqtcanvascmodule.a
 ${PYSITELIB}/libqtcanvascmodule.la
 ${PYSITELIB}/libqtcanvascmodule.so
@@ -34,6 +34,41 @@ ${PYSITELIB}/libqtxmlcmodule.la
 ${PYSITELIB}/libqtxmlcmodule.so
 ${PYSITELIB}/libqtxmlcmodule.so.1
 ${PYSITELIB}/libqtxmlcmodule.so.1.0
+${QTLIBDIR}/libqtcanvascmodule.a
+${QTLIBDIR}/libqtcanvascmodule.la
+${QTLIBDIR}/libqtcanvascmodule.so
+${QTLIBDIR}/libqtcanvascmodule.so.1
+${QTLIBDIR}/libqtcanvascmodule.so.1.0
+${QTLIBDIR}/libqtglcmodule.a
+${QTLIBDIR}/libqtglcmodule.la
+${QTLIBDIR}/libqtglcmodule.so
+${QTLIBDIR}/libqtglcmodule.so.1
+${QTLIBDIR}/libqtglcmodule.so.1.0
+${QTLIBDIR}/libqtnetworkcmodule.a
+${QTLIBDIR}/libqtnetworkcmodule.la
+${QTLIBDIR}/libqtnetworkcmodule.so
+${QTLIBDIR}/libqtnetworkcmodule.so.1
+${QTLIBDIR}/libqtnetworkcmodule.so.1.0
+${QTLIBDIR}/libqtsqlcmodule.a
+${QTLIBDIR}/libqtsqlcmodule.la
+${QTLIBDIR}/libqtsqlcmodule.so
+${QTLIBDIR}/libqtsqlcmodule.so.1
+${QTLIBDIR}/libqtsqlcmodule.so.1.0
+${QTLIBDIR}/libqttablecmodule.a
+${QTLIBDIR}/libqttablecmodule.la
+${QTLIBDIR}/libqttablecmodule.so
+${QTLIBDIR}/libqttablecmodule.so.1
+${QTLIBDIR}/libqttablecmodule.so.1.0
+${QTLIBDIR}/libqtuicmodule.a
+${QTLIBDIR}/libqtuicmodule.la
+${QTLIBDIR}/libqtuicmodule.so
+${QTLIBDIR}/libqtuicmodule.so.1
+${QTLIBDIR}/libqtuicmodule.so.1.0
+${QTLIBDIR}/libqtxmlcmodule.a
+${QTLIBDIR}/libqtxmlcmodule.la
+${QTLIBDIR}/libqtxmlcmodule.so
+${QTLIBDIR}/libqtxmlcmodule.so.1
+${QTLIBDIR}/libqtxmlcmodule.so.1.0
 ${PYSITELIB}/qtcanvas.py
 ${PYSITELIB}/qtgl.py
 ${PYSITELIB}/qtnetwork.py
diff --git a/x11/py-qt3-modules/buildlink2.mk b/x11/py-qt3-modules/buildlink2.mk
index f5501ea8028..e507b024fb3 100644
--- a/x11/py-qt3-modules/buildlink2.mk
+++ b/x11/py-qt3-modules/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/07/22 17:24:50 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/08/19 04:35:04 jmc Exp $
 
 .if !defined(PY_QT3_MODULES_BUILDLINK2_MK)
 PY_QT3_MODULES_BUILDLINK2_MK=	# defined
@@ -6,7 +6,7 @@ PY_QT3_MODULES_BUILDLINK2_MK=	# defined
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pyqt3modules
-BUILDLINK_DEPENDS.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules-[0-9]*
+BUILDLINK_DEPENDS.pyqt3modules?=	${PYPKGPREFIX}-qt3-modules>=3.7nb1
 BUILDLINK_PKGSRCDIR.pyqt3modules?=	../../x11/py-qt3-modules
 
 .include "../../x11/py-qt3-base/buildlink2.mk"