Convert to buildlink3.

9 files changed, 56 insertions, 41 deletions

diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index 6640cd86de9..184963ff0ab 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/03/28 13:15:56 darcy Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/27 03:43:53 snj Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-curses-0
@@ -9,7 +9,7 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.python.org/doc/current/lib/module-curses.html
 COMMENT=	Curses module for Python
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_NCURSES=	# filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ...
 # noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs
 # termname tigetflag tigetnum tigetstr tparm typeahead use_env wcursyncup
@@ -33,5 +33,5 @@ do-patch:
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-curses/buildlink2.mk b/devel/py-curses/buildlink2.mk
deleted file mode 100644
index cb2f9a40df2..00000000000
--- a/devel/py-curses/buildlink2.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:38 jlam Exp $
-
-.if !defined(PYCURSES_BUILDLINK2_MK)
-PYCURSES_BUILDLINK2_MK=	# defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=			pycurses
-BUILDLINK_PKGBASE.pycurses?=		${PYPKGPREFIX}-curses
-BUILDLINK_DEPENDS.pycurses?=		${PYPKGPREFIX}-curses-[0-9]*
-BUILDLINK_PKGSRCDIR.pycurses?=		../../devel/py-curses
-
-.endif	# PYCURSES_BUILDLINK2_MK
diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk
new file mode 100644
index 00000000000..bd86d034f65
--- /dev/null
+++ b/devel/py-curses/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 03:43:53 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_CURSES_BUILDLINK3_MK:=	${PY_CURSES_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pycurses
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycurses}
+BUILDLINK_PACKAGES+=	pycurses
+
+.if !empty(PY_CURSES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pycurses+=	${PYPKGPREFIX}-curses-[0-9]*
+BUILDLINK_PKGSRCDIR.pycurses?=	../../devel/py-curses
+.endif	# PY_CURSES_BUILDLINK3_MK
+
+.include "../../devel/ncurses/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index acc271d33ae..b5742a5d322 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 03:43:53 snj Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-cursespanel-0
@@ -9,7 +9,7 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://www.python.org/doc/current/lib/module-curses.html
 COMMENT=	Curses panel module for Python
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_NCURSES=	# filter getsyx getwin has_key immedok mvwinsnstr mvwinsstr ...
 # noqiflush pechochar putp putwin qiflush redrawwin setsyx syncok termattrs
 # termname tigetflag tigetnum tigetstr tparm typeahead use_env wcursyncup
@@ -31,6 +31,5 @@ do-patch:
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/srcdist.mk"
-.include "../../devel/py-curses/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/py-curses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-cursespanel/buildlink2.mk b/devel/py-cursespanel/buildlink2.mk
deleted file mode 100644
index 34931ce59ef..00000000000
--- a/devel/py-cursespanel/buildlink2.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/29 05:05:38 jlam Exp $
-
-.if !defined(PYCURSESPANEL_BUILDLINK2_MK)
-PYCURSESPANEL_BUILDLINK2_MK=	# defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+=			pycursespanel
-BUILDLINK_PKGBASE.pycursespanel?=	${PYPKGPREFIX}-cursespanel
-BUILDLINK_DEPENDS.pycursespanel?=	${PYPKGPREFIX}-cursespanel-[0-9]*
-BUILDLINK_PKGSRCDIR.pycursespanel?=	../../devel/py-cursespanel
-
-.include "../../devel/py-curses/buildlink2.mk"
-
-.endif	# PYCURSESPANEL_BUILDLINK2_MK
diff --git a/devel/py-cursespanel/buildlink3.mk b/devel/py-cursespanel/buildlink3.mk
new file mode 100644
index 00000000000..8871a72356a
--- /dev/null
+++ b/devel/py-cursespanel/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 03:43:54 snj Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+PY_CURSESPANEL_BUILDLINK3_MK:=	${PY_CURSESPANEL_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pycursespanel
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npycursespanel}
+BUILDLINK_PACKAGES+=	pycursespanel
+
+.if !empty(PY_CURSESPANEL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pycursespanel+=	${PYPKGPREFIX}-cursespanel-[0-9]*
+BUILDLINK_PKGSRCDIR.pycursespanel?=	../../devel/py-cursespanel
+.endif	# PY_CURSESPANEL_BUILDLINK3_MK
+
+.include "../../devel/ncurses/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index 8f3dee82a54..37c79efd110 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/29 23:39:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 03:43:54 snj Exp $
 #
 
 .include "../../net/bittorrent/Makefile.common"
@@ -18,5 +18,5 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/btdownloadgui.py ${PREFIX}/bin
 
 .include "../../lang/python/application.mk"
-.include "../../x11/py-wxWindows/buildlink2.mk"
+.include "../../x11/py-wxWindows/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index f9d56a66d51..2da3ee76588 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/03/29 23:39:42 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/27 03:43:54 snj Exp $
 #
 
 .include "Makefile.common"
@@ -13,5 +13,5 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../devel/py-cursespanel/buildlink2.mk"
+.include "../../devel/py-cursespanel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
index b1d98cb22eb..2ada94d1748 100644
--- a/net/bittorrent/Makefile.common
+++ b/net/bittorrent/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/03/29 23:39:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/04/27 03:43:54 snj Exp $
 #
 
 DISTNAME=	BitTorrent-3.4.1a
@@ -15,6 +15,6 @@ DISTINFO_FILE=	${.CURDIR}/../../net/bittorrent/distinfo
 FILESDIR=	${.CURDIR}/../../net/bittorrent/files
 PATCHDIR=	${.CURDIR}/../../net/bittorrent/patches
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth