bl3ify.

8 files changed, 102 insertions, 19 deletions

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 42d2b0f9938..156b4dd47cc 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 00:15:53 minskim Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
 COMMENT=	Perl bindings for Subversion
@@ -23,8 +23,8 @@ post-install:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${PERL_DIR} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install
 
-.include "../../devel/subversion/buildlink2.mk"
-.include "../../devel/swig-build/buildlink2.mk"
-.include "../../devel/swig-perl/buildlink2.mk"
+.include "../../devel/subversion/buildlink3.mk"
+.include "../../devel/swig-build/buildlink3.mk"
+.include "../../devel/swig-perl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index e66070b341e..3ea728b13cd 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/08 00:09:46 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/08 00:15:53 minskim Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
 COMMENT=	Python bindings and tools for Subversion
@@ -39,9 +39,9 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/cvs2svn/rcsparse/*.py \
 		${LOCALBASE}/${PYSITELIB}/rcsparse
 
-.include "../../devel/subversion/buildlink2.mk"
-.include "../../devel/swig-build/buildlink2.mk"
-.include "../../devel/swig-python/buildlink2.mk"
+.include "../../devel/subversion/buildlink3.mk"
+.include "../../devel/swig-build/buildlink3.mk"
+.include "../../devel/swig-python/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index b19e5af3d66..8dd81d5314f 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/07 01:21:03 epg Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/08 00:15:53 minskim Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -35,10 +35,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \
 		${SVNEXAMPLES}/hook-scripts
 
-BUILDLINK_DEPENDS.apr?=		apr>=0.9.5
-BUILDLINK_DEPENDS.neon?=	neon>=0.24.1
+BUILDLINK_DEPENDS.apr+=		apr>=0.9.5
+BUILDLINK_DEPENDS.neon+=	neon>=0.24.1
 
-.include "../../databases/db4/buildlink2.mk"
-.include "../../devel/apr/buildlink2.mk"
-.include "../../www/neon/buildlink2.mk"
+.include "../../databases/db4/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../www/neon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 4be0279d6d1..ba2db1dd802 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/02/14 17:21:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/03/08 00:15:53 minskim Exp $
 
 DISTNAME=		subversion-${SVNVER}
 CATEGORIES=		devel
@@ -17,7 +17,7 @@ COMMON_FILESDIR=	${.CURDIR}/../../devel/subversion/files
 PATCHDIR=		${.CURDIR}/../../devel/subversion/patches
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk
new file mode 100644
index 00000000000..90ad399a38c
--- /dev/null
+++ b/devel/subversion/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	subversion-base
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsubversion-base}
+BUILDLINK_PACKAGES+=	subversion-base
+
+.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.subversion-base+=	subversion-base>=${SVNVER}
+BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
+
+BUILDLINK_FILES.subversion-base+=	bin/svn-config
+
+.include "../../databases/db4/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
+.include "../../www/neon/buildlink3.mk"
+
+.include "../../devel/subversion/Makefile.version"
+
+.endif	# SUBVERSION_BASE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/swig-perl/buildlink3.mk b/devel/swig-perl/buildlink3.mk
new file mode 100644
index 00000000000..30fc93f0a3f
--- /dev/null
+++ b/devel/swig-perl/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SWIG_PERL_BUILDLINK3_MK:=	${SWIG_PERL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	swig-perl
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nswig-perl}
+BUILDLINK_PACKAGES+=	swig-perl
+
+.if !empty(SWIG_PERL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.swig-perl+=	swig-perl>=${SWIG_VERSION}
+BUILDLINK_PKGSRCDIR.swig-perl?=	../../devel/swig-perl
+
+.include "../../lang/perl5/buildlink3.mk"
+
+.include "../../devel/swig-build/Makefile.version"
+
+.endif	# SWIG_PERL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 458a04ec979..49271d5af52 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/06 03:01:58 epg Exp $
+# $NetBSD: Makefile,v 1.12 2004/03/08 00:15:53 minskim Exp $
 
 PKGNAME=	ap2-subversion-${SVNVER}
 COMMENT=	WebDAV server (Apache module) for Subversion
@@ -15,6 +15,6 @@ INSTALL_TARGET=		install-mods-shared
 
 BUILDLINK_DEPENDS.apache?=	apache>=2.0.48
 
-.include "../../devel/subversion/buildlink2.mk"
-.include "../../www/apache2/buildlink2.mk"
+.include "../../devel/subversion/buildlink3.mk"
+.include "../../www/apache2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
new file mode 100644
index 00000000000..2e8cc2831aa
--- /dev/null
+++ b/www/apache2/buildlink3.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 00:15:53 minskim Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	apache
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Napache}
+BUILDLINK_PACKAGES+=	apache
+
+.if !empty(APACHE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.apache+=	apache>=2.0.48nb3
+BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
+BUILDLINK_DEPMETHOD.apache?=	build
+
+USE_PERL5?=			build	# for "apxs"
+
+.if defined(APACHE_MODULE)
+BUILDLINK_DEPMETHOD.apache+=	full
+.endif
+
+.include "../../devel/apr/buildlink3.mk"
+
+APXS?=			${BUILDLINK_PREFIX.apache}/sbin/apxs
+.if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=	--with-apxs2="${APXS}"
+.endif
+
+.endif	# APACHE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}