diff options
-rw-r--r-- | games/freeciv-client-gtk/Makefile | 13 | ||||
-rw-r--r-- | games/freeciv-client/Makefile | 13 | ||||
-rw-r--r-- | games/freeciv-manual/Makefile | 3 | ||||
-rw-r--r-- | games/freeciv-server/Makefile | 9 | ||||
-rw-r--r-- | games/freeciv-share/Makefile | 4 | ||||
-rw-r--r-- | games/freeciv-share/Makefile.common | 5 | ||||
-rw-r--r-- | games/gnome-chess/Makefile | 12 | ||||
-rw-r--r-- | games/imaze/Makefile | 7 | ||||
-rw-r--r-- | games/knightcap/Makefile | 8 | ||||
-rw-r--r-- | games/lincity/Makefile | 5 | ||||
-rw-r--r-- | lang/sather/Makefile | 35 |
11 files changed, 60 insertions, 54 deletions
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile index 9e22ed01a5c..2473bbc4e72 100644 --- a/games/freeciv-client-gtk/Makefile +++ b/games/freeciv-client-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/03/13 17:36:59 fredb Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/23 10:02:49 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-gtk-/} PKGREVISION= 1 @@ -6,7 +6,8 @@ COMMENT= Freeciv client with GTK+ interface DEPENDS+= freeciv-share-${FC_VERS}:../../games/freeciv-share -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined +USE_X11= # defined CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --disable-make-data @@ -19,8 +20,8 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index 9cd58d6031f..0fb36e68fa6 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/10/24 22:10:56 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/23 10:02:49 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -9,7 +9,8 @@ CONFLICTS= freeciv-client-gtk<=1.11.4 .include "../../mk/bsd.prefs.mk" -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined +USE_X11= # defined CONFIGURE_ARGS+= --disable-server CONFIGURE_ARGS+= --disable-make-data @@ -25,8 +26,8 @@ do-install: cd ${WRKSRC}/client; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/xaw.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../mk/xaw.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-manual/Makefile b/games/freeciv-manual/Makefile index aa0e6b2c0b8..2396fbc014e 100644 --- a/games/freeciv-manual/Makefile +++ b/games/freeciv-manual/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2002/09/23 10:02:49 jlam Exp $ # DISTNAME= manual-1.8.1-2 @@ -10,6 +10,7 @@ MAINTAINER= dillo@giga.or.at HOMEPAGE= http://www.freeciv.org/ COMMENT= manuals for freeciv (game, client, and server) +USE_BUILDLINK2= YES NO_BUILD= YES WRKSRC= ${WRKDIR}/manual diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 4ab6cd37350..0592069c9e2 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/08/15 19:50:31 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/23 10:02:49 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} COMMENT= Freeciv game server @@ -9,7 +9,7 @@ CONFIGURE_ARGS+= --enable-client=no CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --with-readline -USE_BUILDLINK_ONLY= # defined +USE_BUILDLINK2= # defined USE_GNU_READLINE= # uses callback interface of GNU readline LIBS+= -ltermcap @@ -24,6 +24,7 @@ do-install: cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET} -.include "../../devel/readline/buildlink.mk" -.include "../../devel/zlib/buildlink.mk" +.include "../../devel/readline/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/games/freeciv-share/Makefile b/games/freeciv-share/Makefile index 5da9eca14ba..1ad9318e849 100644 --- a/games/freeciv-share/Makefile +++ b/games/freeciv-share/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2001/08/15 19:50:31 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/23 10:02:50 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-share-/} COMMENT= Machine independent files for Freeciv -USE_BUILDLINK_ONLY= # defined - .include "../freeciv-share/Makefile.common" CONFIGURE_ARGS+= --disable-server diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index 477dd4311fc..7e6010d4b41 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2001/08/15 19:50:31 jlam Exp $ +# $NetBSD: Makefile.common,v 1.11 2002/09/23 10:02:50 jlam Exp $ DISTNAME= freeciv-${FC_VERS} FC_VERS= 1.12.0 @@ -13,9 +13,10 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.freeciv.org/ BUILD_USES_MSGFMT= # defined +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches -.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/gettext-lib/buildlink2.mk" diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile index be2ab4aa3e2..6cba570567b 100644 --- a/games/gnome-chess/Makefile +++ b/games/gnome-chess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:41 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/23 09:55:18 jlam Exp $ DISTNAME= gnome-chess-0.3.3 PKGREVISION= 3 @@ -9,10 +9,10 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://arcavia.com/rd/gnome-chess/ COMMENT= GNOME's graphical interface for playing chess -GNU_CONFIGURE= yes -USE_X11BASE= yes -CONFIGURE_ARGS+=--localstatedir=${X11PREFIX}/var/lib +USE_BUILDLINK2= yes +USE_X11BASE= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --localstatedir=${X11PREFIX}/var/lib -.include "../../x11/gnome-core/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/gnome-core/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/imaze/Makefile b/games/imaze/Makefile index 62850ea09e8..1c90f0dd6fc 100644 --- a/games/imaze/Makefile +++ b/games/imaze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/10/24 22:10:56 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/23 09:56:42 jlam Exp $ DISTNAME= imaze1.3 PKGNAME= imaze-1.3 @@ -13,12 +13,11 @@ COMMENT= Multiplayer, networked, action,x 3D maze game EXTRACT_ONLY= imaze1.3.tar.Z WRKSRC= ${WRKDIR}/imaze -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes USE_X11BASE= yes post-build: cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar -.include "../../mk/motif.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../mk/motif.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile index bad396728e6..c4cb7809128 100644 --- a/games/knightcap/Makefile +++ b/games/knightcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/06/28 14:54:18 agc Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/23 10:03:03 jlam Exp $ DISTNAME= KnightCap-3.6 PKGNAME= knightcap-3.6 @@ -13,7 +13,8 @@ COMMENT= chess engine with 3D OpenGL-rendered chessboard WRKSRC= ${WRKDIR}/Export ALL_TARGET= KnightCap -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= # defined +USE_X11= # defined MAKE_ENV+= MESA=${BUILDLINK_PREFIX.MesaLib} MAKE_ENV+= DEFINES="${DEFINES}" @@ -28,6 +29,5 @@ do-install: ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} -.include "../../graphics/Mesa/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lincity/Makefile b/games/lincity/Makefile index 9e36ace7c66..5cb30c7de3d 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:12 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/23 10:03:24 jlam Exp $ # DISTNAME= lincity-1.11 @@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.floot.demon.co.uk/lincity.html COMMENT= Free clone of SimCity for X11 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= # defined USE_X11BASE= # defined ALL_TARGET= xlincity @@ -24,5 +24,4 @@ pre-build: post-install: ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/sather/Makefile b/lang/sather/Makefile index 1c2bee01a8c..0a9307cc014 100644 --- a/lang/sather/Makefile +++ b/lang/sather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/05/09 14:36:49 agc Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/23 09:54:03 jlam Exp $ DISTNAME= sather-1.2.1 CATEGORIES= lang @@ -8,6 +8,8 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/sather/index.html COMMENT= Compiler for the Sather object oriented programming language +USE_BUILDLINK2= # defined +USE_X11= # defined USE_GMAKE= # defined ALL_TARGET= full optional @@ -15,7 +17,8 @@ ALL_TARGET= full optional INFO_FILES= sather.info sather-tutorial.info sather-mode.info do-configure: - for f in ${WRKSRC}/Boot/sacomp.code/Makefile \ + for f in \ + ${WRKSRC}/Boot/sacomp.code/Makefile \ ${WRKSRC}/Library/System/unix.sa \ ${WRKSRC}/System/Common/CONFIG.proto \ ${WRKSRC}/System/Platforms/netbsd/CONFIG \ @@ -28,16 +31,18 @@ do-configure: ${WRKSRC}/Browser/Web/gen_html_top_level \ ${WRKSRC}/Browser/Web/gen_mml_sa_files \ ${WRKSRC}/Browser/Web/gen_mml_shortflat \ - ${WRKSRC}/Browser/Web/graph2dot; do \ - ${SED} -e 's:@CC@:${CC}:g' \ - -e 's:@CFLAGS@:${CFLAGS}:g' \ - -e 's:@GMAKE@:${GMAKE}:g' \ - -e 's:@PREFIX@:${PREFIX}:g' \ - -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@GC_PREFIX@:${LOCALBASE}:g' \ - -e 's:@TCL_PREFIX@:${LOCALBASE}:g' \ - -e 's:@TK_PREFIX@:${LOCALBASE}:g' \ - $$f > $$f.tmp && ${MV} -f $$f.tmp $$f; \ + ${WRKSRC}/Browser/Web/graph2dot; \ + do \ + ${SED} -e 's:@CC@:${CC}:g' \ + -e 's:@CFLAGS@:${CFLAGS}:g' \ + -e 's:@GMAKE@:${GMAKE}:g' \ + -e 's:@PREFIX@:${PREFIX}:g' \ + -e 's:@X11BASE@:${X11BASE}:g' \ + -e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g' \ + -e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g' \ + -e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g' \ + $$f > $$f.tmp; \ + ${MV} -f $$f.tmp $$f; \ done post-build: @@ -79,8 +84,8 @@ do-install: post-install: ${RM} -fr ${PREFIX}/lib/sather/System/Platforms/dualgui/dual_gui_server.code/ -.include "../../devel/boehm-gc/buildlink.mk" -.include "../../x11/tk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/boehm-gc/buildlink2.mk" +.include "../../x11/tk/buildlink2.mk" + .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" |