buildlink1 -> buildlink2

6 files changed, 17 insertions, 18 deletions

diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index e9bc9792407..de346eca51b 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/03/25 20:32:29 pooka Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/23 10:10:51 jlam Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -10,7 +10,8 @@ CATEGORIES+=		x11
 
 DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 
 ALL_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
@@ -22,6 +23,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/dat/x11tiles				\
 	     ${PREFIX}/share/nethackdir${NETHACK_DISTVER}
 
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-x11/distinfo b/games/nethack-x11/distinfo
index ccd96caa656..315bbc6ef82 100644
--- a/games/nethack-x11/distinfo
+++ b/games/nethack-x11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/03/25 20:32:29 pooka Exp $
+$NetBSD: distinfo,v 1.7 2002/09/23 10:10:51 jlam Exp $
 
 SHA1 (nethack-340.tgz) = db480f5bf94372a8f87ee4d081f83efd99b31523
 Size (nethack-340.tgz) = 3270905 bytes
@@ -8,4 +8,4 @@ SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf
 SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716
 SHA1 (patch-af) = 20c37fd62b05121d834d3c42cf3aa48b018b362d
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
-SHA1 (patch-ah) = dc195cd1fa7dbae59904847c357b9a6c7796d7fa
+SHA1 (patch-ah) = 9cb29ef166fefa5672cad337e00fc960b46140eb
diff --git a/games/nethack-x11/patches/patch-ah b/games/nethack-x11/patches/patch-ah
index 725e184c6ed..81810e9aec1 100644
--- a/games/nethack-x11/patches/patch-ah
+++ b/games/nethack-x11/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/03/22 17:26:29 pooka Exp $
+$NetBSD: patch-ah,v 1.2 2002/09/23 10:10:52 jlam Exp $
 
 --- sys/unix/Makefile.src.orig	Sat Aug  5 13:52:57 2000
 +++ sys/unix/Makefile.src	Thu Aug 10 19:28:31 2000
@@ -8,7 +8,7 @@ $NetBSD: patch-ah,v 1.1 2002/03/22 17:26:29 pooka Exp $
  
 -CFLAGS = -O -I../include
 -LFLAGS =
-+CFLAGS += -I../include -I${BUILDLINK_X11_DIR}/include
++CFLAGS += -I../include -I${X11BASE}/include
 +LFLAGS = ${LDFLAGS}
  
  # The Qt and Be window systems are written in C++, while the rest of
diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index db8dc5390d2..97b0a337e76 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/07/02 11:34:03 agc Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/23 10:14:40 jlam Exp $
 
 DISTNAME=		Pacman-0.3-CVS-00-11-17
 PKGNAME=		Pacman-0.3
@@ -10,10 +10,10 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanlib.org/
 COMMENT=		Pacman, a small demonstration game for ClanLib
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
 
 # needs a valid X display to compile its datafiles
 .ifndef DISPLAY
@@ -33,6 +33,5 @@ pre-build:
 		exit 1;							    \
 	fi;
 
-.include "../../graphics/clanlib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/clanlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/distinfo b/games/pacman/distinfo
index 5935d8517d9..60f9b3080b4 100644
--- a/games/pacman/distinfo
+++ b/games/pacman/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/08/29 22:41:14 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/09/23 10:14:40 jlam Exp $
 
 SHA1 (Pacman-0.3-CVS-00-11-17.tar.gz) = 0d30f2ae3410d2df7b3fecb5cce732ba3022041d
 Size (Pacman-0.3-CVS-00-11-17.tar.gz) = 62257 bytes
-SHA1 (patch-aa) = 28103a483316c870325e63f378ea36955b029b84
+SHA1 (patch-aa) = 1a820d58f80cfa6a474e4480286d3f4cbf0ee56d
 SHA1 (patch-ab) = 8d20c41dfb1a010586a3ebfb3ab4e7f675b93400
diff --git a/games/pacman/patches/patch-aa b/games/pacman/patches/patch-aa
index dbc5f7646de..e7a619890ea 100644
--- a/games/pacman/patches/patch-aa
+++ b/games/pacman/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:14 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2002/09/23 10:14:41 jlam Exp $
 
 --- Makefile.in.orig	Wed Oct  6 02:19:37 1999
 +++ Makefile.in
@@ -7,8 +7,8 @@ $NetBSD: patch-aa,v 1.4 2001/08/29 22:41:14 jlam Exp $
  OBJF =          .build/pacman.o .build/objects.o .build/fontblowup.o
  DATAFILES =     pacman.dat
 -EXTERN_LIBS =   -lclanCore
-+EXTERN_LIBS =   -L${BUILDLINK_X11_DIR}/lib -Wl,-R$(X11BASE)/lib -lclanCore \
-+		-L${BUILDLINK_DIR}/lib -Wl,-R$(LOCALBASE)/lib -lHermes -lpth -lz
++EXTERN_LIBS =   -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lclanCore \
++		-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lHermes -lpth -lz
  
  all: pacman $(DATAFILES)