Convert to buildlink3.

15 files changed, 54 insertions, 64 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 9312607b89e..df1250742bc 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/02/14 18:26:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.44 2004/04/27 04:59:42 snj Exp $
 #
 
 DISTNAME=		GConf-1.0.9
@@ -14,7 +14,7 @@ COMMENT=		Configuration database system used by GNOME
 BUILD_USES_MSGFMT=	yes
 #DEPENDS+=		guile>=1.3.4:../../lang/guile
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
@@ -37,9 +37,9 @@ post-install:
 	    ${CP} -p ${PREFIX}/etc/gconf/1/path.example \
 	    ${PREFIX}/etc/gconf/1/path
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../databases/db3/buildlink2.mk"
-.include "../../devel/oaf/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../databases/db3/buildlink3.mk"
+.include "../../devel/oaf/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index d314d773cc4..1d084d2667a 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=		gcvs-1.0a7
 PKGREVISION=		2
@@ -11,7 +11,7 @@ COMMENT=		GTK interface for CVS
 
 CONFLICTS=		cvs-[0-9]*
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
@@ -21,7 +21,7 @@ INFO_FILES=		cvs.info cvsclient.info
 CONFIGURE_ARGS+=	--with-tclinclude="${BUILDLINK_PREFIX.tcl}/include" \
 			--with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
 
-.include "../../lang/tcl83/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../lang/tcl83/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index bf0312e786f..320f7483854 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/08/09 10:44:43 seb Exp $
+# $NetBSD: Makefile,v 1.35 2004/04/27 04:59:42 snj Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -15,7 +15,7 @@ CONFLICTS=	sh-utils>=2.0nb2
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 
 INFO_FILES=	id-utils.info
@@ -53,5 +53,5 @@ MAKE_ENV+=		BSD_SETENV=${SETENV}
 PLIST_SUBST+=		LISPDIR=${LISPDIR}
 PLIST_SUBST+=		CLISPDIR=${CLISPDIR}
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index 4eca6ed2b34..b7ee99e7a8f 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/04 02:52:33 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=	ldapsdk_12311998
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -15,7 +15,7 @@ CONFLICTS+=	openldap-[0-9]*
 WRKSRC=		${WRKDIR}/mozilla
 USE_GNU_TOOLS+=	make
 USE_PERL5=	build
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 PKG_SYSCONFSUBDIR=	ldapsdk
 EGDIR=			${PREFIX}/share/examples/ldapsdk
