Convert to buildlink3.

16 files changed, 69 insertions, 59 deletions

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 5ef1d252dfd..337698a7667 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/08 04:50:50 snj Exp $
 # FreeBSD Id: ports/devel/avr-binutils/Makefile,v 1.9 2003/03/07 06:00:08 ade Exp
 
 DISTNAME=		binutils-2.13.2.1
@@ -11,7 +11,7 @@ MAINTAINER=		karlj@mdstud.chalmers.se
 COMMENT=		GNU binutils for Atmel AVR 8-bit RISC microcontrollers
 
 USE_BZIP2=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index d0c6a2add0f..6f7fc3fe697 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/08 04:50:51 snj Exp $
 # FreeBSD Id: ports/devel/avr-gcc/Makefile,v 1.24 2003/05/11 19:32:20 joerg Exp
 
 DISTNAME=		gcc-3.3.2003.05.11
@@ -21,7 +21,7 @@ EXTRACT_ONLY=		gcc-core+g++-3.3.2003.05.11${EXTRACT_SUFX}
 # Unfortunately, only some mirrors have it as a .bz2 file, while
 # the original master site still uses .gz.
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PERL5_BUILD=	yes
 USE_BZIP2=		yes
 USE_GNU_TOOLS+=		make
diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile
index a7728f60f80..9b41cf12699 100644
--- a/cross/avr-gdb/Makefile
+++ b/cross/avr-gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/08 04:50:51 snj Exp $
 # FreeBSD Id: ports/devel/avr-gdb/Makefile,v 1.2 2003/03/07 06:00:08 ade Exp
 
 DISTNAME=	gdb-5.3
@@ -11,7 +11,7 @@ MAINTAINER=	karlj@mdstud.chalmers.se
 COMMENT=	GNU gdb for Atmel AVR 8-bit RISC microcontrollers
 
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=avr --program-prefix=avr
 
diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index ae8e031176d..b8e3ccf0eb6 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/08 04:50:51 snj Exp $
 
 DISTNAME=		binutils-2.12.1
 PKGNAME=		cross-h8300-hms-binutils-2.12.1
@@ -13,7 +13,7 @@ COMMENT=		h8300-hms cross utility
 H8300_PREFIX=		${PREFIX}/libexec/cross-h8300-hms
 
 WRKSRC=			${WRKDIR}/objdir
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_MAKEINFO=		yes
 HAS_CONFIGURE=		yes
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 120c383bfda..fd192f31cd3 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 07:54:07 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/08 04:50:51 snj Exp $
 
 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
@@ -20,7 +20,7 @@ DEPENDS+=	cross-h8300-hms-binutils-[0-9]*:../../cross/h8300-hms-binutils
 H8300_PREFIX=		${LOCALBASE}/libexec/cross-h8300-hms
 
 WRKSRC=			${WRKDIR}/objdir
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${H8300_PREFIX}
diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index 69010df78c2..fb9dae47e24 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/08 05:25:12 snj Exp $
 #
 
 .include "../../databases/libpqxx/Makefile.common"
@@ -9,7 +9,7 @@ COMMENT=		C++ interface to postgresql-lib
 NOT_FOR_PLATFORM=	NetBSD-*-pc532
 
 USE_LANGUAGES=		c c++
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	libpqxx.pc.in
@@ -22,5 +22,5 @@ CONFIGURE_ARGS+=	--with-postgres-include=${PG_PREFIX}/include/postgresql
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common
index ed1b3b974ac..1c2a6e81e11 100644
--- a/databases/odbc-postgresql/Makefile.common
+++ b/databases/odbc-postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/05/08 05:25:12 snj Exp $
 
 DISTNAME=		postgresql-${DIST_VERS}
 CATEGORIES=		databases
@@ -29,7 +29,7 @@ PATCHDIR?=		${.CURDIR}/../odbc-postgresql/patches
 DIST_VERS?=		7.2.3
 BASE_VERS?=		${DIST_VERS}
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		YES
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 7fa97c1fda4..f2bc0b03b81 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/09 12:28:14 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/08 05:25:12 snj Exp $
 #
 
 DISTNAME=		DBD-Google-0.11
@@ -9,13 +9,13 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=DBD/}
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Perl DBI/DBD driver for using Google as a datasource
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBD/Google/.packlist
 
 BUILDLINK_DEPENDS.p5-DBI?=	p5-DBI>=1.39
 
-.include "../../databases/p5-DBI/buildlink2.mk"
-.include "../../net/p5-Net-Google/buildlink2.mk"
+.include "../../databases/p5-DBI/buildlink3.mk"
+.include "../../net/p5-Net-Google/buildlink3.mk"
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile
index 9a139af7334..61e3ea448f3 100644
--- a/databases/p5-sybperl/Makefile
+++ b/databases/p5-sybperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/29 10:01:33 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/08 05:25:12 snj Exp $
 #
 
 DISTNAME=	sybperl-2.16
@@ -10,7 +10,7 @@ MAINTAINER=	grant@NetBSD.org
 HOMEPAGE=	http://www.mbay.net/~mpeppler/
 COMMENT=	Perl modules for using Sybase/MS-SQL databases
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Sybase/.packlist
 
 BUILD_DEFS+=		USE_SYBASE_OPENCLIENT
