bl3ify

3 files changed, 39 insertions, 43 deletions

diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index 2b2f386dcf8..4fe23f006e1 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/27 07:56:33 xtraeme Exp $
 #
 
 DISTNAME=	DevIL-1.6.6
@@ -13,17 +13,17 @@ COMMENT=	Developer's Image Library
 
 WRKSRC=			${WRKDIR}/DevIL
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
 
 CONFIGURE_ARGS+=	--disable-lcms
 
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/mng/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/devIL/buildlink2.mk b/devel/devIL/buildlink2.mk
deleted file mode 100644
index 8e0d945c517..00000000000
--- a/devel/devIL/buildlink2.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/01/03 18:49:37 reed Exp $
-#
-# This Makefile fragment is included by packages that use DevIL.
-#
-# This file was created automatically using createbuildlink 2.7.
-#
-
-.if !defined(DEVIL_BUILDLINK2_MK)
-DEVIL_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			DevIL
-BUILDLINK_DEPENDS.DevIL?=		DevIL>=1.6.6nb1
-BUILDLINK_PKGSRCDIR.DevIL?=		../../devel/devIL
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.DevIL=DevIL
-BUILDLINK_PREFIX.DevIL_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.DevIL+=	include/IL/*.h
-BUILDLINK_FILES.DevIL+=	lib/libIL.*
-BUILDLINK_FILES.DevIL+=	lib/libILU.*
-BUILDLINK_FILES.DevIL+=	lib/libILUT.*
-
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/mng/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	DevIL-buildlink
-
-DevIL-buildlink: _BUILDLINK_USE
-
-.endif	# DEVIL_BUILDLINK2_MK
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
new file mode 100644
index 00000000000..d76e1ac3d4b
--- /dev/null
+++ b/devel/devIL/buildlink3.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/27 07:56:33 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use devIL.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	devIL
+.endif
+
+.if !empty(DEVIL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			devIL
+BUILDLINK_DEPENDS.devIL+=		devIL>=1.6.6nb1
+BUILDLINK_PKGSRCDIR.devIL?=		../../devel/devIL
+
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/mng/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+
+.endif # DEVIL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}