@@ -34,5 +34,5 @@ do-build:
 do-install:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-install
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ldapsdk/buildlink2.mk b/devel/ldapsdk/buildlink2.mk
deleted file mode 100644
index 336aed65d1f..00000000000
--- a/devel/ldapsdk/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/20 21:48:17 seb Exp $
-#
-# This Makefile fragment is included by packages that use ldapsdk.
-#
-# This file was created automatically using createbuildlink 2.2.
-#
-
-.if !defined(LDAPSDK_BUILDLINK2_MK)
-LDAPSDK_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			ldapsdk
-BUILDLINK_DEPENDS.ldapsdk?=		ldapsdk>=12311998
-BUILDLINK_PKGSRCDIR.ldapsdk?=		../../devel/ldapsdk
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.ldapsdk=ldapsdk
-BUILDLINK_PREFIX.ldapsdk_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ldapsdk+=	include/disptmpl.h
-BUILDLINK_FILES.ldapsdk+=	include/lber.h
-BUILDLINK_FILES.ldapsdk+=	include/ldap.h
-BUILDLINK_FILES.ldapsdk+=	include/srchpref.h
-BUILDLINK_FILES.ldapsdk+=	lib/liblber.*
-BUILDLINK_FILES.ldapsdk+=	lib/libldap.*
-
-BUILDLINK_TARGETS+=	ldapsdk-buildlink
-
-ldapsdk-buildlink: _BUILDLINK_USE
-
-.endif	# LDAPSDK_BUILDLINK2_MK
diff --git a/devel/ldapsdk/buildlink3.mk b/devel/ldapsdk/buildlink3.mk
new file mode 100644
index 00000000000..56cb0bdaa74
--- /dev/null
+++ b/devel/ldapsdk/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:59:42 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LDAPSDK_BUILDLINK3_MK:=	${LDAPSDK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ldapsdk
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nldapsdk}
+BUILDLINK_PACKAGES+=	ldapsdk
+
+.if !empty(LDAPSDK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ldapsdk+=	ldapsdk>=12311998
+BUILDLINK_PKGSRCDIR.ldapsdk?=	../../devel/ldapsdk
+.endif	# LDAPSDK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index adcc7ffed5c..0314905c2dd 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/10 19:06:36 kristerw Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=	Exception-Class-1.14
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Class-Data-Inheritable>=0.02:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=	p5-Devel-StackTrace>=1.03:../../devel/p5-Devel-StackTrace
 
 USE_BUILDLINK_ONLY=	YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Exception/Class/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-LDAP/Makefile b/devel/p5-LDAP/Makefile
index 392859e8ce1..0c00e8bb436 100644
--- a/devel/p5-LDAP/Makefile
+++ b/devel/p5-LDAP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/27 04:59:42 snj Exp $
 #
 
 DISTNAME=	perldap-1.2.2
@@ -13,13 +13,13 @@ HOMEPAGE=	http://www.mozilla.org/directory/perldap.html
 COMMENT=	Perl5 module to build LDAP clients with perl
 
 WRKSRC=		${WRKDIR}/perldap
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mozilla/LDAP/API/.packlist
 
 MAKE_ENV+=	LDAPSDKDIR=${BUILDLINK_PREFIX.ldapsdk}
 MAKE_ENV+=	LDAPSDKSSL="no"
 MAKE_ENV+=	LDAPV3ON="yes"
 
-.include "../../devel/ldapsdk/buildlink2.mk"
+.include "../../devel/ldapsdk/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index 9925b2195cd..6e395ca1768 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:32:41 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=	Log-Dispatch-Config-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	p5-IO-stringy>=2.108:../../devel/p5-IO-stringy
 DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
 DEPENDS+=	p5-Log-Dispatch>=1.79:../../devel/p5-Log-Dispatch
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Log/Dispatch/Config/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 5362228a75b..c4afa48dec9 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/29 13:19:34 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=	Log-Dispatch-FileRotate-1.11
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ DEPENDS+=	p5-Date-Manip>=5.0:../../devel/p5-Date-Manip
 DEPENDS+=	p5-Log-Dispatch>=2.08:../../devel/p5-Log-Dispatch
 DEPENDS+=	p5-Params-Validate>=0.15:../../devel/p5-Params-Validate
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Log/Dispatch/FileRotate/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index b2908a4d739..382a177b931 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/29 12:20:48 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=	Log-Dispatch-2.08
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=	p5-Module-Build>=0.20:../../devel/p5-Module-Build
 DEPENDS+=	p5-Params-Validate>=0.15:../../devel/p5-Params-Validate
 DEPENDS+=	p5-Test-Simple>=0.17:../../devel/p5-Test-Simple
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-Module-Dependency/Makefile b/devel/p5-Module-Dependency/Makefile
index 2153a7c12b5..4a12a28c2ac 100644
--- a/devel/p5-Module-Dependency/Makefile
+++ b/devel/p5-Module-Dependency/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:32:42 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 04:59:42 snj Exp $
 #
 
 DISTNAME=	Module-Dependency-1.8
@@ -13,7 +13,7 @@ COMMENT=	Build perl program/module dependency graph
 DEPENDS+=	p5-Storable>=1.0.14:../../devel/p5-Storable
 DEPENDS+=	p5-GD>=1.32nb1:../../graphics/p5-GD
 
-USE_BUILDLINK2=		 YES
+USE_BUILDLINK3=		 YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Module/Dependency/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile
index 2411f11f96f..d9c1053d3f2 100644
--- a/devel/py-checker/Makefile
+++ b/devel/py-checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/02 23:37:26 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 04:59:42 snj Exp $
 
 DISTNAME=	pychecker-0.8.13
 PKGNAME=	${PYPKGPREFIX}-checker-0.8.13
@@ -9,7 +9,7 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://pychecker.sourceforge.net/
 COMMENT=	Python code checker
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 PYDISTUTILSPKG=	# defined
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 06b58afc8ac..1b204105bf3 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/05 03:42:32 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 04:59:42 snj Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-readline-0
@@ -10,7 +10,7 @@ COMMENT=	Line editing support for Python
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/readline.c
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_GNU_READLINE=	# defined
 
 PYDISTUTILSPKG=	yes
@@ -26,7 +26,7 @@ do-patch:
 	${PATCH} --batch <$$f || true; \
 	done)
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index e26936622a2..21068411d87 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/25 16:04:09 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/27 04:59:43 snj Exp $
 #
 
 DISTNAME=		ZConfig-1.0
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.zope.org/Members/fdrake/zconfig/
 COMMENT=		Configuration library
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 PYDISTUTILSPKG=		yes
 
 .include "../../lang/python/extension.mk"