@@ -31,7 +31,7 @@ PERL5_LDFLAGS+=		-Wl,${RPATH_FLAG}${_SYBASE}/lib
 MAKE_ENV+=		SYBASE=${_SYBASE}
 
 .if !defined(USE_SYBASE_OPENCLIENT)
-.  include "../../databases/freetds/buildlink2.mk"
+.  include "../../databases/freetds/buildlink3.mk"
 .endif
 
 .include "../../lang/perl5/module.mk"
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index ae79d4f4379..3de54ddd6b7 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/16 17:21:34 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/08 05:25:12 snj Exp $
 #
 
 DISTNAME=	psycopg-1.1.11
@@ -18,13 +18,13 @@ CONFIGURE_ARGS+= \
 # XXX ${PYSITELIB}/... doesn't get transformed by buildlink2
 CONFIGURE_ARGS+= --with-mxdatetime-includes=${BUILDLINK_DIR}/include
 ALL_TARGET=	default
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 PYTHON_VERSIONS_ACCEPTED= 21pth 22pth
 PY_PATCHPLIST=	yes
 
-.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../time/py-mxDateTime/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../time/py-mxDateTime/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-psycopg/buildlink2.mk b/databases/py-psycopg/buildlink2.mk
deleted file mode 100644
index 70af7a5ca91..00000000000
--- a/databases/py-psycopg/buildlink2.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:33 jlam Exp $
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=		psycopg
-BUILDLINK_PKGBASE.psycopg?=	${PYPKGPREFIX}-psycopg
-BUILDLINK_DEPENDS.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb1
-BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb2
-BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
diff --git a/databases/py-psycopg/buildlink3.mk b/databases/py-psycopg/buildlink3.mk
new file mode 100644
index 00000000000..fd02722092d
--- /dev/null
+++ b/databases/py-psycopg/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 05:25:12 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_PSYCOPG_BUILDLINK3_MK:=	${PY_PSYCOPG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	psycopg
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npsycopg}
+BUILDLINK_PACKAGES+=	psycopg
+
+.if !empty(PY_PSYCOPG_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.psycopg+=	${PYPKGPREFIX}-psycopg>=1.0.14nb1
+BUILDLINK_RECOMMENDED.psycopg?=	${PYPKGPREFIX}-psycopg>=1.0.14nb2
+BUILDLINK_PKGSRCDIR.psycopg?=	../../databases/py-psycopg
+.endif	# PY_PSYCOPG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index a573d873a37..44772586865 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/09 11:31:55 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/08 05:25:12 snj Exp $
 
 DISTNAME=		Net-Google-0.61
 PKGNAME=		p5-${DISTNAME}
@@ -8,7 +8,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Net/}
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Perl module for accessing Google search engine
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/Google/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/net/p5-Net-Google/buildlink2.mk b/net/p5-Net-Google/buildlink2.mk
deleted file mode 100644
index 176af77cb07..00000000000
--- a/net/p5-Net-Google/buildlink2.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/04/09 11:31:55 grant Exp $
-#
-
-.if !defined(P5_NET_GOOGLE_BUILDLINK2_MK)
-P5_NET_GOOGLE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			p5-Net-Google
-BUILDLINK_DEPENDS.p5-Net-Google?=	p5-Net-Google>=0.61
-BUILDLINK_PKGSRCDIR.p5-Net-Google?=	../../net/p5-Net-Google
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.p5-Net-Google=p5-Net-Google
-BUILDLINK_PREFIX.p5-Net-Google_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_TARGETS+=	p5-Net-Google-buildlink
-
-p5-Net-Google-buildlink: _BUILDLINK_USE
-
-.endif	# P5_NET_GOOGLE_BUILDLINK2_MK
diff --git a/net/p5-Net-Google/buildlink3.mk b/net/p5-Net-Google/buildlink3.mk
new file mode 100644
index 00000000000..e40dc36d620
--- /dev/null
+++ b/net/p5-Net-Google/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 05:25:12 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+P5_NET_GOOGLE_BUILDLINK3_MK:=	${P5_NET_GOOGLE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	p5-Net-Google
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Np5-Net-Google}
+BUILDLINK_PACKAGES+=	p5-Net-Google
+
+.if !empty(P5_NET_GOOGLE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.p5-Net-Google+=	p5-Net-Google>=0.61
+BUILDLINK_PKGSRCDIR.p5-Net-Google?=	../../net/p5-Net-Google
+.endif	# P5_NET_GOOGLE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index fe6a5282699..5ce60bcf1ed 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/04/16 17:21:34 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/08 05:25:12 snj Exp $
 #
 
 DISTNAME=	psycopg-1.1.11
@@ -11,8 +11,8 @@ HOMEPAGE=	http://initd.org/software/psycopg
 COMMENT=	PostgreSQL database adapter for Zope
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../www/zope25/product.mk"
-.include "../../databases/py-psycopg/buildlink2.mk"
+.include "../../databases/py-psycopg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"