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.

3 files changed, 6 insertions, 87 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 791dbfaf2d6..446ed3b7dea 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:40:01 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/08/26 01:43:52 jschauma Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
 WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
@@ -20,23 +20,6 @@ BUILD_DIRS=		${WRKSRC}/src
 CONFIGURE_ARGS+=	--disable-sparc
 .endif
 
-# XXX should be >= 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)
-_IS_BUILTIN_MESA!=	${EGREP} -c BuildGLXLibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
-.else
-_IS_BUILTIN_MESA=	0
-.endif
-
-.if (${X11PREFIX} == ${X11BASE}) && (${_IS_BUILTIN_MESA} != "0")
-PKG_SKIP_REASON= "${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				\
diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index e876026de0f..602edcf1e79 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,81 +1,19 @@
-# $NetBSD: buildlink2.mk,v 1.14 2003/07/15 23:31:22 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.15 2003/08/26 01:43:52 jschauma Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-MESA_REQD?=			3.4.2
-
-.if exists(${LOCALBASE}/lib/libGL.so.5) && empty(MESA_REQD:M5.[0-9]*)
-MESA_REQD=			5.0.1
-.endif
-
-BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_REQD}
+BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_VERSION}
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 
-_REQUIRE_BUILTIN_MESALIB?=	NO
-
-MAKEFLAGS+=			MESA_REQD="${MESA_REQD}"
-
-# XXX should be >= 3.4.2
-.if !empty(MESA_REQD:M5.[0-9]*)
-_IS_BUILTIN_MESALIB=	0
-CPPFLAGS+=		-DGLX_GLXEXT_LEGACY
-CFLAGS+=		-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=		${X11BASE}/include/GL/glx.h
-_X11_TMPL=		${X11BASE}/lib/X11/config/X11.tmpl
-.if exists(${_GL_GLX_H}) && exists(${_X11_TMPL})
-_IS_BUILTIN_MESALIB!=	${EGREP} -c BuildGLXLibrary ${_X11_TMPL} || ${TRUE}
-.else
-_IS_BUILTIN_MESALIB=	0
-.endif
-
-.endif  # MESA_REQD
-
-.if !empty(_REQUIRE_BUILTIN_MESALIB:M[yY][eE][sS])
-_NEED_MESALIB=		NO
-.else
-.  if ${_IS_BUILTIN_MESALIB} == "0"
-_NEED_MESALIB=		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=		MesaLib-${_MESA_VERSION}
-_MESALIB_DEPENDS=	${BUILDLINK_DEPENDS.MesaLib}
-_NEED_MESALIB!= \
-	if ${PKG_ADMIN} pmatch '${_MESALIB_DEPENDS}' ${_MESALIB_PKG}; then \
-		${ECHO} "NO";						\
-	else								\
-		${ECHO} "YES";						\
-	fi
-.  endif
-.endif
-
-.if ${_NEED_MESALIB} == "YES"
 BUILDLINK_PACKAGES+=		MesaLib
 EVAL_PREFIX+=			BUILDLINK_PREFIX.MesaLib=MesaLib
 BUILDLINK_PREFIX.MesaLib_DEFAULT=	${LOCALBASE}
-.else
-BUILDLINK_PREFIX.MesaLib=	${X11BASE}
-.endif
 
-.if ${_NEED_MESALIB} == "NO"
-_BLNK_MESALIB_LDFLAGS=		-L${BUILDLINK_PREFIX.MesaLib}/lib -lGL
-LIBTOOL_ARCHIVE_UNTRANSFORM_SED+=	\
-	-e "s|${BUILDLINK_PREFIX.MesaLib}/lib/libGL.la|${_BLNK_MESALIB_LDFLAGS}|g" \
-	-e "s|${LOCALBASE}/lib/libGL.la|${_BLNK_MESALIB_LDFLAGS}|g"
-.endif
+CPPFLAGS+=		-DGLX_GLXEXT_LEGACY
+CFLAGS+=		-DGLX_GLXEXT_LEGACY
 
 BUILDLINK_FILES.MesaLib+=	include/GL/GL*.h
 BUILDLINK_FILES.MesaLib+=	include/GL/gl.h
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 28732727128..3bd4010f9da 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2003/07/04 11:27:39 tron Exp $
+$NetBSD: distinfo,v 1.12 2003/08/26 01:43:52 jschauma Exp $
 
-SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
-Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
 SHA1 (MesaLib-5.0.1.tar.bz2) = efdda1b592065b714c4cc772d05f21f88b060799
 Size (MesaLib-5.0.1.tar.bz2) = 1661508 bytes
 SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33