bl3ify

3 files changed, 35 insertions, 40 deletions

diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 17fc305ae25..6dc54cde965 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/27 09:02:51 xtraeme Exp $
 #
 
 DISTNAME=	ogre-v0-12-1
 PKGNAME=	ogre-0.12.1
-PKGREVISION=			1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogre/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +14,7 @@ COMMENT=	Object-Oriented Graphics Rendering Engine
 
 WRKSRC=			${WRKDIR}/ogrenew
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_X11=		yes
@@ -23,9 +23,9 @@ CONFIGURE_ARGS+=	--with-platform=SDL
 
 PKGCONFIG_OVERRIDE+=    OGRE.pc.in
 
-.include "../../devel/devIL/buildlink2.mk"
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../devel/devIL/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ogre/buildlink2.mk b/devel/ogre/buildlink2.mk
deleted file mode 100644
index b0ec8ea6e66..00000000000
--- a/devel/ogre/buildlink2.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/01/03 18:49:39 reed Exp $
-#
-# This Makefile fragment is included by packages that use ogre.
-#
-# This file was created automatically using createbuildlink 2.7.
-#
-
-.if !defined(OGRE_BUILDLINK2_MK)
-OGRE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			ogre
-BUILDLINK_DEPENDS.ogre?=		ogre>=0.12.1nb1
-BUILDLINK_PKGSRCDIR.ogre?=		../../devel/ogre
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.ogre=ogre
-BUILDLINK_PREFIX.ogre_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ogre+=	include/OGRE/*.h
-BUILDLINK_FILES.ogre+=	lib/OGRE/*
-BUILDLINK_FILES.ogre+=	lib/libOgreMain.*
-BUILDLINK_FILES.ogre+=	lib/libOgrePlatform.*
-BUILDLINK_FILES.ogre+=	lib/pkgconfig/OGRE.pc
-
-.include "../../devel/devIL/buildlink2.mk"
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	ogre-buildlink
-
-ogre-buildlink: _BUILDLINK_USE
-
-.endif	# OGRE_BUILDLINK2_MK
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
new file mode 100644
index 00000000000..2e1e08908ba
--- /dev/null
+++ b/devel/ogre/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 09:02:51 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use ogre.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+OGRE_BUILDLINK3_MK:=	${OGRE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ogre
+.endif
+
+.if !empty(OGRE_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			ogre
+BUILDLINK_DEPENDS.ogre+=		ogre>=0.12.1nb1
+BUILDLINK_PKGSRCDIR.ogre?=		../../devel/ogre
+
+.include "../../devel/devIL/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+
+.endif # OGRE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}