Fix PR pkg/20685 by changing the if-statements to allow creation of a fake

package for clean-depends-list purposes.
While here, also remove the no longer necessary CFLAGS after previous commit
in MesaLib and also add distinfo for MesaLib for non Mesa-5.0.

3 files changed, 15 insertions, 15 deletions

diff --git a/graphics/MesaLib/buildlink2.mk b/graphics/MesaLib/buildlink2.mk
index c042a75e7da..a159082870d 100644
--- a/graphics/MesaLib/buildlink2.mk
+++ b/graphics/MesaLib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/03/13 07:01:01 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/03/24 18:07:08 jschauma Exp $
 
 .if !defined(MESALIB_BUILDLINK2_MK)
 MESALIB_BUILDLINK2_MK=	# defined
@@ -9,18 +9,16 @@ MESA_REQD?=			3.4.2
 BUILDLINK_DEPENDS.MesaLib?=	MesaLib>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 
+_REQUIRE_BUILTIN_MESALIB?=	NO
+
 # XXX should be >= 3.4.2
 .if !empty(MESA_REQD:M5.[0-9]*)
-_NEED_MESALIB=		YES
-CPPFLAGS+=              -DGLX_GLXEXT_LEGACY
-CFLAGS+=		-DGLX_GLXEXT_LEGACY
+_IS_BUILTIN_MESALIB=	0
 .else
 
 # Check if we got Mesa distributed with XFree86 4.x or if we need to
 # depend on the Mesa package.
 #
-_REQUIRE_BUILTIN_MESALIB?=	NO
-
 _GL_GLX_H=		${X11BASE}/include/GL/glx.h
 _X11_TMPL=		${X11BASE}/lib/X11/config/X11.tmpl
 .if exists(${_GL_GLX_H}) && exists(${_X11_TMPL})
@@ -29,6 +27,8 @@ _IS_BUILTIN_MESALIB!=	${EGREP} -c BuildGLXLibrary ${_X11_TMPL} || ${TRUE}
 _IS_BUILTIN_MESALIB=	0
 .endif
 
+.endif  # MESA_REQD
+
 .if !empty(_REQUIRE_BUILTIN_MESALIB:M[yY][eE][sS])
 _NEED_MESALIB=		NO
 .else
@@ -53,8 +53,6 @@ _NEED_MESALIB!= \
 .  endif
 .endif
 
-.endif  # MESA_REQD
-
 .if ${_NEED_MESALIB} == "YES"
 BUILDLINK_PACKAGES+=		MesaLib
 EVAL_PREFIX+=			BUILDLINK_PREFIX.MesaLib=MesaLib
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 1d21bd80a4b..5965c415d75 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2003/03/09 19:04:53 jschauma Exp $
+$NetBSD: distinfo,v 1.8 2003/03/24 18:07:08 jschauma Exp $
 
+SHA1 (MesaLib-3.4.2.tar.bz2) = 1a41b61a29538127dbb0ab2882ac69554a0e9e37
+Size (MesaLib-3.4.2.tar.bz2) = 1380805 bytes
 SHA1 (MesaLib-5.0.tar.bz2) = 098260c89c4109a8823c76a2c4d75cef8484819d
 Size (MesaLib-5.0.tar.bz2) = 1645037 bytes
 SHA1 (patch-aa) = 7fa63dca0edfc41812b5432cbabd861ec52cec33
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
index 1d1ae05ef72..1d44ff79c8b 100644
--- a/graphics/glu/buildlink2.mk
+++ b/graphics/glu/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/03/13 07:01:03 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/03/24 18:07:07 jschauma Exp $
 
 .if !defined(GLU_BUILDLINK2_MK)
 GLU_BUILDLINK2_MK=	# defined
@@ -9,16 +9,16 @@ MESA_REQD?=			3.4.2
 BUILDLINK_DEPENDS.glu?=		glu>=${MESA_REQD}
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 
+_REQUIRE_BUILTIN_GLU?=	NO
+
 # XXX should be >= 3.4.2
 .if !empty(MESA_REQD:M5.[0-9]*)
-_NEED_GLU=		YES
+_IS_BUILTIN_GLU=	0
 .else
 
 # Check if we got libGLU distributed with XFree86 4.x or if we need to
 # depend on the glu package.
 #
-_REQUIRE_BUILTIN_GLU?=	NO
-
 _GL_GLU_H=		${X11BASE}/include/GL/glu.h
 _X11_TMPL=		${X11BASE}/lib/X11/config/X11.tmpl
 .if exists(${_GL_GLU_H}) && exists(${_X11_TMPL})
@@ -27,6 +27,8 @@ _IS_BUILTIN_GLU!=	${EGREP} -c BuildGLULibrary ${_X11_TMPL} || ${TRUE}
 _IS_BUILTIN_GLU=	0
 .endif
 
+.endif  # MESA_REQD
+
 .if !empty(_REQUIRE_BUILTIN_GLU:M[yY][eE][sS])
 _NEED_GLU=		NO
 .else
@@ -51,8 +53,6 @@ _NEED_GLU!= \
 .  endif
 .endif
 
-.endif  # MESA_REQD
-
 .if ${_NEED_GLU} == "YES"
 BUILDLINK_PACKAGES+=		glu
 EVAL_PREFIX+=			BUILDLINK_PREFIX.glu=glu