diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-08-26 01:43:48 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-08-26 01:43:48 +0000 |
| commit | aa0aa518ac14831c74a251ce2f29ab666a0ee437 (patch) | |
| tree | f140f06de4c7c70760a39202e8a58d32c2b1d16a /graphics/glut | |
| parent | 06d1f547a30205849de1743770d1e6f9ccbcabc9 (diff) | |
| download | pkgsrc-aa0aa518ac14831c74a251ce2f29ab666a0ee437.tar.gz | |
Finally remove support of Mesa 3.4.1 completely as discussed at length
on tech-pkg@ at various times. This means that regardless of what kind of
GL support comes with X11, if a package depends on GL, Mesa 5.0.1 (or higher)
will be installed into ${LOCALBASE}.
Some troubleshooting after the latest patches by Krister Walfridsson.
Diffstat (limited to 'graphics/glut')
| -rw-r--r-- | graphics/glut/Makefile | 15 | ||||
| -rw-r--r-- | graphics/glut/PLIST | 6 | ||||
| -rw-r--r-- | graphics/glut/buildlink2.mk | 7 | ||||
| -rw-r--r-- | graphics/glut/distinfo | 6 |
4 files changed, 7 insertions, 27 deletions
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile index 3355b4e25bd..93a9dd68514 100644 --- a/graphics/glut/Makefile +++ b/graphics/glut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/07/17 21:40:59 grant Exp $ +# $NetBSD: Makefile,v 1.19 2003/08/26 01:43:50 jschauma Exp $ PKGNAME= ${DISTNAME:S/MesaLib/glut/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -28,19 +28,6 @@ post-install: .include "../../graphics/MesaLib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" -.if (${MESA_REQD} == 3.4.2) -SO_SUFFIX=3 -SO_VERS=3.7 -.elif (${MESA_REQD} == 5.0.1) -SO_SUFFIX=10 -SO_VERS=10.1 -.else -.error Library version not known! -.endif - -PLIST_SUBST+=SO_SUFFIX=${SO_SUFFIX} -PLIST_SUBST+=SO_VERS=${SO_VERS} - # must be below bsd.pkg.mk to overwrite values PREFIX= ${LOCALBASE} X11PREFIX= ${LOCALBASE} diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST index c662626ac24..a2c32125aa4 100644 --- a/graphics/glut/PLIST +++ b/graphics/glut/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.7 2003/03/30 08:54:39 jmc Exp $ +@comment $NetBSD: PLIST,v 1.8 2003/08/26 01:43:50 jschauma Exp $ include/GL/glut.h include/GL/glutf90.h lib/libglut.so -lib/libglut.so.${SO_SUFFIX} -lib/libglut.so.${SO_VERS} +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 1299fab8e69..7eeec0e524f 100644 --- a/graphics/glut/buildlink2.mk +++ b/graphics/glut/buildlink2.mk @@ -1,15 +1,12 @@ -# $NetBSD: buildlink2.mk,v 1.6 2003/07/15 23:31:23 jschauma Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2003/08/26 01:43:50 jschauma Exp $ .if !defined(GLUT_BUILDLINK2_MK) GLUT_BUILDLINK2_MK= # defined -MESA_REQD?= 3.4.2 BUILDLINK_PACKAGES+= glut -BUILDLINK_DEPENDS.glut?= glut>=${MESA_REQD} +BUILDLINK_DEPENDS.glut?= glut>=${MESA_VERSION} BUILDLINK_PKGSRCDIR.glut?= ../../graphics/glut -MAKEFLAGS+= MESA_REQD="${MESA_REQD}" - EVAL_PREFIX+= BUILDLINK_PREFIX.glut=glut BUILDLINK_PREFIX.glut_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.glut= include/GL/glut.h diff --git a/graphics/glut/distinfo b/graphics/glut/distinfo index a6a9a5b03d5..dccaf486665 100644 --- a/graphics/glut/distinfo +++ b/graphics/glut/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.13 2003/07/16 08:51:31 wiz Exp $ +$NetBSD: distinfo,v 1.14 2003/08/26 01:43:50 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.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799 Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes SHA1 (MesaDemos-5.0.1.tar.bz2) = 7bc5c33e3799b9cd596311e8dde800800c68c938 |