bl3ify

3 files changed, 37 insertions, 7 deletions

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"