buildlink1 -> buildlink2.

9 files changed, 24 insertions, 35 deletions

diff --git a/chat/micq/Makefile b/chat/micq/Makefile
index ed0dc38013e..d0957d8fa80 100644
--- a/chat/micq/Makefile
+++ b/chat/micq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/06/14 22:16:35 itojun Exp $
+# $NetBSD: Makefile,v 1.7 2002/10/13 15:03:32 wiz Exp $
 
 DISTNAME=	micq-0.4.9
 CATEGORIES=	chat
@@ -9,6 +9,7 @@ MAINTAINER=	shell@shellhung.org
 HOMEPAGE=	http://micq.ukeer.de/
 COMMENT=	text-mode ICQ client
 
+USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 
@@ -17,5 +18,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/micq.7 ${PREFIX}/man/man7
 	${INSTALL_MAN} ${WRKSRC}/doc/micqrc.5 ${PREFIX}/man/man5
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/yencode/Makefile b/converters/yencode/Makefile
index 4c29f6ecfbd..a4a8d980e0b 100644
--- a/converters/yencode/Makefile
+++ b/converters/yencode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2002/03/22 13:49:15 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 15:05:00 wiz Exp $
 #
 
 DISTNAME=	yencode-0.45
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.yencode.org/
 COMMENT=	yenc format encoder and decoder
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index db23f3d8e67..d2600e399d8 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:17:54 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/13 15:07:27 wiz Exp $
 
 DISTNAME=	cook-2.17
 CATEGORIES=	devel
@@ -8,10 +8,11 @@ MAINTAINER=	groo@netbsd.org
 HOMEPAGE=	http://www.canb.auug.org.au/~millerp/cook/cook.html
 COMMENT=	More powerful replacement for the traditional make(1) tool
 
-DEPENDS+=	rx-[0-9]*:../../devel/rx
 BUILD_USES_MSGFMT=	yes
 
+USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/rx/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 964430c0c1c..cce87fc3acb 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/06/21 12:26:31 lukem Exp $
+# $NetBSD: Makefile,v 1.26 2002/10/13 15:09:18 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.gnu.org/software/idutils/idutils.html
 COMMENT=	Classic Berkeley gid/lid tools for looking up variables in code
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 INFO_FILES=	id-utils.info
 GNU_CONFIGURE=	yes
@@ -49,6 +49,6 @@ MAKE_ENV+=		BSD_SETENV=${SETENV}
 PLIST_SUBST+=		LISPDIR=${LISPDIR}
 PLIST_SUBST+=		CLISPDIR=${CLISPDIR}
 
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 7c2b6b4d49b..9eb6d3a2912 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/02/18 15:14:17 seb Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/13 15:11:01 wiz Exp $
 
 DISTNAME=	nano-1.0.8
 CATEGORIES=	editors
@@ -9,9 +9,9 @@ HOMEPAGE=	http://www.nano-editor.org/
 COMMENT=	small and friendly text editor (a free replacement for Pico)
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index e1a10a2d807..e0ff04530ff 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/01/26 07:16:59 martti Exp $
+$NetBSD: distinfo,v 1.6 2002/10/13 15:11:01 wiz Exp $
 
 SHA1 (nano-1.0.8.tar.gz) = 95fccbf51dd9f31c72e4d105c13476e4da9b59be
 Size (nano-1.0.8.tar.gz) = 439253 bytes
-SHA1 (patch-aa) = 1337fb38f20b04e3ee4f1682f8b608b6c180e99a
diff --git a/editors/nano/patches/patch-aa b/editors/nano/patches/patch-aa
deleted file mode 100644
index acc7d64af3a..00000000000
--- a/editors/nano/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/06/20 04:00:38 jlam Exp $
-
---- Makefile.in.orig	Sat May 12 21:11:55 2001
-+++ Makefile.in
-@@ -102,7 +102,7 @@
- SUBDIRS = po intl
- 
- localedir = $(datadir)/locale
--INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
-+INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\"
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 49304f6129f..4b78ca56043 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/08/07 06:10:35 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/13 15:21:09 wiz Exp $
 #
 
 DISTNAME=	frotz-2.42
@@ -15,7 +15,7 @@ MAINTAINER=	seebs@plethora.net
 HOMEPAGE=	http://www.cs.csubak.edu/~dgriffi/proj/frotz/
 COMMENT=	Curses-based interpreter for Infocom-compatible games
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 # setscrreg()
 INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
@@ -31,5 +31,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
 
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index eefa1c7fade..f162254780b 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/21 23:47:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/10/13 14:52:20 wiz Exp $
 #
 
 DISTNAME=	Pmw.0.8.5
@@ -11,6 +11,7 @@ HOMEPAGE=	http://pmw.sourceforge.net/
 COMMENT=	python meta widgets
 
 PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
+USE_BUILDLINK2=	YES
 
 do-build:
 
@@ -26,5 +27,5 @@ do-install:
 		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 
 .include "../../lang/python/extension.mk"
-.include "../../x11/py-Tk/buildlink.mk"
+.include "../../x11/py-Tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"