diff options
| author | jmc <jmc> | 2003-08-19 04:35:03 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-08-19 04:35:03 +0000 |
| commit | 9b57a3c32001ea985bc238d29e6098dd3866fd87 (patch) | |
| tree | feb0618328571843d3dca9cc1eda82f8f857f400 /x11/py-qt3-base | |
| parent | 045bfb847a6de0998380709da68badcfe517f1c9 (diff) | |
| download | pkgsrc-9b57a3c32001ea985bc238d29e6098dd3866fd87.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-base')
| -rw-r--r-- | x11/py-qt3-base/Makefile | 11 | ||||
| -rw-r--r-- | x11/py-qt3-base/PLIST | 7 | ||||
| -rw-r--r-- | x11/py-qt3-base/buildlink2.mk | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile index 27758a0aae4..030b51b216a 100644 --- a/x11/py-qt3-base/Makefile +++ b/x11/py-qt3-base/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/07/22 17:22:48 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2003/08/19 04:35:03 jmc Exp $ # DISTNAME= PyQt-x11-gpl-3.7 PKGNAME= ${PYPKGPREFIX}-qt3-base-3.7 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.river-bank.demon.co.uk/download/PyQt/ @@ -20,7 +21,8 @@ CONFIGURE_ARGS= -q ${QTDIR} -m ${GMAKE} -p ${SIPBIN} -b "" 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} @@ -28,10 +30,15 @@ do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${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. do-install: (cd ${WRKSRC}/qt && ${INSTALL_DATA} qt.py ${PREFIX}/${PYSITELIB}) (cd ${WRKSRC}/qt && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ libqtcmodule.la ${PREFIX}/${PYSITELIB}) + (cd ${PREFIX}/${PYSITELIB}; for i in libqtcmodule.*; do \ + ${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \ + ${PREFIX}/${QTLIBDIR}/$$i; done) (cd ${WRKSRC}/pylupdate3 && ${INSTALL_PROGRAM} pylupdate \ ${PREFIX}/bin/pylupdate${PYVERSSUFFIX}) (cd ${WRKSRC}/pyuic3 && ${INSTALL_PROGRAM} pyuic \ diff --git a/x11/py-qt3-base/PLIST b/x11/py-qt3-base/PLIST index e48953af8ae..0b645003e5a 100644 --- a/x11/py-qt3-base/PLIST +++ b/x11/py-qt3-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/22 17:22:48 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:03 jmc Exp $ bin/pylupdate${PYVERSSUFFIX} bin/pyuic${PYVERSSUFFIX} ${PYSITELIB}/libqtcmodule.a @@ -7,3 +7,8 @@ ${PYSITELIB}/libqtcmodule.so ${PYSITELIB}/libqtcmodule.so.1 ${PYSITELIB}/libqtcmodule.so.1.0 ${PYSITELIB}/qt.py +${QTLIBDIR}/libqtcmodule.a +${QTLIBDIR}/libqtcmodule.la +${QTLIBDIR}/libqtcmodule.so +${QTLIBDIR}/libqtcmodule.so.1 +${QTLIBDIR}/libqtcmodule.so.1.0 diff --git a/x11/py-qt3-base/buildlink2.mk b/x11/py-qt3-base/buildlink2.mk index 19fb636892f..c60bf52b3a0 100644 --- a/x11/py-qt3-base/buildlink2.mk +++ b/x11/py-qt3-base/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/07/22 17:22:48 drochner Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/08/19 04:35:03 jmc Exp $ .if !defined(PY_QT3_BASE_BUILDLINK2_MK) PY_QT3_BASE_BUILDLINK2_MK= # defined @@ -6,7 +6,7 @@ PY_QT3_BASE_BUILDLINK2_MK= # defined .include "../../lang/python/pyversion.mk" BUILDLINK_PACKAGES+= pyqt3base -BUILDLINK_DEPENDS.pyqt3base?= ${PYPKGPREFIX}-qt3-base-[0-9]* +BUILDLINK_DEPENDS.pyqt3base?= ${PYPKGPREFIX}-qt3-base>=3.7nb1 BUILDLINK_PKGSRCDIR.pyqt3base?= ../../x11/py-qt3-base EVAL_PREFIX+= BUILDLINK_PREFIX.pyqt3base=pyqt3base |