3 files changed, 28 insertions, 35 deletions
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/+$//}