bl3ify

9 files changed, 63 insertions, 33 deletions

diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index 3f17ba865b6..8dbee37c59f 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/11 05:53:05 xtraeme Exp $
 #
 
 DISTNAME=		giblib-1.2.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		http://www.linuxbrit.co.uk/downloads/
 
@@ -12,9 +12,9 @@ COMMENT=		Programming utility library
 
 GNU_CONFIGURE=		YES
 USE_X11=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../graphics/imlib2/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 47af75885bc..3d12d03ceb7 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/11 05:53:05 xtraeme Exp $
 
 DISTNAME=		libast-0.5
 PKGREVISION=		5
@@ -10,7 +10,7 @@ HOMEPAGE=		http://freshmeat.net/projects/libast/?topic_id=809%2C861
 COMMENT=		The Library of Assorted Spiffy Things
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 TEST_TARGET=		test
@@ -26,6 +26,6 @@ BUILD_DEFS+=		USE_MMX
 LDFLAGS+=-lresolv
 .endif
 
-.include "../../devel/pcre/buildlink2.mk"
-.include "../../graphics/imlib2/buildlink2.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 723e8785e22..175b8a9e2a4 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/11 05:54:12 xtraeme Exp $
 #
 
 DISTNAME=	Image-Imlib2-0.12
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Module-Build-[0-9]*:../../devel/p5-Module-Build
 
 USE_PERL5=	run
 USE_X11=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 # If the X11 and Xext libraries are not weeded out,
 # they will be unresolved in the resulting .so
@@ -40,6 +40,6 @@ do-test:
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
 
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index fc01b42964a..d8ffa9a5e75 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/11 05:54:12 xtraeme Exp $
 #
 
 DISTNAME=	scrot-0.8
@@ -10,9 +10,9 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://linuxbrit.co.uk/scrot/
 COMMENT=	Commandline screen capture util like "import", but using imlib2
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
 
-.include "../../devel/giblib/buildlink2.mk"
+.include "../../devel/giblib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/3ddesktop/Makefile b/wm/3ddesktop/Makefile
index 19f36a7915d..20656d5c886 100644
--- a/wm/3ddesktop/Makefile
+++ b/wm/3ddesktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/11 05:55:08 xtraeme Exp $
 #
 
 DISTNAME=		3ddesktop-0.2.5
@@ -10,7 +10,7 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://desk3d.sourceforge.net/
 COMMENT=		3D Virtual Desktop Switcher
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
@@ -22,6 +22,6 @@ pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/3ddesktop.conf ${EGDIR}
 
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index dc210a2c403..7a1bb9a164a 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 05:55:08 xtraeme Exp $
 #
 
 DISTNAME=	waimea-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.waimea.org/
 COMMENT=	Fast and highly customizable virtual window manager
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	run
 USE_X11=	YES
@@ -37,9 +37,9 @@ REPLACE_PERL = \
 	data/scripts/procinfo.pl \
 	data/scripts/stylesdir.pl.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index e72ccde8173..7f00b1fa680 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/11 05:59:54 xtraeme Exp $
 #
 # NOTE:	Versions 1.27 and 1.28 cause apache to dump core,
 #	so this packages has been left at version 1.25
@@ -21,7 +21,7 @@ DEPENDS+=		${BUILDLINK_DEPENDS.apache}:../../www/apache
 DEPENDS+=		{libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 APACHE_MODULE=		YES
 LIBPERL5_REQD=		${_PERL5_REQD}
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
@@ -36,7 +36,7 @@ post-install:
 		${PREFIX}/share/httpd/htdocs/manual/mod
 
 .include "../../lang/perl5/module.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../www/apache/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
new file mode 100644
index 00000000000..b22548f6ade
--- /dev/null
+++ b/www/ap-perl/buildlink3.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:59:54 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use ap-perl.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ap-perl
+.endif
+
+.if !empty(AP_PERL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			ap-perl
+BUILDLINK_DEPENDS.ap-perl+=		ap-perl>=1.25nb1
+BUILDLINK_PKGSRCDIR.ap-perl?=		../../www/ap-perl
+
+BUILDLINK_FILES.ap-perl+=	lib/httpd/mod_perl.*
+BUILDLINK_FILES.ap-perl+=	\
+	${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/*
+BUILDLINK_FILES.ap-perl+=	\
+	${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/modules/perl/*
+
+.include "../../www/apache/buildlink3.mk"
+
+.endif # AP_PERL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 4d3ad58b063..ae7f1a2b184 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/08 21:49:57 kim Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 05:59:54 xtraeme Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.7
@@ -20,7 +20,7 @@ DEPENDS+=	p5-Image-Size-[0-9]*:../../graphics/p5-Image-Size
 DEPENDS+=	p5-CGI-FastTemplate-[0-9]*:../../www/p5-CGI-FastTemplate
 DEPENDS+=	p5-libapreq-[0-9]*:../../www/p5-libapreq
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Apache/Gallery/.packlist
@@ -92,8 +92,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${AG_EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/${AG}.conf ${AG_EGDIR}
 
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../www/ap-perl/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../www/ap-perl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 
 .include "../../mk/bsd.pkg.mk"