diff options
| author | drochner <drochner> | 2006-03-02 21:53:52 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2006-03-02 21:53:52 +0000 |
| commit | 6d58c01d34aff75a133f9f7b6c4b7f1645d9e0f8 (patch) | |
| tree | 3c6038b6aa8e42c7a79b2e6af0d4dd4ce182863d | |
| parent | f971fa76dc88d85aee0cc3ef9a37e8044f2c8878 (diff) | |
| download | pkgsrc-6d58c01d34aff75a133f9f7b6c4b7f1645d9e0f8.tar.gz | |
readd PLIST entries for OpenGL
qt2-libs didn't spontaneously stop building the OpenGL modules
(how should it, noone changed it) - the failure was caused by MesaLib
forcibly linking against libpthread so that it couldn't be used
by non-threaded programs anymore
added dependency on MesaLib-6.4.2nb1 and bumped PKGREVISION
| -rw-r--r-- | x11/py-qt2/Makefile | 8 | ||||
| -rw-r--r-- | x11/py-qt2/PLIST | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile index 1494c6d777d..1867d5eccce 100644 --- a/x11/py-qt2/Makefile +++ b/x11/py-qt2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2006/02/05 23:11:41 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2006/03/02 21:53:52 drochner Exp $ # DISTNAME= PyQt-3.1-Qt-2.3.1 PKGNAME= ${PYPKGPREFIX}-qt2-3.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 python MASTER_SITES= http://www.riverbankcomputing.co.uk/download/PyQt/ @@ -22,6 +22,10 @@ PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} MAKE_ENV+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +# MesaLib is pulled in through qt2-libs; we need a version +# which doesn't (needlessly) link to libpthread +BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.4.2nb1 + .include "../../lang/python/extension.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/x11/py-qt2/PLIST b/x11/py-qt2/PLIST index 9cb2fcad16c..6b7b5af733c 100644 --- a/x11/py-qt2/PLIST +++ b/x11/py-qt2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2005/09/18 19:55:15 minskim Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/03/02 21:53:52 drochner Exp $ bin/eric${PYVERSSUFFIX} bin/pyuic${PYVERSSUFFIX} ${PYSITELIB}/eric/AsyncIO.py @@ -16,6 +16,7 @@ ${PYSITELIB}/eric/UserInterface.py ${PYSITELIB}/eric/eric.py ${PYSITELIB}/libqtcanvascmodule.la ${PYSITELIB}/libqtcmodule.la +${PYSITELIB}/libqtglcmodule.la ${PYSITELIB}/libqtnetworkcmodule.la ${PYSITELIB}/libqttablecmodule.la ${PYSITELIB}/libqtxmlcmodule.la @@ -23,6 +24,8 @@ ${PYSITELIB}/qt.py ${PYSITELIB}/qt.pyc ${PYSITELIB}/qtcanvas.py ${PYSITELIB}/qtcanvas.pyc +${PYSITELIB}/qtgl.py +${PYSITELIB}/qtgl.pyc ${PYSITELIB}/qtnetwork.py ${PYSITELIB}/qtnetwork.pyc ${PYSITELIB}/qttable.py |