bl3ify

4 files changed, 21 insertions, 27 deletions

diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index a1ae76f0e5f..556ddae69d5 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/11/18 16:10:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/05 11:47:33 jlam Exp $
 
 PKGNAME=		MesaLib-${MESA_VERSION}
 PKGREVISION=		2
@@ -6,10 +6,12 @@ WRKSRC=			${WRKDIR}/${DISTNAME:S/Lib//}
 MAINTAINER=		rh@NetBSD.org
 COMMENT=		Graphics library similar to SGI's OpenGL
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 .include "../../graphics/Mesa/Makefile.common"
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
+USE_BUILDLINK3=		yes
+USE_X11=		yes
 USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-glut
@@ -34,7 +36,3 @@ post-install:
 	done
 
 .include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
-PREFIX=		${LOCALBASE}
-X11PREFIX=	${LOCALBASE}
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 1dc8a22e965..f9553b1967e 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/11/28 18:41:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/05 11:47:33 jlam Exp $
 
 PKGNAME=		${DISTNAME:C/MesaLib/glu/}
 PKGREVISION=		3
@@ -9,10 +9,12 @@ COMMENT=		GLU polygon tesselation facility for Mesa
 CONFLICTS+=		Mesa-glx-[0-9]*
 CONFLICTS+=		Mesa<3.2.1
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 .include "../../graphics/Mesa/Makefile.common"
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
+USE_BUILDLINK3=		yes
+USE_X11=		yes
 BUILD_DIRS=		${WRKSRC}/si-glu
 
 .include "../../mk/bsd.prefs.mk"
@@ -25,9 +27,5 @@ post-install:
 		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
 	done
 
-.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
-PREFIX=		${LOCALBASE}
-X11PREFIX=	${LOCALBASE}
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 6849717127e..407d185715d 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.9 2003/11/28 18:41:03 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/01/05 11:47:33 jlam Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
+lib/libGLU.a
+lib/libGLU.la
 lib/libGLU.so
 lib/libGLU.so.4
 lib/libGLU.so.4.502
-lib/libGLU.a
-lib/libGLU.la
 @unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 97c72f30e0c..648e7378da7 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/28 18:41:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/05 11:47:33 jlam Exp $
 
 PKGNAME=		${DISTNAME:S/MesaLib/glut/}
 PKGREVISION=		3
@@ -11,10 +11,12 @@ COMMENT=		GLUT Graphics library similar to SGI's OpenGL
 CONFLICTS+=		Mesa-glx-[0-9]*
 CONFLICTS+=		Mesa<3.2.1
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 .include "../../graphics/Mesa/Makefile.common"
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
+USE_BUILDLINK3=		yes
+USE_X11=		yes
 CONFIGURE_DIRS=		${WRKSRC}
 BUILD_DIRS=		${WRKSRC}/src-glut
 USE_LIBTOOL=		yes
@@ -28,10 +30,6 @@ post-install:
 		${INSTALL_DATA} $${hdr} ${PREFIX}/include/GL;		\
 	done
 
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# must be below bsd.pkg.mk to overwrite values
-PREFIX=		${LOCALBASE}
-X11PREFIX=	${LOCALBASE}