Convert to buildlink3.

9 files changed, 47 insertions, 29 deletions

diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 28952fe080e..b709ed370ac 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/26 02:27:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/25 08:07:21 snj Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -10,7 +10,7 @@ MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://gale.org/
 COMMENT=	Secure instant messaging system
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_GNU_READLINE=	# needs rl_named_function()
 USE_LIBTOOL=		YES
@@ -45,11 +45,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/kutils/ROOT ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${EGDIR}
 
-.include "../../devel/boehm-gc/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../net/adns/buildlink2.mk"
-.include "../../security/rsaref/buildlink2.mk"
-.include "../../www/libwww/buildlink2.mk"
+.include "../../devel/boehm-gc/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../net/adns/buildlink3.mk"
+.include "../../security/rsaref/buildlink3.mk"
+.include "../../www/libwww/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/adns/Makefile b/net/adns/Makefile
index d52268d2bc7..d76f0b609c1 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/25 08:01:15 snj Exp $
 #
 
 DISTNAME=	adns-1.1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.chiark.greenend.org.uk/~ian/adns/
 COMMENT=	Asynchronous-capable DNS client library and utilities
 
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/net/adns/buildlink3.mk b/net/adns/buildlink3.mk
new file mode 100644
index 00000000000..bb80076b36d
--- /dev/null
+++ b/net/adns/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 08:01:15 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+ADNS_BUILDLINK3_MK:=	${ADNS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	adns
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nadns}
+BUILDLINK_PACKAGES+=	adns
+
+.if !empty(ADNS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.adns+=	adns>=1.0
+BUILDLINK_PKGSRCDIR.adns?=	../../net/adns
+.endif	# ADNS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/lft/Makefile b/net/lft/Makefile
index d905fa63561..df96256f34c 100644
--- a/net/lft/Makefile
+++ b/net/lft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/27 07:36:47 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/25 08:06:02 snj Exp $
 #
 
 DISTNAME=		lft-2.2
@@ -9,9 +9,9 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://mainnerve.com/lft/
 COMMENT=		Layer four traceroute capable of tracing protocol paths
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	# defined
 GNU_CONFIGURE=		# defined
 
-.include "../../net/libpcap/buildlink2.mk"
+.include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index f6a22984f04..e0cae9950b4 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/07/17 22:51:25 grant Exp $
+# $NetBSD: Makefile,v 1.33 2004/04/25 08:07:46 snj Exp $
 # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
 #
 
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.ncftp.com/ncftp/
 COMMENT=		FTP replacement with advanced user interface
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-extra-dirs
 CONFIGURE_ARGS+=	--disable-ncurses
@@ -23,10 +23,10 @@ CONFIGURE_ENV+=		ac_cv_lib_intl_strftime=no
 BUILD_DEFS+=		USE_SOCKS
 .  if ${USE_SOCKS} == 4
 CONFIGURE_ARGS+= 	--enable-socks
-.    include "../../net/socks4/buildlink2.mk"
+.    include "../../net/socks4/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+= 	--enable-socks5
-.    include "../../net/socks5/buildlink2.mk"
+.    include "../../net/socks5/buildlink3.mk"
 .  endif
 .endif
 
@@ -34,5 +34,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
 	${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index 9ac80f72945..d2fcf02ee39 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/25 08:02:50 snj Exp $
 #
 
 DISTNAME=	sms-1.9.2d
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.ceti.pl/~miki/komputery/sms.html
 COMMENT=	Send SMS to cellular phones in Poland (Plus, Idea, Era)
 
 WRKSRC=		${WRKDIR}/sms
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 do-install:
@@ -26,5 +26,5 @@ do-install:
 	cd ${WRKSRC}/contrib && ${INSTALL_DATA} mimecut procmailrc	\
 		sms.cgi sms.html ${PREFIX}/share/sms/contrib
 
-.include "../../databases/gdbm/buildlink2.mk"
+.include "../../databases/gdbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index e81c16be6e1..6f4ff494e95 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/25 08:10:20 snj Exp $
 #
 
 DISTNAME=	pptpd-1.1.3-20030409
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.poptop.org/
 COMMENT=	PPTP server with support for Microsoft VPN clients
 
 WRKSRC=		${WRKDIR}/poptop
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-libwrap
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 573d15cc384..3e18e62379c 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/25 11:49:53 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/25 08:01:22 snj Exp $
 #
 
 DISTNAME=       adns-python-1.0.0
@@ -11,9 +11,9 @@ HOMEPAGE=       http://dustman.net/andy/python/adns-python/
 COMMENT=        Python interface to the GNU asynchronous DNS resolver library
 
 PYDISTUTILSPKG=
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
 
-.include "../../net/adns/buildlink2.mk"
+.include "../../net/adns/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index 714e91d28d9..4cbd9908698 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/25 08:04:25 snj Exp $
 #
 
 DISTNAME=	tn5250-0.12.51
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.linux-sna.org/software/5250/
 COMMENT=	Implementation of the IBM 5250 telnet protocol
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"