Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

4 files changed, 40 insertions, 18 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 680b2c987bb..328fc6a12b2 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,33 +1,23 @@
-# $NetBSD: Makefile,v 1.43 2001/11/29 01:12:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.44 2002/08/25 18:38:54 jlam Exp $
 #
 
-.include "Makefile.common"
-
-DISTNAME=	Mesa-${MESA_VERSION}
+PKGNAME=	Mesa-${MESA_VERSION}
 PKGREVISION=	1
-CATEGORIES=	graphics
 MASTER_SITES= 	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mesa3d.org/
 COMMENT=	Graphics library meta package, similar to SGI's OpenGL
 
-
 CONFLICTS=	Mesa-glx-[0-9]*
 
-CHECK_MESA=	yes
-.include	"../../mk/bsd.prefs.mk"
-
-.if ${HAVE_BUILTIN_MESA} == "NO"
-DEPENDS+=	MesaLib-${MESA_VERSION}:../../graphics/MesaLib
-.endif
+.include "Makefile.common"
 
-.if ${HAVE_BUILTIN_GLU} == "NO"
-DEPENDS+=	glu-${MESA_VERSION}:../../graphics/glu
-.endif
+BUILDLINK_DEPENDS.MesaLib=	MesaLib-${MESA_VERSION}
+BUILDLINK_DEPENDS.glu=		glu-${MESA_VERSION}
+BUILDLINK_DEPENDS.glut=		glut-${MESA_VERSION}
 
-DEPENDS+=	glut-${MESA_VERSION}:../../graphics/glut
+USE_BUILDLINK2=	yes
 
 USE_X11BASE=	yes
 NO_CHECKSUM=	yes
@@ -38,4 +28,8 @@ EXTRACT_ONLY=	# empty
 
 do-install:	# empty
 
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/glut/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 6b9ba965677..de9f7f031e3 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1 +1,17 @@
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 18:38:54 jlam Exp $
+
 MESA_VERSION=		3.4.2
+DISTNAME?=		MesaLib-${MESA_VERSION}
+CATEGORIES?=		graphics
+MASTER_SITES?= 		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+EXTRACT_SUFX?=		.tar.bz2
+
+MAINTAINER?=		packages@netbsd.org
+HOMEPAGE?=		http://www.mesa3d.org/
+
+USE_GMAKE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+GNU_CONFIGURE?=		yes
+CONFIGURE_ARGS+=	--enable-static
diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk
index bda4e218f46..4bc4375c6df 100644
--- a/graphics/Mesa/buildlink.mk
+++ b/graphics/Mesa/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/06/26 05:36:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:55 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Mesa.
 #
diff --git a/graphics/Mesa/buildlink2.mk b/graphics/Mesa/buildlink2.mk
new file mode 100644
index 00000000000..516b28066b4
--- /dev/null
+++ b/graphics/Mesa/buildlink2.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:55 jlam Exp $
+
+.if !defined(MESA_BUILDLINK2_MK)
+MESA_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PREFIX.Mesa=	${BUILDLINK_PREFIX.MesaLib}
+
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/glut/buildlink2.mk"
+
+.endif	# MESA_BUILDLINK2_MK