buildlink1 -> buildlink2

13 files changed, 56 insertions, 53 deletions

diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 556397731c7..f22940bfc22 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/21 11:56:16 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/27 18:52:18 jlam Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -16,7 +16,8 @@ EXTRACT_CMD=		unzip -aq ${DOWNLOADED_DISTFILE}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 
-BUILDLINK_ONLY=		yes
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 
 post-patch:
 	@${MV} ${WRKSRC}/include/config.h ${WRKSRC}/config.h-pre
@@ -36,6 +37,5 @@ pre-install:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/fe-config ${PREFIX}/bin
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/iso-pernangband/Makefile b/games/iso-pernangband/Makefile
index 0a7be319808..c47fd37c047 100644
--- a/games/iso-pernangband/Makefile
+++ b/games/iso-pernangband/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/10/20 00:12:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/27 18:54:32 jlam Exp $
 #
 
 DISTNAME=		iso-pern_src-0_2_6
@@ -11,7 +11,7 @@ MAINTAINER=		collver@linuxfreemail.com
 HOMEPAGE=		http://www.isoband.cjb.net
 COMMENT=		isometric (pseudo 3D) view for Angband
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_X11=		yes
 
@@ -46,5 +46,5 @@ do-install:
 		${WRKSRC}/testing \
 		${PREFIX}/bin/iso-pernangband
 
-.include "../../devel/SDL/buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index 3e9389cebbc..1f1fd1dc10a 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/12/05 05:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/27 18:55:28 jlam Exp $
 #
 
 DISTNAME=	ketm-0.0.4
@@ -12,8 +12,9 @@ COMMENT=	old-school 2d-scrolling shooter
 
 ALL_TARGET=	ketm
 
-USE_BUILDLINK_ONLY=	YES
-USE_GMAKE=		YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+USE_GMAKE=	YES
 
 post-patch:
 	cd ${WRKSRC} &&							\
@@ -35,6 +36,5 @@ do-install:
 	cd ${WRKSRC}/data && 						\
 		${INSTALL_DATA} *.bmp ${PREFIX}/share/ketm/data
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/ketm/distinfo b/games/ketm/distinfo
index 7cd21589e48..1c3496bf224 100644
--- a/games/ketm/distinfo
+++ b/games/ketm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/01/24 18:37:56 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/27 18:55:29 jlam Exp $
 
 SHA1 (ketm-0.0.4.tar.bz2) = b49f2a255b60ad76a36c95ddba71a0d39ffbcac4
 Size (ketm-0.0.4.tar.bz2) = 1250927 bytes
-SHA1 (patch-aa) = 2f0155a45f8e9f1e0042d05633f5158a16f43b02
 SHA1 (patch-ab) = 3f3137b140d4ed32e454ede9454d25e9fadeaa37
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 35a2f1723c7..f4b3bb55b1c 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/24 22:10:56 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/27 18:56:45 jlam Exp $
 #
 
 DISTNAME=	lbreakout-010315
@@ -9,10 +9,10 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	breakout-style arcade game
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-sound
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index 1a3ae473b47..7575c50688c 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/05 22:13:38 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/27 19:00:20 jlam Exp $
 #
 
 DISTNAME=	lbreakout2-2.2.2
@@ -9,13 +9,14 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	breakout-style arcade game
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-highscore-path=${LOCALBASE}/share/games/ \
 			--with-doc-path=${LOCALBASE}/doc/
 
-.include "../../graphics/png/buildlink.mk"
-.include "../../audio/SDL-mixer/buildlink.mk"
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../audio/SDL-mixer/buildlink2.mk"
+.include "../../devel/SDL/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index 47fe927a466..7b223e4335d 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/05 22:37:41 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/27 18:55:36 jlam Exp $
 #
 
 DISTNAME=	lpairs-1.0
@@ -9,9 +9,9 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	memory game matching pairs of cards
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index e9ea660f6e4..1e21b55b2f3 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/05 22:45:37 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/27 19:01:22 jlam Exp $
 #
 
 DISTNAME=	ltris-1.0.1
@@ -10,10 +10,11 @@ HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	SDL tetris clone
 
 USE_BUILDLINK_ONLY=	YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-highscore-path=${LOCALBASE}/share/games/
 
-.include "../../audio/SDL-mixer/buildlink.mk"
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../audio/SDL-mixer/buildlink2.mk"
+.include "../../devel/SDL/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile
index a5d6ec55825..37493f2da31 100644
--- a/games/maelstrom-sdl/Makefile
+++ b/games/maelstrom-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/11 13:21:27 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/27 19:06:57 jlam Exp $
 #
 
 DISTNAME=	Maelstrom-3.0.5
@@ -11,7 +11,9 @@ HOMEPAGE=	http://www.devolution.com/~slouken/Maelstrom/
 COMMENT=	Incredible, fast moving, high resolution version of asteroids (SDL version)
 
 CONFLICTS=		maelstrom-x11-[0-9]* maelstrom-[0-9]*
-USE_BUILDLINK_ONLY=	YES
+
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 
 post-install:
@@ -20,7 +22,7 @@ post-install:
 		${PREFIX}/share/Maelstrom/Images/Makefile \
 		${PREFIX}/share/Maelstrom/Images/Makefile.in
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../net/SDL_net/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
+.include "../../net/SDL_net/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/marbles/Makefile b/games/marbles/Makefile
index a14a93af9e8..37a54065d31 100644
--- a/games/marbles/Makefile
+++ b/games/marbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/05 23:01:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/27 19:07:37 jlam Exp $
 #
 
 DISTNAME=	marbles-1.0.2
@@ -9,10 +9,10 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	Atomix-like puzzle
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-profile-path=${LOCALBASE}/share/games/
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index 6e755ff77b8..00faa4810a4 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/24 22:10:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/27 19:08:08 jlam Exp $
 #
 
 DISTNAME=	newvox-1.0
@@ -9,9 +9,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.libsdl.org/projects/newvox/index.html
 COMMENT=	voxel-style landscape rendering fly-by
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
-.include "../../devel/SDL/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index fc2fe8f05b7..bae93fb2684 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/20 12:56:45 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/27 19:08:32 jlam Exp $
 #
 
 DISTNAME=	prboom-2.2.2
@@ -9,10 +9,10 @@ MAINTAINER=	zuntum@netbsd.org
 HOMEPAGE=	http://prboom.sourceforge.net/
 COMMENT=	multiplayer-capable and modified version of ID's classic doom game
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
 #CONFIGURE_ARGS+=	--enable-gl
 
-.include "../../net/SDL_net/buildlink.mk"
+.include "../../net/SDL_net/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/SDL_net/Makefile b/net/SDL_net/Makefile
index 78cb580221b..40698737788 100644
--- a/net/SDL_net/Makefile
+++ b/net/SDL_net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/11 21:15:47 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/27 19:01:41 jlam Exp $
 #
 
 DISTNAME=	SDL_net-1.2.3
@@ -9,11 +9,11 @@ MAINTAINER=	zuntum@netbsd.org
 HOMEPAGE=	http://www.libsdl.org/projects/SDL_net/
 COMMENT=	small sample cross-platform networking library for SDL
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=            YES
 LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
 
-.include "../../devel/SDL/buildlink.mk"
+.include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"