pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 On all of these create symlinks from the libraries...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7cd6d1cfc8de
branches: trunk
changeset: 460102:7cd6d1cfc8de
user: jmc <jmc%pkgsrc.org@localhost>
date: Tue Aug 19 04:35:03 2003 +0000
description:
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:
x11/py-qt3-base/Makefile | 11 +++++++++--
x11/py-qt3-base/PLIST | 7 ++++++-
x11/py-qt3-base/buildlink2.mk | 4 ++--
x11/py-qt3-modules/Makefile | 13 ++++++++++++-
x11/py-qt3-modules/PLIST | 37 ++++++++++++++++++++++++++++++++++++-
x11/py-qt3-modules/buildlink2.mk | 4 ++--
x11/py-qt3-qscintilla/Makefile | 10 +++++++++-
x11/py-qt3-qscintilla/PLIST | 7 ++++++-
x11/py-qt3-qscintilla/buildlink2.mk | 4 ++--
x11/py-qt3-sip/Makefile | 11 +++++++++--
x11/py-qt3-sip/PLIST | 7 ++++++-
x11/py-qt3-sip/buildlink2.mk | 4 ++--
12 files changed, 101 insertions(+), 18 deletions(-)
diffs (truncated from 344 to 300 lines):
diff -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-base/Makefile
--- a/x11/py-qt3-base/Makefile Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-base/Makefile Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
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 @@
(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 -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-base/PLIST
--- a/x11/py-qt3-base/PLIST Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-base/PLIST Tue Aug 19 04:35:03 2003 +0000
@@ -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.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 -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-base/buildlink2.mk
--- a/x11/py-qt3-base/buildlink2.mk Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-base/buildlink2.mk Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
.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
diff -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-modules/Makefile
--- a/x11/py-qt3-modules/Makefile Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-modules/Makefile Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
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 @@
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 @@
) \
); \
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 -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-modules/PLIST
--- a/x11/py-qt3-modules/PLIST Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-modules/PLIST Tue Aug 19 04:35:03 2003 +0000
@@ -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.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 -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-modules/buildlink2.mk
--- a/x11/py-qt3-modules/buildlink2.mk Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-modules/buildlink2.mk Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
.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"
diff -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-qscintilla/Makefile
--- a/x11/py-qt3-qscintilla/Makefile Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-qscintilla/Makefile Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
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 @@
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 @@
) \
); \
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 -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-qscintilla/PLIST
--- a/x11/py-qt3-qscintilla/PLIST Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-qscintilla/PLIST Tue Aug 19 04:35:03 2003 +0000
@@ -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 -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-qscintilla/buildlink2.mk
--- a/x11/py-qt3-qscintilla/buildlink2.mk Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-qscintilla/buildlink2.mk Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
.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"
diff -r a5d63d9bd0a1 -r 7cd6d1cfc8de x11/py-qt3-sip/Makefile
--- a/x11/py-qt3-sip/Makefile Tue Aug 19 00:07:45 2003 +0000
+++ b/x11/py-qt3-sip/Makefile Tue Aug 19 04:35:03 2003 +0000
@@ -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 @@
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 @@
${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})
Home |
Main Index |
Thread Index |
Old Index