Convert to buildlink3.

6 files changed, 23 insertions, 27 deletions

diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index f4cdb812ea5..6b7479bc332 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/03/05 12:09:35 adam Exp $
+# $NetBSD: Makefile,v 1.22 2004/04/22 03:54:17 snj Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-gtk-/}
 COMMENT=	Freeciv client with GTK+ interface
@@ -6,7 +6,6 @@ COMMENT=	Freeciv client with GTK+ interface
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 DEPENDS+=	freeciv-sounds>=2.0:../../games/freeciv-sounds
 
-USE_BUILDLINK2=		yes
 USE_X11=		yes
 
 CONFIGURE_ARGS+=	--disable-server --disable-make-data
@@ -19,9 +18,9 @@ do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client-gtk2/Makefile b/games/freeciv-client-gtk2/Makefile
index fa808d94435..7d9af84baa2 100644
--- a/games/freeciv-client-gtk2/Makefile
+++ b/games/freeciv-client-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/05 12:15:26 adam Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/22 03:54:17 snj Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-gtk2-/}
 COMMENT=	Freeciv client with GTK+ interface
@@ -6,7 +6,6 @@ COMMENT=	Freeciv client with GTK+ interface
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 DEPENDS+=	freeciv-sounds>=2.0:../../games/freeciv-sounds
 
-USE_BUILDLINK2=		yes
 USE_X11=		yes
 
 CONFIGURE_ARGS+=	--disable-server --disable-make-data
@@ -19,9 +18,9 @@ do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index 76cebc4e1ff..f50bdee3022 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/05 12:07:51 adam Exp $
+# $NetBSD: Makefile,v 1.19 2004/04/22 03:54:17 snj Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
 COMMENT=	Freeciv client with Xaw interface
@@ -8,7 +8,6 @@ DEPENDS+=	freeciv-sounds>=2.0:../../games/freeciv-sounds
 
 CONFLICTS=	freeciv-client-gtk<=1.11.4
 
-USE_BUILDLINK2=		yes
 USE_X11=		yes
 
 CONFIGURE_ARGS+=	--disable-server --disable-make-data
@@ -26,9 +25,9 @@ do-install:
 	cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/xaw.buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-manual/Makefile b/games/freeciv-manual/Makefile
index a19fa7bf404..c089e67b33a 100644
--- a/games/freeciv-manual/Makefile
+++ b/games/freeciv-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:40 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/22 03:54:17 snj Exp $
 #
 
 DISTNAME=	manual-1.8.1-2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.freeciv.org/
 COMMENT=	Manuals for freeciv (game, client, and server)
 
 WRKSRC=		${WRKDIR}/manual
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 NO_BUILD=	YES
 
 do-install:
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 2cb3865b043..b85bc0169b0 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2004/03/05 12:08:51 adam Exp $
+# $NetBSD: Makefile,v 1.16 2004/04/22 03:54:17 snj Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 COMMENT=	Freeciv game server
 
 DEPENDS+=	freeciv-share>=${FC_VERS}:../../games/freeciv-share
 
-USE_BUILDLINK2=		# defined
 USE_GNU_READLINE=	# uses callback interface of GNU readline
 LIBS+=			-ltermcap
 
@@ -21,7 +20,7 @@ do-install:
 	cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
 
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index fd258ee876f..e1591e4fa2e 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2004/03/05 12:06:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2004/04/22 03:54:17 snj Exp $
 
 DISTNAME=	freeciv-${FC_VERS}
 FC_VERS=	1.14.1
@@ -14,11 +14,11 @@ HOMEPAGE=	http://www.freeciv.org/
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 DISTINFO_FILE=		${.CURDIR}/../../games/freeciv-share/distinfo
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"