Convert to buildlink3.

18 files changed, 136 insertions, 272 deletions

diff --git a/devel/SDL/buildlink2.mk b/devel/SDL/buildlink2.mk
deleted file mode 100644
index 23f8115ad52..00000000000
--- a/devel/SDL/buildlink2.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/03/23 04:37:38 snj Exp $
-
-.if !defined(SDL_BUILDLINK2_MK)
-SDL_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		SDL
-BUILDLINK_DEPENDS.SDL?=		SDL>=1.2.5nb5
-BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.SDL=SDL
-BUILDLINK_PREFIX.SDL_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.SDL=	include/SDL/*
-BUILDLINK_FILES.SDL+=	lib/libSDL.*
-BUILDLINK_FILES.SDL+=	lib/libSDLmain.*
-
-USE_X11=		YES
-
-.include "../../mk/bsd.prefs.mk"
-
-PTHREAD_OPTS+=		require
-
-.include "../../graphics/Mesa/buildlink2.mk"
-.include "../../graphics/aalib-x11/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-
-BUILDLINK_TARGETS+=		SDL-buildlink
-
-SDL-buildlink: _BUILDLINK_USE
-
-.endif	# SDL_BUILDLINK2_MK
diff --git a/graphics/3DKit/Makefile b/graphics/3DKit/Makefile
index 7aef5db3190..7ef601f64ff 100644
--- a/graphics/3DKit/Makefile
+++ b/graphics/3DKit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/05 03:36:22 snj Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
@@ -17,8 +17,8 @@ do-install:
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}	\
 		${PREFIX}/share/doc/3DKit
 
-.include "../../graphics/GlutKit/buildlink2.mk"
-.include "../../graphics/GLXKit/buildlink2.mk"
-.include "../../graphics/SDLKit/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/GlutKit/buildlink3.mk"
+.include "../../graphics/GLXKit/buildlink3.mk"
+.include "../../graphics/SDLKit/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/3DKit/Makefile.common b/graphics/3DKit/Makefile.common
index de9d88ad443..5a4c26d6882 100644
--- a/graphics/3DKit/Makefile.common
+++ b/graphics/3DKit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/01/24 15:46:42 grant Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/05/05 03:36:22 snj Exp $
 #
 
 DISTNAME=	3DKit-0.3.1r2
@@ -14,7 +14,7 @@ DISTINFO_FILE?= ${.CURDIR}/../../graphics/3DKit/distinfo
 DESCR_SRC?=	${.CURDIR}/../../graphics/3DKit/DESCR
 
 NO_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_X11=	YES
 MAKEFILE=	GNUmakefile
diff --git a/graphics/GLXKit/Makefile b/graphics/GLXKit/Makefile
index aa1622c75a6..67d7b793feb 100644
--- a/graphics/GLXKit/Makefile
+++ b/graphics/GLXKit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/05 03:36:22 snj Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
@@ -11,6 +11,6 @@ COMMENT=	3DKit GLX backend
 DISTINFO_FILE=	${.CURDIR}/distinfo
 WRKSRC=		${WRKDIR}/${DISTNAME}/GLXKit
 
-.include "../../graphics/RenderKit/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/RenderKit/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/GLXKit/buildlink2.mk b/graphics/GLXKit/buildlink2.mk
deleted file mode 100644
index 98b722b40e9..00000000000
--- a/graphics/GLXKit/buildlink2.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GLXKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GLXKIT_BUILDLINK2_MK)
-GLXKIT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			GLXKit
-BUILDLINK_DEPENDS.GLXKit?=		GLXKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GLXKit?=		GLXKit>=0.3.1r2nb5
-BUILDLINK_PKGSRCDIR.GLXKit?=		../../graphics/GLXKit
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.GLXKit=GLXKit
-BUILDLINK_PREFIX.GLXKit_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.GLXKit+=	share/GNUstep/Local/Headers/GLXKit/G3DGLXCamera.h
-BUILDLINK_FILES.GLXKit+=	share/GNUstep/Local/Headers/GLXKit/G3DGLXKit.h
-BUILDLINK_FILES.GLXKit+=	share/GNUstep/Local/Headers/GLXKit/G3DXEventHandler.h
-BUILDLINK_FILES.GLXKit+=	share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGLXKit.*
-
-.include "../../graphics/RenderKit/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	GLXKit-buildlink
-
-GLXKit-buildlink: _BUILDLINK_USE
-
-.endif	# GLXKIT_BUILDLINK2_MK
diff --git a/graphics/GLXKit/buildlink3.mk b/graphics/GLXKit/buildlink3.mk
new file mode 100644
index 00000000000..f231ab8882d
--- /dev/null
+++ b/graphics/GLXKit/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:23 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GLXKIT_BUILDLINK3_MK:=	${GLXKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GLXKit
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGLXKit}
+BUILDLINK_PACKAGES+=	GLXKit
+
+.if !empty(GLXKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GLXKit+=	GLXKit>=0.3.1r2nb3
+BUILDLINK_RECOMMENDED.GLXKit?=	GLXKit>=0.3.1r2nb5
+BUILDLINK_PKGSRCDIR.GLXKit?=	../../graphics/GLXKit
+.endif	# GLXKIT_BUILDLINK3_MK
+
+.include "../../graphics/RenderKit/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/GeometryKit/Makefile b/graphics/GeometryKit/Makefile
index 6e5b3b99f70..76d2af91ec2 100644
--- a/graphics/GeometryKit/Makefile
+++ b/graphics/GeometryKit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/05 03:36:23 snj Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
@@ -10,6 +10,6 @@ COMMENT=	Objective-C class library for calculating 3D geometry
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/3DKit/GeometryKit
 
-.include "../../x11/gnustep-back/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../x11/gnustep-back/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/GeometryKit/buildlink2.mk b/graphics/GeometryKit/buildlink2.mk
deleted file mode 100644
index d5f5668df85..00000000000
--- a/graphics/GeometryKit/buildlink2.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GeometryKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GEOMETRYKIT_BUILDLINK2_MK)
-GEOMETRYKIT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			GeometryKit
-BUILDLINK_DEPENDS.GeometryKit?=		GeometryKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GeometryKit?=		GeometryKit>=0.3.1r2nb5
-BUILDLINK_PKGSRCDIR.GeometryKit?=		../../graphics/GeometryKit
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.GeometryKit=GeometryKit
-BUILDLINK_PREFIX.GeometryKit_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DBezier.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DBox.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DDefs.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DFunctions.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DIntersecting.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DLine.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DMatrix.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DMatrix3d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DMatrix3f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DMatrix4d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DMatrix4f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DMatrixFunc.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DPlane.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DQuatFunc.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DQuaternion.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DSphere.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTrigonometry.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTuple2d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTuple2f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTuple3d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTuple3f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTuple4d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DTuple4f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector2d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector2f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector3d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector3f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector4d.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVector4f.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/G3DVectorFunc.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Headers/GeometryKit/GeometryKit.h
-BUILDLINK_FILES.GeometryKit+=	share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGeometryKit.*
-
-.include "../../x11/gnustep-back/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	GeometryKit-buildlink
-
-GeometryKit-buildlink: _BUILDLINK_USE
-
-.endif	# GEOMETRYKIT_BUILDLINK2_MK
diff --git a/graphics/GeometryKit/buildlink3.mk b/graphics/GeometryKit/buildlink3.mk
new file mode 100644
index 00000000000..1d22f3ab3c9
--- /dev/null
+++ b/graphics/GeometryKit/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:24 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GEOMETRYKIT_BUILDLINK3_MK:=	${GEOMETRYKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GeometryKit
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGeometryKit}
+BUILDLINK_PACKAGES+=	GeometryKit
+
+.if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GeometryKit+=	GeometryKit>=0.3.1r2nb3
+BUILDLINK_RECOMMENDED.GeometryKit?=	GeometryKit>=0.3.1r2nb5
+BUILDLINK_PKGSRCDIR.GeometryKit?=	../../graphics/GeometryKit
+.endif	# GEOMETRYKIT_BUILDLINK3_MK
+
+.include "../../x11/gnustep-back/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/GlutKit/Makefile b/graphics/GlutKit/Makefile
index 873b5598d5f..64d2fc0a165 100644
--- a/graphics/GlutKit/Makefile
+++ b/graphics/GlutKit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/05 03:36:24 snj Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
@@ -12,8 +12,8 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/GlutKit
 
-.include "../../graphics/RenderKit/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/RenderKit/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/GlutKit/buildlink2.mk b/graphics/GlutKit/buildlink2.mk
deleted file mode 100644
index bc413a2c25d..00000000000
--- a/graphics/GlutKit/buildlink2.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GlutKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GLUTKIT_BUILDLINK2_MK)
-GLUTKIT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			GlutKit
-BUILDLINK_DEPENDS.GlutKit?=		GlutKit>=0.3.1r2nb4
-BUILDLINK_RECOMMENDED.GlutKit?=		GlutKit>=0.3.1r2nb6
-BUILDLINK_PKGSRCDIR.GlutKit?=		../../graphics/GlutKit
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.GlutKit=GlutKit
-BUILDLINK_PREFIX.GlutKit_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.GlutKit+=	share/GNUstep/Local/Headers/GlutKit/G3DGlutCamera.h
-BUILDLINK_FILES.GlutKit+=	share/GNUstep/Local/Headers/GlutKit/G3DGlutKit.h
-BUILDLINK_FILES.GlutKit+=	share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGlutKit.*
-
-.include "../../graphics/RenderKit/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	GlutKit-buildlink
-
-GlutKit-buildlink: _BUILDLINK_USE
-
-.endif	# GLUTKIT_BUILDLINK2_MK
diff --git a/graphics/GlutKit/buildlink3.mk b/graphics/GlutKit/buildlink3.mk
new file mode 100644
index 00000000000..cc81c02da63
--- /dev/null
+++ b/graphics/GlutKit/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:25 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GLUTKIT_BUILDLINK3_MK:=	${GLUTKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GlutKit
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGlutKit}
+BUILDLINK_PACKAGES+=	GlutKit
+
+.if !empty(GLUTKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GlutKit+=	GlutKit>=0.3.1r2nb4
+BUILDLINK_RECOMMENDED.GlutKit?=	GlutKit>=0.3.1r2nb6
+BUILDLINK_PKGSRCDIR.GlutKit?=	../../graphics/GlutKit
+.endif	# GLUTKIT_BUILDLINK3_MK
+
+.include "../../graphics/RenderKit/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/RenderKit/Makefile b/graphics/RenderKit/Makefile
index 8cd8823c8b4..df4cdb66b9d 100644
--- a/graphics/RenderKit/Makefile
+++ b/graphics/RenderKit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/05 03:36:25 snj Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
@@ -12,7 +12,7 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/3DKit/RenderKit
 
-.include "../../graphics/GeometryKit/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/GeometryKit/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/RenderKit/buildlink2.mk b/graphics/RenderKit/buildlink2.mk
deleted file mode 100644
index 273f6482aee..00000000000
--- a/graphics/RenderKit/buildlink2.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use RenderKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(RENDERKIT_BUILDLINK2_MK)
-RENDERKIT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			RenderKit
-BUILDLINK_DEPENDS.RenderKit?=		RenderKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.RenderKit?=		RenderKit>=0.3.1r2nb5
-BUILDLINK_PKGSRCDIR.RenderKit?=		../../graphics/RenderKit
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.RenderKit=RenderKit
-BUILDLINK_PREFIX.RenderKit_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DArchiver.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DArchivingInfo.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DAttributeNode.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DBVol.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DBillboard.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DCamera.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DColour.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DDefines.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DFileHandler.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DFog.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DFrustum.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DFunctions.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DGeometryBackend.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DGeometryExtensions.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DGraphNode.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DGroup.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DIVtxArray.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DLODGroup.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DLeaf.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DLight.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DMaterial.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DNodeEnumerator.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DNodeList.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DOverlay.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DRenderEngine.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DRotator.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DSceneCoding.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DShape+Surface.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DShape.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DState.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DSurface.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DSwitchGroup.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DTexture.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DTimedSwitchGroup.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DTransform.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DTypes.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DUnarchiver.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DVtxArray.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/G3DWorld.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/NSObject+G3DExtensions.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Headers/RenderKit/RenderKit.h
-BUILDLINK_FILES.RenderKit+=	share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libRenderKit.*
-
-.include "../../graphics/GeometryKit/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	RenderKit-buildlink
-
-RenderKit-buildlink: _BUILDLINK_USE
-
-.endif	# RENDERKIT_BUILDLINK2_MK
diff --git a/graphics/RenderKit/buildlink3.mk b/graphics/RenderKit/buildlink3.mk
new file mode 100644
index 00000000000..de55765ecb4
--- /dev/null
+++ b/graphics/RenderKit/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:25 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+RENDERKIT_BUILDLINK3_MK:=	${RENDERKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	RenderKit
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NRenderKit}
+BUILDLINK_PACKAGES+=	RenderKit
+
+.if !empty(RENDERKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.RenderKit+=	RenderKit>=0.3.1r2nb3
+BUILDLINK_RECOMMENDED.RenderKit?=	RenderKit>=0.3.1r2nb5
+BUILDLINK_PKGSRCDIR.RenderKit?=	../../graphics/RenderKit
+.endif	# RENDERKIT_BUILDLINK3_MK
+
+.include "../../graphics/GeometryKit/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/SDLKit/Makefile b/graphics/SDLKit/Makefile
index fc84bb0db34..ee88a326713 100644
--- a/graphics/SDLKit/Makefile
+++ b/graphics/SDLKit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/05 03:36:25 snj Exp $
 #
 
 .include "../../graphics/3DKit/Makefile.common"
@@ -12,8 +12,8 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/SDLKit
 
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/RenderKit/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/RenderKit/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/SDLKit/buildlink2.mk b/graphics/SDLKit/buildlink2.mk
deleted file mode 100644
index 8c12752aa2b..00000000000
--- a/graphics/SDLKit/buildlink2.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use SDLKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(SDLKIT_BUILDLINK2_MK)
-SDLKIT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			SDLKit
-BUILDLINK_DEPENDS.SDLKit?=		SDLKit>=0.3.1r2nb5
-BUILDLINK_RECOMMENDED.SDLKit?=		SDLKit>=0.3.1r2nb7
-BUILDLINK_PKGSRCDIR.SDLKit?=		../../graphics/SDLKit
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.SDLKit=SDLKit
-BUILDLINK_PREFIX.SDLKit_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.SDLKit+=	share/GNUstep/Local/Headers/SDLKit/G3DSDLCamera.h
-BUILDLINK_FILES.SDLKit+=	share/GNUstep/Local/Headers/SDLKit/G3DSDLEventHandler.h
-BUILDLINK_FILES.SDLKit+=	share/GNUstep/Local/Headers/SDLKit/G3DSDLKit.h
-BUILDLINK_FILES.SDLKit+=	share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libSDLKit.*
-
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/RenderKit/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	SDLKit-buildlink
-
-SDLKit-buildlink: _BUILDLINK_USE
-
-.endif	# SDLKIT_BUILDLINK2_MK
diff --git a/graphics/SDLKit/buildlink3.mk b/graphics/SDLKit/buildlink3.mk
new file mode 100644
index 00000000000..dcc0afc41fc
--- /dev/null
+++ b/graphics/SDLKit/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:25 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+SDLKIT_BUILDLINK3_MK:=	${SDLKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	SDLKit
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NSDLKit}
+BUILDLINK_PACKAGES+=	SDLKit
+
+.if !empty(SDLKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.SDLKit+=	SDLKit>=0.3.1r2nb5
+BUILDLINK_RECOMMENDED.SDLKit?=	SDLKit>=0.3.1r2nb7
+BUILDLINK_PKGSRCDIR.SDLKit?=	../../graphics/SDLKit
+.endif	# SDLKIT_BUILDLINK3_MK
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/RenderKit/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}