Convert to buildlink3.

3 files changed, 24 insertions, 61 deletions

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/+$//}