summaryrefslogtreecommitdiff
path: root/x11/py-qt3-sip
diff options
context:
space:
mode:
authorjmc <jmc@pkgsrc.org>2003-08-19 04:35:03 +0000
committerjmc <jmc@pkgsrc.org>2003-08-19 04:35:03 +0000
commitd07560dbb51156df2a29f3cada8f56c2c0a87c40 (patch)
treefeb0618328571843d3dca9cc1eda82f8f857f400 /x11/py-qt3-sip
parent22221107747584736a9ba1e8b3cf2f8bf62d35c5 (diff)
downloadpkgsrc-d07560dbb51156df2a29f3cada8f56c2c0a87c40.tar.gz
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)
Diffstat (limited to 'x11/py-qt3-sip')
-rw-r--r--x11/py-qt3-sip/Makefile11
-rw-r--r--x11/py-qt3-sip/PLIST7
-rw-r--r--x11/py-qt3-sip/buildlink2.mk4
3 files changed, 17 insertions, 5 deletions
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 5dd98403b80..671f0cc4ae3 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:41 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/08/19 04:35:05 jmc Exp $
#
DISTNAME= sip-x11-gpl-3.7
PKGNAME= ${PYPKGPREFIX}-qt3-sip-3.7
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= http://www.river-bank.demon.co.uk/download/sip/
@@ -28,7 +29,8 @@ CONFIGURE_ARGS+= -b ${PYQT_TMPDIR}
PYTHON_VERSIONS_ACCEPTED= 22pth 21pth
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+QTLIBDIR= ${QTDIR:S/${BUILDLINK_PREFIX.qt3-libs}\///}/lib
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} QTLIBDIR=${QTLIBDIR}
MAKE_ENV+= QTPREFIX=${QTDIR}
@@ -36,11 +38,16 @@ do-configure:
${MKDIR} -p ${PYQT_TMPDIR}
(cd ${WRKSRC} && ${PYTHONBIN} build.py ${CONFIGURE_ARGS})
+# XXX - hack. Shouldn't need the symlinks as qmake should let us build
+# proper libraries that install outside of QTDIR more easily.
post-install:
(cd ${PYQT_TMPDIR} && ${INSTALL_PROGRAM} sip \
${PREFIX}/bin/sip${PYVERSSUFFIX})
(cd ${PYQT_TMPDIR} && ${LIBTOOL} ${INSTALL_DATA} \
libsip.la ${PREFIX}/${PYSITELIB})
+ (cd ${PREFIX}/${PYSITELIB}; for i in libsip.*; do \
+ ${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \
+ ${PREFIX}/${QTLIBDIR}/$$i; done)
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
diff --git a/x11/py-qt3-sip/PLIST b/x11/py-qt3-sip/PLIST
index f411ef0f8b0..7b431a746a1 100644
--- a/x11/py-qt3-sip/PLIST
+++ b/x11/py-qt3-sip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/15 16:40:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:05 jmc Exp $
bin/sip${PYVERSSUFFIX}
${PYINC}/sip.h
${PYINC}/sipQt.h
@@ -7,3 +7,8 @@ ${PYSITELIB}/libsip.la
${PYSITELIB}/libsip.so
${PYSITELIB}/libsip.so.10
${PYSITELIB}/libsip.so.10.1
+${QTLIBDIR}/libsip.a
+${QTLIBDIR}/libsip.la
+${QTLIBDIR}/libsip.so
+${QTLIBDIR}/libsip.so.10
+${QTLIBDIR}/libsip.so.10.1
diff --git a/x11/py-qt3-sip/buildlink2.mk b/x11/py-qt3-sip/buildlink2.mk
index cf0b5b2ba43..8f9d4315869 100644
--- a/x11/py-qt3-sip/buildlink2.mk
+++ b/x11/py-qt3-sip/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/07/22 17:19:59 drochner Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/08/19 04:35:05 jmc Exp $
.if !defined(PY_QT3_SIP_BUILDLINK2_MK)
PY_QT3_SIP_BUILDLINK2_MK= # defined
@@ -6,7 +6,7 @@ PY_QT3_SIP_BUILDLINK2_MK= # defined
.include "../../lang/python/pyversion.mk"
BUILDLINK_PACKAGES+= pyqt3sip
-BUILDLINK_DEPENDS.pyqt3sip?= ${PYPKGPREFIX}-qt3-sip-[0-9]*
+BUILDLINK_DEPENDS.pyqt3sip?= ${PYPKGPREFIX}-qt3-sip>=3.7nb1
BUILDLINK_PKGSRCDIR.pyqt3sip?= ../../x11/py-qt3-sip
EVAL_PREFIX+= BUILDLINK_PREFIX.pyqt3sip=pyqt3sip