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, 68 insertions, 22 deletions

diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index d4cb8298efd..d03c8f88302 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,28 +1,30 @@
-# $NetBSD: Makefile,v 1.10 2001/09/27 23:18:11 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.11 2002/08/25 18:39:06 jlam Exp $
 
-.include "../Mesa/Makefile.common"
-
-DISTNAME=		MesaLib-${MESA_VERSION}
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
-CATEGORIES=		graphics
-MASTER_SITES= 		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
-EXTRACT_SUFX=		.tar.bz2
-
+WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
 MAINTAINER=		rh@netbsd.org
-HOMEPAGE=		http://www.mesa3d.org/
 COMMENT=		GLU polygon tesselation facility for Mesa
 
 CONFLICTS+=		Mesa-glx-[0-9]*
 CONFLICTS+=		Mesa<3.2.1
 
-WRKSRC=			${WRKDIR}/${DISTNAME:C/Lib//}
+.include "../Mesa/Makefile.common"
+
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--enable-static
+.include "../../mk/bsd.prefs.mk"
+
+# Check if we got libGLU distributed with XFree86 4.x.
+.if exists(${X11BASE}/include/GL/glu.h)
+_IS_BUILTIN_GLU!=	${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+.else
+_IS_BUILTIN_GLU=	0
+.endif
+
+.if ${_IS_BUILTIN_GLU} != "0"
+IGNORE=		"GLU has already been installed as part of XFree86-4.x"
+.endif
 
 do-build:
 	cd ${WRKSRC}/src-glu && ${SETENV} ${MAKE_ENV} \
@@ -33,9 +35,11 @@ do-install:
 	${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}
 
 post-install:
-	${INSTALL_DATA_DIR} ${X11PREFIX}/include/GL
-.for hdr in glu.h glu_mangle.h
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${hdr} ${X11PREFIX}/include/GL
-.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
+	cd ${WRKSRC}/include/GL; for hdr in				\
+		glu.h glu_mangle.h;					\
+	do								\
+		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 768d5841f5e..1d4af1ecd25 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:43 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:06 jlam Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
 lib/libGLU.so
@@ -6,4 +6,4 @@ lib/libGLU.so.3
 lib/libGLU.so.3.4
 lib/libGLU.a
 lib/libGLU.la
-@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true
+@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glu/buildlink.mk b/graphics/glu/buildlink.mk
index 6013ca40faf..70d35fcd730 100644
--- a/graphics/glu/buildlink.mk
+++ b/graphics/glu/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/06/26 05:36:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 18:39:07 jlam Exp $
 
 .if !defined(GLU_BUILDLINK_MK)
 GLU_BUILDLINK_MK=	# defined
diff --git a/graphics/glu/buildlink2.mk b/graphics/glu/buildlink2.mk
new file mode 100644
index 00000000000..6ce4d584bd0
--- /dev/null
+++ b/graphics/glu/buildlink2.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:07 jlam Exp $
+
+.if !defined(GLU_BUILDLINK2_MK)
+GLU_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.glu?=		glu>=3.4.2
+BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
+
+# Check if we got libGLU distributed with XFree86 4.x or if we need to
+# depend on the glu package.
+#
+_REQUIRE_BUILTIN_GLU?=	NO
+.if exists(${X11BASE}/include/GL/glu.h)
+_IS_BUILTIN_GLU!=	${EGREP} -c BuildGLULibrary ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+.else
+_IS_BUILTIN_GLU=	0
+.endif
+.if (${_IS_BUILTIN_GLU} == "0") && (${_REQUIRE_BUILTIN_GLU} == "NO")
+_NEED_GLU=		YES
+.else
+_NEED_GLU=		NO
+.endif
+
+.if ${_NEED_GLU} == "YES"
+BUILDLINK_PACKAGES+=		glu
+EVAL_PREFIX+=	BUILDLINK_PREFIX.glu=glu
+BUILDLINK_PREFIX.glu_DEFAULT=	${X11PREFIX}
+.else
+BUILDLINK_PREFIX.glu=	${X11BASE}
+.endif
+
+BUILDLINK_FILES.glu=	include/GL/glu.h
+BUILDLINK_FILES.glu+=	include/GL/glu_mangle.h
+BUILDLINK_FILES.glu+=	lib/libGLU.*
+
+BUILDLINK_TARGETS+=	glu-buildlink
+
+glu-buildlink: _BUILDLINK_USE
+
+.endif	# GLU_BUILDLINK2_MK