buildlink1 -> buildlink2.

7 files changed, 19 insertions, 32 deletions

diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 46bf25bcf7a..ba46f98506f 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/13 11:35:15 wiz Exp $
 
 DISTNAME=		dopewars-1.5.0
 CATEGORIES=		games
@@ -11,7 +11,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://bellatrix.pcl.ox.ac.uk/~ben/dopewars/
 COMMENT=		Make a fortune dealing drugs on the streets of New York
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 
 GNU_CONFIGURE=		YES
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--disable-gui-client
 # datadir is the place the score file is saved
 CONFIGURE_ARGS+=	--datadir=/var/games
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/glib/buildlink.mk"
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/dopewars/distinfo b/games/dopewars/distinfo
index 8eaafa78ed5..839893c4fab 100644
--- a/games/dopewars/distinfo
+++ b/games/dopewars/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/06/28 09:07:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2002/10/13 11:35:15 wiz Exp $
 
 SHA1 (dopewars-1.5.0.tar.gz) = 44a6263dc004f280af3c29d3aafa29f35fbc6ad2
 Size (dopewars-1.5.0.tar.gz) = 453999 bytes
@@ -6,5 +6,5 @@ SHA1 (patch-aa) = 48798f210217b36b751d2aae263fa2718546551a
 SHA1 (patch-ab) = 1ddd2e66d26ed653da33e5cb85a233b2ed2831f5
 SHA1 (patch-ac) = 279be63a9c771dc6629b42558ead20db302a2e08
 SHA1 (patch-ad) = 88ca65d1a8e2a49eb88b170845467e1e75112997
-SHA1 (patch-ae) = ab23da8725457b2cf9d281e7ad5575bb92982bfa
+SHA1 (patch-ae) = d10c2590013ffb931c23a5e6eaf5cda16d7691c8
 SHA1 (patch-af) = 433cb9ae959a9078f1badada9932c6f0c4b36a2b
diff --git a/games/dopewars/patches/patch-ae b/games/dopewars/patches/patch-ae
index 7506d3d1682..e2476530ec4 100644
--- a/games/dopewars/patches/patch-ae
+++ b/games/dopewars/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2001/06/20 08:07:01 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2002/10/13 11:35:16 wiz Exp $
 
 --- configure.orig	Sun May 13 18:16:50 2001
 +++ configure
@@ -26,14 +26,3 @@ $NetBSD: patch-ae,v 1.2 2001/06/20 08:07:01 jlam Exp $
  ; return 0; }
  EOF
  if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -3932,8 +3932,8 @@
-       fi
-    fi
- 
--      CFLAGS="$CFLAGS `glib-config --cflags`"
--   LDFLAGS="$LDFLAGS `glib-config --libs`"
-+      CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags`"
-+   LDFLAGS="$LDFLAGS `$GLIB_CONFIG --libs`"
- 
-       GUI_SERVER="no"
- 
diff --git a/games/glickomania/Makefile b/games/glickomania/Makefile
index 6cf8eddefbb..e05814c9c92 100644
--- a/games/glickomania/Makefile
+++ b/games/glickomania/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/08 00:44:43 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/13 11:36:48 wiz Exp $
 #
 
 DISTNAME=	glickomania-1.0
@@ -10,7 +10,7 @@ HOMEPAGE=	http://hibase.cs.hut.fi/~cessu/glickomania/
 COMMENT=	clear a board by removing groups of identical, adjacent tiles
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
-.include "../../x11/gtk/buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index aeab7428a5b..cc64e864d90 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/24 19:45:25 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/13 11:38:16 wiz Exp $
 #
 
 DISTNAME=	kanjipad-1.2.1
@@ -11,7 +11,7 @@ COMMENT=	Japanese handwriting recognition with GTK interface
 
 USE_PERL5=	build
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kanjipad
@@ -19,5 +19,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/kpengine ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/jdata.dat ${PREFIX}/share/kanjipad
 
-.include "../../x11/gtk/buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kanjipad/distinfo b/misc/kanjipad/distinfo
index 277322bb532..4032c9412a9 100644
--- a/misc/kanjipad/distinfo
+++ b/misc/kanjipad/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/14 10:03:54 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/10/13 11:38:17 wiz Exp $
 
 SHA1 (kanjipad-1.2.1.tar.gz) = 8ddc4222386feeb184dae4c57dc7ec3e922adfbc
 Size (kanjipad-1.2.1.tar.gz) = 74287 bytes
-SHA1 (patch-aa) = f44c13036bc990915e50cc1a288bacb09126a570
+SHA1 (patch-aa) = 74b3c48bef313b8befad1e2118e16d2d53645ffe
diff --git a/misc/kanjipad/patches/patch-aa b/misc/kanjipad/patches/patch-aa
index 46e90913f02..c86302e76cc 100644
--- a/misc/kanjipad/patches/patch-aa
+++ b/misc/kanjipad/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/14 10:03:54 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/10/13 11:38:17 wiz Exp $
 
 --- Makefile.orig	Wed Mar 31 09:36:32 1999
 +++ Makefile
@@ -6,10 +6,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/14 10:03:54 wiz Exp $
  OPTIMIZE=-g -Wall
  #OPTIMIZE=-O2 
  
--GTKLIBS=`gtk-config --libs`
--GTKINC=`gtk-config --cflags`
-+GTKLIBS=`${GTK_CONFIG} --libs`
-+GTKINC=`${GTK_CONFIG} --cflags`
+ GTKLIBS=`gtk-config --libs`
+ GTKINC=`gtk-config --cflags`
  
 -PREFIX=/usr/local
 +#PREFIX=/usr/local