diff options
| author | jmc <jmc> | 2003-08-19 04:35:03 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-08-19 04:35:03 +0000 |
| commit | 8c2d01d9920438cca8e0c903a3d11228530b1f07 (patch) | |
| tree | feb0618328571843d3dca9cc1eda82f8f857f400 /x11/py-qt3-qscintilla | |
| parent | e1117f07d546d41e8deb006d0d80997049669fc7 (diff) | |
| download | pkgsrc-8c2d01d9920438cca8e0c903a3d11228530b1f07.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-qscintilla')
| -rw-r--r-- | x11/py-qt3-qscintilla/Makefile | 10 | ||||
| -rw-r--r-- | x11/py-qt3-qscintilla/PLIST | 7 | ||||
| -rw-r--r-- | x11/py-qt3-qscintilla/buildlink2.mk | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile index bbe23cd79fe..99bb68c145d 100644 --- a/x11/py-qt3-qscintilla/Makefile +++ b/x11/py-qt3-qscintilla/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2003/08/19 04:35:05 jmc Exp $ # DISTNAME= PyQt-x11-gpl-3.7 PKGNAME= ${PYPKGPREFIX}-qt3-qscintilla-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= qtext +# 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,9 @@ do-install: ) \ ); \ done) + (cd ${PREFIX}/${PYSITELIB}; for i in libqtextcmodule.*; do \ + ${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \ + ${PREFIX}/${QTLIBDIR}/$$i; done) .include "../../lang/python/extension.mk" .include "../../x11/py-qt3-base/buildlink2.mk" diff --git a/x11/py-qt3-qscintilla/PLIST b/x11/py-qt3-qscintilla/PLIST index 8e81a408b47..72a6a12156c 100644 --- a/x11/py-qt3-qscintilla/PLIST +++ b/x11/py-qt3-qscintilla/PLIST @@ -1,7 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:05 jmc Exp $ ${PYSITELIB}/libqtextcmodule.a ${PYSITELIB}/libqtextcmodule.la ${PYSITELIB}/libqtextcmodule.so ${PYSITELIB}/libqtextcmodule.so.1 ${PYSITELIB}/libqtextcmodule.so.1.0 +${QTLIBDIR}/libqtextcmodule.a +${QTLIBDIR}/libqtextcmodule.la +${QTLIBDIR}/libqtextcmodule.so +${QTLIBDIR}/libqtextcmodule.so.1 +${QTLIBDIR}/libqtextcmodule.so.1.0 ${PYSITELIB}/qtext.py diff --git a/x11/py-qt3-qscintilla/buildlink2.mk b/x11/py-qt3-qscintilla/buildlink2.mk index d7d973baec4..1d1aa635810 100644 --- a/x11/py-qt3-qscintilla/buildlink2.mk +++ b/x11/py-qt3-qscintilla/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/07/22 17:27:05 drochner Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/08/19 04:35:05 jmc Exp $ .if !defined(PY_QT3_SCINTILLA_BUILDLINK2_MK) PY_QT3_SCINTILLA_BUILDLINK2_MK= # defined @@ -6,7 +6,7 @@ PY_QT3_SCINTILLA_BUILDLINK2_MK= # defined .include "../../lang/python/pyversion.mk" BUILDLINK_PACKAGES+= pyqt3scintilla -BUILDLINK_DEPENDS.pyqt3scintilla?= ${PYPKGPREFIX}-qt3-qscintilla-[0-9]* +BUILDLINK_DEPENDS.pyqt3scintilla?= ${PYPKGPREFIX}-qt3-qscintilla>=3.7nb1 BUILDLINK_PKGSRCDIR.pyqt3scintilla?= ../../x11/py-qt3-qscintilla .include "../../x11/py-qt3-base/buildlink2.mk" |