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, 27 deletions

diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index d1b236267b6..7781cb05024 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,41 +1,34 @@
-# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:12 jlam Exp $
-#
-
-.include "../Mesa/Makefile.common"
-
-DISTNAME=		Mesa-${MESA_VERSION}
-PKGNAME=		${DISTNAME:S/Mesa/glut/}
-CATEGORIES=		graphics
-MASTER_SITES= 		${MASTER_SITE_SOURCEFORGE:=mesa3d/}
-EXTRACT_SUFX=		.tar.bz2
-DISTFILES+=		${DISTNAME:S/Mesa/MesaLib/}${EXTRACT_SUFX}
-DISTFILES+=		${DISTNAME:S/Mesa/MesaDemos/}${EXTRACT_SUFX}
+# $NetBSD: Makefile,v 1.12 2002/08/25 18:39:08 jlam Exp $
 
+PKGNAME=		${DISTNAME:S/MesaLib/glut/}
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=		${DISTNAME:S/MesaLib/MesaDemos/}${EXTRACT_SUFX}
+WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
 MAINTAINER=		rh@netbsd.org
-HOMEPAGE=		http://www.mesa3d.org/
 COMMENT=		GLUT Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=		Mesa-glx-[0-9]*
 CONFLICTS+=		Mesa<3.2.1
 
-USE_BUILDLINK_ONLY=	yes
+.include "../Mesa/Makefile.common"
+
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=	--enable-static
 
 do-build:
-	cd ${WRKSRC}/src-glut && ${MAKE}
+	cd ${WRKSRC}/src-glut && ${SETENV} ${MAKE_ENV} \
+	${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
 
 do-install:
-	cd ${WRKSRC}/src-glut && ${MAKE} install
+	cd ${WRKSRC}/src-glut && ${SETENV} ${MAKE_ENV} \
+	${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/GL
-.for inc in glut.h glutf90.h
-	${INSTALL_DATA} ${WRKSRC}/include/GL/${inc} ${PREFIX}/include/GL
-.endfor
+	cd ${WRKSRC}/include/GL; for hdr in				\
+		glut.h glutf90.h;					\
+	do								\
+		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
+	done
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index 7082ee76ac8..2ffe804d4fd 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/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:08 jlam Exp $
 include/GL/glut.h
 include/GL/glutf90.h
 lib/libglut.so
@@ -6,4 +6,4 @@ lib/libglut.so.3
 lib/libglut.so.3.7
 lib/libglut.a
 lib/libglut.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/glut/buildlink.mk b/graphics/glut/buildlink.mk
index 4eb328e3e91..4adc17f6596 100644
--- a/graphics/glut/buildlink.mk
+++ b/graphics/glut/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:08 jlam Exp $
 
 .if !defined(GLUT_BUILDLINK_MK)
 GLUT_BUILDLINK_MK=	# defined
diff --git a/graphics/glut/buildlink2.mk b/graphics/glut/buildlink2.mk
new file mode 100644
index 00000000000..6c63333988b
--- /dev/null
+++ b/graphics/glut/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:08 jlam Exp $
+
+.if !defined(GLUT_BUILDLINK2_MK)
+GLUT_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		glut
+BUILDLINK_DEPENDS.glut?=	glut>=3.4.2
+BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.glut=glut
+BUILDLINK_PREFIX.glut_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.glut=	include/GL/glut.h
+BUILDLINK_FILES.glut+=	include/GL/glutf90.h
+BUILDLINK_FILES.glut+=	lib/libglut.*
+
+BUILDLINK_TARGETS+=	glut-buildlink
+
+glut-buildlink: _BUILDLINK_USE
+
+.endif	# GLUT_BUILDLINK2_MK