Subject: Re: Mesa breakage
To: None <tech-pkg@netbsd.org>
From: Jan Schaumann <jschauma@netbsd.org>
List: tech-pkg
Date: 08/10/2003 23:26:52
--WhfpMioaduB5tiZL
Content-Type: multipart/mixed; boundary="gBBFr7Ir9EOA20Yy"
Content-Disposition: inline
--gBBFr7Ir9EOA20Yy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Jan Schaumann <jschauma@netbsd.org> wrote:
=20
> I'd advocate dropping 3.4.2 completely
> "So, unless I hear any objections in the next couple of days, I'll make
> it so."
Patches attached. Any objections?
-Jan
--=20
Wenn ich tot bin, mir soll mal Einer mit Auferstehung oder so
kommen, ich hau ihm eine rein! (Anonym)
--gBBFr7Ir9EOA20Yy
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Content-Transfer-Encoding: quoted-printable
Index: Mesa/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/Mesa/Makefile,v
retrieving revision 1.50
diff -b -u -r1.50 Makefile
--- Mesa/Makefile 2003/07/17 21:39:58 1.50
+++ Mesa/Makefile 2003/08/11 03:22:04
@@ -20,8 +20,6 @@
NO_BUILD=3D yes
EXTRACT_ONLY=3D # empty
=20
-MAKEFLAGS+=3D MESA_REQD=3D${MESA_REQD}
-
do-install: # empty
=20
.include "../../graphics/MesaLib/buildlink2.mk"
Index: Mesa/Makefile.common
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/Mesa/Makefile.common,v
retrieving revision 1.17
diff -b -u -r1.17 Makefile.common
--- Mesa/Makefile.common 2003/07/17 21:39:59 1.17
+++ Mesa/Makefile.common 2003/08/11 03:22:04
@@ -1,10 +1,6 @@
# $NetBSD: Makefile.common,v 1.17 2003/07/17 21:39:59 grant Exp $
=20
-# Latest is: 5.0.1
-# Default is: 3.4.2
-MESA_REQD?=3D 3.4.2
-
-MESA_VERSION=3D ${MESA_REQD}
+MESA_VERSION=3D 5.0.1
DISTNAME?=3D MesaLib-${MESA_VERSION}
CATEGORIES?=3D graphics
MASTER_SITES?=3D ${MASTER_SITE_SOURCEFORGE:=3Dmesa3d/}
@@ -21,9 +17,3 @@
CONFIGURE_ARGS+=3D --enable-static
=20
.include "../../mk/bsd.prefs.mk"
-
-.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*)
-MESA_REQD=3D 5.0.1
-.endif
-
-MAKEFLAGS+=3D MESA_REQD=3D"${MESA_REQD}"
Index: Mesa/buildlink2.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/Mesa/buildlink2.mk,v
retrieving revision 1.4
diff -b -u -r1.4 buildlink2.mk
--- Mesa/buildlink2.mk 2003/07/15 23:31:22 1.4
+++ Mesa/buildlink2.mk 2003/08/11 03:22:04
@@ -3,10 +3,7 @@
.if !defined(MESA_BUILDLINK2_MK)
MESA_BUILDLINK2_MK=3D # defined
=20
-MESA_REQD?=3D 3.4.2
BUILDLINK_PREFIX.Mesa=3D ${BUILDLINK_PREFIX.MesaLib}
-
-MAKEFLAGS+=3D MESA_REQD=3D"${MESA_REQD}"
=20
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/glu/buildlink2.mk"
Index: MesaDemos/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaDemos/Makefile,v
retrieving revision 1.7
diff -b -u -r1.7 Makefile
--- MesaDemos/Makefile 2003/07/17 21:40:00 1.7
+++ MesaDemos/Makefile 2003/08/11 03:22:04
@@ -7,8 +7,6 @@
MAINTAINER=3D jschauma@NetBSD.org
COMMENT=3D OpenGL examples and Demos
=20
-MESA_REQD=3D 5.0.1
-
.include "../Mesa/Makefile.common"
=20
USE_BUILDLINK2=3D yes
Index: MesaLib/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/Makefile,v
retrieving revision 1.21
diff -b -u -r1.21 Makefile
--- MesaLib/Makefile 2003/07/17 21:40:01 1.21
+++ MesaLib/Makefile 2003/08/11 03:22:04
@@ -20,9 +20,6 @@
CONFIGURE_ARGS+=3D --disable-sparc
.endif
=20
-# XXX should be >=3D 3.4.2
-.if empty(MESA_REQD:M5.[0-9]*)
-
# Check if we got Mesa distributed with XFree86 4.x.
.if exists(${X11BASE}/include/GL/glx.h) && \
exists(${X11BASE}/lib/X11/config/X11.tmpl)
@@ -34,8 +31,6 @@
.if (${X11PREFIX} =3D=3D ${X11BASE}) && (${_IS_BUILTIN_MESA} !=3D "0")
PKG_SKIP_REASON=3D "${PKGNAME} is part of your X11 distribution"
.endif
-
-.endif # MESA_REQD
=20
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/GL
Index: MesaLib/buildlink2.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/buildlink2.mk,v
retrieving revision 1.14
diff -b -u -r1.14 buildlink2.mk
--- MesaLib/buildlink2.mk 2003/07/15 23:31:22 1.14
+++ MesaLib/buildlink2.mk 2003/08/11 03:22:04
@@ -5,77 +5,14 @@
=20
.include "../../mk/bsd.prefs.mk"
=20
-MESA_REQD?=3D 3.4.2
-
-.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*)
-MESA_REQD=3D 5.0.1
-.endif
-
-BUILDLINK_DEPENDS.MesaLib?=3D MesaLib>=3D${MESA_REQD}
-BUILDLINK_PKGSRCDIR.MesaLib?=3D ../../graphics/MesaLib
-
-_REQUIRE_BUILTIN_MESALIB?=3D NO
-
-MAKEFLAGS+=3D MESA_REQD=3D"${MESA_REQD}"
-
-# XXX should be >=3D 3.4.2
-.if !empty(MESA_REQD:M5.[0-9]*)
-_IS_BUILTIN_MESALIB=3D 0
-CPPFLAGS+=3D -DGLX_GLXEXT_LEGACY
-CFLAGS+=3D -DGLX_GLXEXT_LEGACY
-.else
-
-# Check if we got Mesa distributed with XFree86 4.x or if we need to
-# depend on the Mesa package.
-#
-_GL_GLX_H=3D ${X11BASE}/include/GL/glx.h
-_X11_TMPL=3D ${X11BASE}/lib/X11/config/X11.tmpl
-.if exists(${_GL_GLX_H}) && exists(${_X11_TMPL})
-_IS_BUILTIN_MESALIB!=3D ${EGREP} -c BuildGLXLibrary ${_X11_TMPL} || ${TRUE}
-.else
-_IS_BUILTIN_MESALIB=3D 0
-.endif
-
-.endif # MESA_REQD
-
-.if !empty(_REQUIRE_BUILTIN_MESALIB:M[yY][eE][sS])
-_NEED_MESALIB=3D NO
-.else
-. if ${_IS_BUILTIN_MESALIB} =3D=3D "0"
-_NEED_MESALIB=3D YES
-. else
-#
-# Create an appropriate package name for the built-in MesaLib distributed
-# with XFree86 4.x. This package name can be used to check against
-# BUILDLINK_DEPENDS.MesaLib to see if we need to install the pkgsrc
-# Mesa or if the built-in one is sufficient.
-#
-. include "../../graphics/Mesa/version.mk"
-_MESALIB_PKG=3D MesaLib-${_MESA_VERSION}
-_MESALIB_DEPENDS=3D ${BUILDLINK_DEPENDS.MesaLib}
-_NEED_MESALIB!=3D \
- if ${PKG_ADMIN} pmatch '${_MESALIB_DEPENDS}' ${_MESALIB_PKG}; then \
- ${ECHO} "NO"; \
- else \
- ${ECHO} "YES"; \
- fi
-. endif
-.endif
-
-.if ${_NEED_MESALIB} =3D=3D "YES"
BUILDLINK_PACKAGES+=3D MesaLib
+BUILDLINK_DEPENDS.MesaLib?=3D MesaLib>=3D${MESA_VERSION}
+BUILDLINK_PKGSRCDIR.MesaLib?=3D ../../graphics/MesaLib
EVAL_PREFIX+=3D BUILDLINK_PREFIX.MesaLib=3DMesaLib
BUILDLINK_PREFIX.MesaLib_DEFAULT=3D ${LOCALBASE}
-.else
-BUILDLINK_PREFIX.MesaLib=3D ${X11BASE}
-.endif
=20
-.if ${_NEED_MESALIB} =3D=3D "NO"
-_BLNK_MESALIB_LDFLAGS=3D -L${BUILDLINK_PREFIX.MesaLib}/lib -lGL
-LIBTOOL_ARCHIVE_UNTRANSFORM_SED+=3D \
- -e "s|${BUILDLINK_PREFIX.MesaLib}/lib/libGL.la|${_BLNK_MESALIB_LDFLAGS}|g=
" \
- -e "s|${LOCALBASE}/lib/libGL.la|${_BLNK_MESALIB_LDFLAGS}|g"
-.endif
+CPPFLAGS+=3D -DGLX_GLXEXT_LEGACY
+CFLAGS+=3D -DGLX_GLXEXT_LEGACY
=20
BUILDLINK_FILES.MesaLib+=3D include/GL/GL*.h
BUILDLINK_FILES.MesaLib+=3D include/GL/gl.h
Index: MesaLib/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/MesaLib/distinfo,v
retrieving revision 1.11
diff -b -u -r1.11 distinfo
--- MesaLib/distinfo 2003/07/04 11:27:39 1.11
+++ MesaLib/distinfo 2003/08/11 03:22:04
@@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.11 2003/07/04 11:27:39 tron Exp $
=20
-SHA1 (MesaLib-3.4.2.tar.bz2) =3D 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) =3D 1380805 bytes
SHA1 (MesaLib-5.0.1.tar.bz2) =3D efdda1b592065b714c4cc772d05f21f88b060799
Size (MesaLib-5.0.1.tar.bz2) =3D 1661508 bytes
SHA1 (patch-aa) =3D 7fa63dca0edfc41812b5432cbabd861ec52cec33
Index: glu/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glu/Makefile,v
retrieving revision 1.17
diff -b -u -r1.17 Makefile
--- glu/Makefile 2003/07/17 21:40:58 1.17
+++ glu/Makefile 2003/08/11 03:22:04
@@ -16,23 +16,6 @@
=20
.include "../../mk/bsd.prefs.mk"
=20
-# XXX should be >=3D 3.4.2
-.if empty(MESA_REQD:M5.[0-9]*)
-
-# Check if we got libGLU distributed with XFree86 4.x.
-.if exists(${X11BASE}/include/GL/glu.h) && \
- exists(${X11BASE}/lib/X11/config/X11.tmpl)
-_IS_BUILTIN_GLU!=3D ${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/=
X11.tmpl || ${TRUE}
-.else
-_IS_BUILTIN_GLU=3D 0
-.endif
-
-.if (${X11PREFIX} =3D=3D ${X11BASE}) && (${_IS_BUILTIN_GLU} !=3D "0")
-PKG_SKIP_REASON=3D "${PKGNAME} is part of your X11 distribution"
-.endif
-
-.endif # MESA_REQD
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/GL
cd ${WRKSRC}/include/GL; for hdr in \
Index: glu/buildlink2.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glu/buildlink2.mk,v
retrieving revision 1.11
diff -b -u -r1.11 buildlink2.mk
--- glu/buildlink2.mk 2003/07/15 23:31:22 1.11
+++ glu/buildlink2.mk 2003/08/11 03:22:04
@@ -5,70 +5,11 @@
=20
.include "../../mk/bsd.prefs.mk"
=20
-MESA_REQD?=3D 3.4.2
-BUILDLINK_DEPENDS.glu?=3D glu>=3D${MESA_REQD}
-BUILDLINK_PKGSRCDIR.glu?=3D ../../graphics/glu
-
-_REQUIRE_BUILTIN_GLU?=3D NO
-
-MAKEFLAGS+=3D MESA_REQD=3D"${MESA_REQD}"
-
-# XXX should be >=3D 3.4.2
-.if !empty(MESA_REQD:M5.[0-9]*)
-_IS_BUILTIN_GLU=3D 0
-.else
-
-# Check if we got libGLU distributed with XFree86 4.x or if we need to
-# depend on the glu package.
-#
-_GL_GLU_H=3D ${X11BASE}/include/GL/glu.h
-_X11_TMPL=3D ${X11BASE}/lib/X11/config/X11.tmpl
-.if exists(${_GL_GLU_H}) && exists(${_X11_TMPL})
-_IS_BUILTIN_GLU!=3D ${EGREP} -c BuildGLULibrary ${_X11_TMPL} || ${TRUE}
-.else
-_IS_BUILTIN_GLU=3D 0
-.endif
-
-.endif # MESA_REQD
-
-.if !empty(_REQUIRE_BUILTIN_GLU:M[yY][eE][sS])
-_NEED_GLU=3D NO
-.else
-. if ${_IS_BUILTIN_GLU} =3D=3D "0"
-_NEED_GLU=3D YES
-. else
-#
-# Create an appropriate package name for the built-in Mesa/GLU distributed
-# with XFree86 4.x. This package name can be used to check against
-# BUILDLINK_DEPENDS.glu to see if we need to install the pkgsrc Mesa/GLU
-# or if the built-in one is sufficient.
-#
-. include "../../graphics/Mesa/version.mk"
-_GLU_PKG=3D glu-${_MESA_VERSION}
-_GLU_DEPENDS=3D ${BUILDLINK_DEPENDS.glu}
-_NEED_GLU!=3D \
- if ${PKG_ADMIN} pmatch '${_GLU_DEPENDS}' ${_GLU_PKG}; then \
- ${ECHO} "NO"; \
- else \
- ${ECHO} "YES"; \
- fi
-. endif
-.endif
-
-.if ${_NEED_GLU} =3D=3D "YES"
BUILDLINK_PACKAGES+=3D glu
+BUILDLINK_DEPENDS.glu?=3D glu>=3D${MESA_VERSION}
+BUILDLINK_PKGSRCDIR.glu?=3D ../../graphics/glu
EVAL_PREFIX+=3D BUILDLINK_PREFIX.glu=3Dglu
BUILDLINK_PREFIX.glu_DEFAULT=3D ${LOCALBASE}
-.else
-BUILDLINK_PREFIX.glu=3D ${X11BASE}
-.endif
-
-.if ${_NEED_GLU} =3D=3D "NO"
-_BLNK_GLU_LDFLAGS=3D -L${BUILDLINK_PREFIX.glu}/lib -lGLU
-LIBTOOL_ARCHIVE_UNTRANSFORM_SED+=3D \
- -e "s|${BUILDLINK_PREFIX.glu}/lib/libGLU.la|${_BLNK_GLU_LDFLAGS}|g" \
- -e "s|${LOCALBASE}/lib/libGLU.la|${_BLNK_GLU_LDFLAGS}|g"
-.endif
=20
BUILDLINK_FILES.glu=3D include/GL/glu.h
BUILDLINK_FILES.glu+=3D include/GL/glu_mangle.h
Index: glu/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glu/distinfo,v
retrieving revision 1.10
diff -b -u -r1.10 distinfo
--- glu/distinfo 2003/07/22 14:02:58 1.10
+++ glu/distinfo 2003/08/11 03:22:04
@@ -2,5 +2,3 @@
=20
SHA1 (MesaLib-5.0.1.tar.bz2) =3D efdda1b592065b714c4cc772d05f21f88b060799
Size (MesaLib-5.0.1.tar.bz2) =3D 1661508 bytes
-SHA1 (MesaLib-3.4.2.tar.bz2) =3D 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) =3D 1380805 bytes
Index: glut/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/Makefile,v
retrieving revision 1.18
diff -b -u -r1.18 Makefile
--- glut/Makefile 2003/07/17 21:40:59 1.18
+++ glut/Makefile 2003/08/11 03:22:04
@@ -28,19 +28,6 @@
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
=20
-.if (${MESA_REQD} =3D=3D 3.4.2)
-SO_SUFFIX=3D3
-SO_VERS=3D3.7
-.elif (${MESA_REQD} =3D=3D 5.0.1)
-SO_SUFFIX=3D10
-SO_VERS=3D10.1
-.else
-.error Library version not known!
-.endif
-
-PLIST_SUBST+=3DSO_SUFFIX=3D${SO_SUFFIX}
-PLIST_SUBST+=3DSO_VERS=3D${SO_VERS}
-
# must be below bsd.pkg.mk to overwrite values
PREFIX=3D ${LOCALBASE}
X11PREFIX=3D ${LOCALBASE}
Index: glut/PLIST
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/PLIST,v
retrieving revision 1.7
diff -b -u -r1.7 PLIST
--- glut/PLIST 2003/03/30 08:54:39 1.7
+++ glut/PLIST 2003/08/11 03:22:05
@@ -2,8 +2,8 @@
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}
Index: glut/buildlink2.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/buildlink2.mk,v
retrieving revision 1.6
diff -b -u -r1.6 buildlink2.mk
--- glut/buildlink2.mk 2003/07/15 23:31:23 1.6
+++ glut/buildlink2.mk 2003/08/11 03:22:05
@@ -3,12 +3,9 @@
.if !defined(GLUT_BUILDLINK2_MK)
GLUT_BUILDLINK2_MK=3D # defined
=20
-MESA_REQD?=3D 3.4.2
BUILDLINK_PACKAGES+=3D glut
-BUILDLINK_DEPENDS.glut?=3D glut>=3D${MESA_REQD}
+BUILDLINK_DEPENDS.glut?=3D glut>=3D${MESA_VERSION}
BUILDLINK_PKGSRCDIR.glut?=3D ../../graphics/glut
-
-MAKEFLAGS+=3D MESA_REQD=3D"${MESA_REQD}"
=20
EVAL_PREFIX+=3D BUILDLINK_PREFIX.glut=3Dglut
BUILDLINK_PREFIX.glut_DEFAULT=3D ${LOCALBASE}
Index: glut/distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/glut/distinfo,v
retrieving revision 1.13
diff -b -u -r1.13 distinfo
--- glut/distinfo 2003/07/16 08:51:31 1.13
+++ glut/distinfo 2003/08/11 03:22:05
@@ -1,9 +1,5 @@
$NetBSD: distinfo,v 1.13 2003/07/16 08:51:31 wiz Exp $
=20
-SHA1 (MesaLib-3.4.2.tar.bz2) =3D 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) =3D 1380805 bytes
-SHA1 (MesaDemos-3.4.2.tar.bz2) =3D b291eb70c07ad2e12122e53039bf6d36c061a914
-Size (MesaDemos-3.4.2.tar.bz2) =3D 854130 bytes
SHA1 (MesaLib-5.0.1.tar.bz2) =3D efdda1b592065b714c4cc772d05f21f88b060799
Size (MesaLib-5.0.1.tar.bz2) =3D 1661508 bytes
SHA1 (MesaDemos-5.0.1.tar.bz2) =3D 7bc5c33e3799b9cd596311e8dde800800c68c938
--gBBFr7Ir9EOA20Yy--
--WhfpMioaduB5tiZL
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (NetBSD)
iD8DBQE/Nwz8fFtkr68iakwRAg2FAJ9KUjuDxctjJSAPMp2wedDjjcc6RACgn2zN
wLtpx20orKcZDRVr7zkTX30=
=ofQl
-----END PGP SIGNATURE-----
--WhfpMioaduB5tiZL--