buildlink1 -> buildlink2

6 files changed, 23 insertions, 21 deletions

diff --git a/games/bridge-hands/Makefile b/games/bridge-hands/Makefile
index ae8583efdc4..a0e64a95bef 100644
--- a/games/bridge-hands/Makefile
+++ b/games/bridge-hands/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/28 08:05:58 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/15 00:17:34 jlam Exp $
 
 DISTNAME=	hands-2.0.bsd386
 PKGNAME=	bridge-hands-2.0
@@ -12,11 +12,11 @@ COMMENT=	generate hands for duplicate bridge
 EXTRACT_ELEMENTS=	hands/source
 WRKSRC=			${WRKDIR}/hands/source
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 
 do-build:
-	cd ${WRKSRC} && \
-		${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o hands hands.c ${LIBS}
+	cd ${WRKSRC}; ${BUILDLINK_CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}	\
+		-o hands hands.c ${LIBS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hands ${PREFIX}/bin/bridge-hands
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 2a6e8d66047..b27e410f650 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/11 17:07:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/15 00:20:21 jlam Exp $
 
 DISTNAME=	gnugo-3.2
 CATEGORIES=	games
@@ -10,7 +10,7 @@ COMMENT=	Go playing program
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/minami/Makefile b/games/minami/Makefile
index 4f44ed4d709..62c5d60cb6c 100644
--- a/games/minami/Makefile
+++ b/games/minami/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/28 14:25:49 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/15 00:23:48 jlam Exp $
 #
 
 DISTNAME=	minami-1.0.2
@@ -10,11 +10,11 @@ MAINTAINER=	kei@netbsd.org
 HOMEPAGE=	http://www.guru.gr.jp/~issei/minami/
 COMMENT=	Text adventure
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_PERL=		gen_act gen_dun gen_itm gen_scn minflag
+USE_BUILDLINK2=	YES
+REPLACE_PERL=	gen_act gen_dun gen_itm gen_scn minflag
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/minami ${PREFIX}/bin
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/minami/distinfo b/games/minami/distinfo
index 454bddc7a70..1c001256b84 100644
--- a/games/minami/distinfo
+++ b/games/minami/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/11/28 14:25:49 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/11/15 00:23:48 jlam Exp $
 
 SHA1 (minami-1.0.2.tgz) = c64f0e7dfd29e9cf6569a37ad0c21639c0ddf070
 Size (minami-1.0.2.tgz) = 89527 bytes
-SHA1 (patch-aa) = e8dfd568a5fa3adb771725d9da969d7c3d1e7f37
+SHA1 (patch-aa) = 72b8b91d8a9a1926054c677ef6de959af1494500
 SHA1 (patch-ab) = 084ba46c1c7ddaa00d8624f6e896acac35b4d395
 SHA1 (patch-af) = 55e015142821cc8abffc0852c264b68d2f46c280
diff --git a/games/minami/patches/patch-aa b/games/minami/patches/patch-aa
index 188583f036c..4d2c0f1c0cb 100644
--- a/games/minami/patches/patch-aa
+++ b/games/minami/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/22 07:53:00 kei Exp $
+$NetBSD: patch-aa,v 1.2 2002/11/15 00:23:50 jlam Exp $
 
---- Makefile.orig	Sat Mar 31 14:27:11 2001
-+++ Makefile	Sat Mar 31 14:30:06 2001
-@@ -49,7 +49,7 @@
+--- Makefile.orig	Thu Mar  8 09:02:48 2001
++++ Makefile
+@@ -48,8 +48,8 @@ tar::
+ 	tar cvfz minamir-$(VERSION).tgz $(DISTR)
  
  minami:	$(OBJS) $(GENOBJS)
- 	(cd action; make)
+-	(cd action; make)
 -	cc $(OBJS) $(GENOBJS) action/libaction.a `./minflag -l` -o minami
-+	cc $(OBJS) $(GENOBJS) action/libaction.a -L${PREFIX}/lib -Wl,-R${PREFIX}/lib `./minflag -l` -o minami
++	(cd action; $(MAKE))
++	$(CC) $(OBJS) $(GENOBJS) action/libaction.a $(LDFLAGS) `./minflag -l` -o minami
  
  minami.o: minami.h scene.h item.h version.h genscn.h
  	$(CC) $(CFLAGS) -c minami.c -o minami.o
diff --git a/games/netmaj/Makefile b/games/netmaj/Makefile
index a1bb9a74f05..daa6c13f9bf 100644
--- a/games/netmaj/Makefile
+++ b/games/netmaj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/28 14:33:09 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/15 00:21:35 jlam Exp $
 #
 
 DISTNAME=		netmaj-2.0.7
@@ -10,7 +10,7 @@ MAINTAINER=		kei@netbsd.org
 HOMEPAGE=		http://www.sfc.wide.ad.jp/~kusune/netmaj/
 COMMENT=		mahjongg game with network and 1-4 player(s) support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		# defined
 WRKSRC=			${WRKDIR}/netmaj
 
 INSTALL_TARGET=		install install-pf
@@ -24,5 +24,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/html/* ${HTMLDIR}
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"