diff options
| author | jschauma <jschauma> | 2003-03-09 19:04:52 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-03-09 19:04:52 +0000 |
| commit | 19f5ce2ae622bbff36e762847ee0ca2f4cc239b0 (patch) | |
| tree | ee5c914c7d457e01b0bd94e6f702794c79bbc86e /graphics/glut | |
| parent | 3fc9a14360c464e25ee52404430b4caae538cf6f (diff) | |
| download | pkgsrc-19f5ce2ae622bbff36e762847ee0ca2f4cc239b0.tar.gz | |
Update Mesa and friends to version 5.0, using patches provided in PR pkg/19302.
At the same time, move Mesa and friends to LOCALBASE rather than X11BASE, so
that they can be installed regardless of XF version. Introduce MESA_REQD variable
that can be set to 5.0, thus allowing systems with XF4 to indicate that the
provided version is not good enough.
All packages using Mesa, MesaLib, glu or glut will get a PKGREVISION bump
over the next few days.
Diffstat (limited to 'graphics/glut')
| -rw-r--r-- | graphics/glut/Makefile | 6 | ||||
| -rw-r--r-- | graphics/glut/PLIST | 6 | ||||
| -rw-r--r-- | graphics/glut/buildlink2.mk | 4 | ||||
| -rw-r--r-- | graphics/glut/distinfo | 10 |
4 files changed, 15 insertions, 11 deletions
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index a95151955c2..54f25d3885c 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/11/17 08:37:20 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2003/03/09 19:04:54 jschauma Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -27,3 +27,7 @@ post-install: .include "../../graphics/MesaLib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" + +# must be below bsd.pkg.mk to overwrite values +PREFIX= ${LOCALBASE} +X11PREFIX= ${LOCALBASE} diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST index a9fccf4ea38..6718d295695 100644 --- a/graphics/glut/PLIST +++ b/graphics/glut/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2002/12/06 17:03:25 jschauma Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/03/09 19:04:54 jschauma Exp $ include/GL/glut.h include/GL/glutf90.h lib/libglut.so -lib/libglut.so.3 -lib/libglut.so.3.7 +lib/libglut.so.10 +lib/libglut.so.10.1 lib/libglut.a lib/libglut.la @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE} diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk index dae5d429522..59690b7004e 100644 --- a/graphics/glut/buildlink2.mk +++ b/graphics/glut/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2002/11/18 07:49:26 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/03/09 19:04:54 jschauma Exp $ .if !defined(GLUT_BUILDLINK2_MK) GLUT_BUILDLINK2_MK= # defined @@ -9,7 +9,7 @@ BUILDLINK_DEPENDS.glut?= glut>=${MESA_REQD} BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut EVAL_PREFIX+= BUILDLINK_PREFIX.glut=glut -BUILDLINK_PREFIX.glut_DEFAULT= ${X11PREFIX} +BUILDLINK_PREFIX.glut_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.glut= include/GL/glut.h BUILDLINK_FILES.glut+= include/GL/glutf90.h BUILDLINK_FILES.glut+= lib/libglut.* diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo index 41db10bd94c..56c9e6b1c4c 100644 --- a/graphics/glut/distinfo +++ b/graphics/glut/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/12/06 17:03:25 jschauma Exp $ +$NetBSD: distinfo,v 1.7 2003/03/09 19:04:54 jschauma Exp $ -SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37 -Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes -SHA1 (MesaDemos-3.4.2.tar.bz2) = b291eb70c07ad2e12122e53039bf6d36c061a914 -Size (MesaDemos-3.4.2.tar.bz2) = 854130 bytes +SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d +Size (MesaLib-5.0.tar.bz2) = 1645037 bytes +SHA1 (MesaDemos-5.0.tar.bz2) = b487c94daa2d19060c40b0ae46869c28c883b6e8 +Size (MesaDemos-5.0.tar.bz2) = 894069 bytes |