diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
| commit | b71a1d488b6b45e0a968a4c149990c25b6a09215 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /games | |
| parent | 624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff) | |
| download | pkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'games')
68 files changed, 160 insertions, 161 deletions
diff --git a/games/REminiscence/Makefile b/games/REminiscence/Makefile index 07ff884a1c0..f3016623570 100644 --- a/games/REminiscence/Makefile +++ b/games/REminiscence/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/08/08 00:10:21 dillo Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:15 rillig Exp $ # DISTNAME= REminiscence-0.1.6 @@ -11,7 +11,7 @@ HOMEPAGE= http://membres.lycos.fr/cyxdown/reminiscence/ COMMENT= Engine to play Flashback by Delphine Software BUILD_TARGET= rs -MAKE_ENV+= DEFINES="${DEFINES}" +MAKE_ENV+= DEFINES=${DEFINES:Q} .include "../../mk/endian.mk" .if ${MACHINE_ENDIAN} == "big" diff --git a/games/abuse/Makefile b/games/abuse/Makefile index ec8d144b7ea..c0b5bc4021a 100644 --- a/games/abuse/Makefile +++ b/games/abuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/15 18:27:50 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:15 rillig Exp $ DISTNAME= abuse_pd PKGNAME= abuse-2.0 @@ -13,7 +13,7 @@ COMMENT= Full color 320x200 arcade quality platform shooter USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${X11_LDFLAGS}" +CONFIGURE_ENV+= LDFLAGS=${X11_LDFLAGS:Q} USE_TOOLS+= gmake gtar USE_LANGUAGES+= c c++ diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 6ce0c4c2d25..6c593557739 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/11/10 06:30:53 rillig Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:15 rillig Exp $ # DISTNAME= angband-3.0.3 @@ -16,7 +16,7 @@ CONFLICTS= angband-tty-[0-9]* EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* INCOMPAT_CURSES+= NetBSD-1.6[A-M]-* SPOILERFILE= angband-spoilers.tar.gz diff --git a/games/colchess-book-colchess/Makefile b/games/colchess-book-colchess/Makefile index 0f3ba4b28e0..9a13d57d07a 100644 --- a/games/colchess-book-colchess/Makefile +++ b/games/colchess-book-colchess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $ DISTNAME= colchess PKGNAME= ${CHESS_ENGINE}-book-${DIST_SUBDIR} @@ -20,8 +20,8 @@ DIST_SUBDIR= colchess-7.0 NO_CONFIGURE= yes NO_BUILD= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/share/${CHESS_ENGINE} BOOK_FILE= book.dat diff --git a/games/colchess-book-large/Makefile b/games/colchess-book-large/Makefile index 1190b4e27bf..6974a13a0d6 100644 --- a/games/colchess-book-large/Makefile +++ b/games/colchess-book-large/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $ DISTNAME= book_large PKGNAME= ${CHESS_ENGINE}-book-large-20000512 @@ -18,8 +18,8 @@ CHESS_ENGINE= colchess DIST_SUBDIR= chessbooks NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/share/${CHESS_ENGINE} BOOK_FILE= book.dat diff --git a/games/colchess/Makefile b/games/colchess/Makefile index a3fd4ccc26c..e3cc2c2820e 100644 --- a/games/colchess/Makefile +++ b/games/colchess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/11/10 06:32:38 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:15 rillig Exp $ DISTNAME= colchess PKGNAME= ${DISTNAME}-7.0 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.ast.cam.ac.uk/~cmf/chess/colchess/ COMMENT= Chess analysis engine DIST_SUBDIR= ${PKGNAME_NOREV} -MAKE_ENV+= PREFIX="${PREFIX}" +MAKE_ENV+= PREFIX=${PREFIX:Q} NO_CONFIGURE= yes WRKSRC= ${WRKDIR}/ColChess diff --git a/games/crafty-book-medium/Makefile b/games/crafty-book-medium/Makefile index 284c1fbeefb..630184712d5 100644 --- a/games/crafty-book-medium/Makefile +++ b/games/crafty-book-medium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:15 rillig Exp $ DISTNAME= medium PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511 @@ -18,8 +18,8 @@ CHESS_ENGINE= crafty DIST_SUBDIR= chessbooks NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE} PGN_FILE= book.txt diff --git a/games/crafty-book-small/Makefile b/games/crafty-book-small/Makefile index 68741b74224..b88b072c5f1 100644 --- a/games/crafty-book-small/Makefile +++ b/games/crafty-book-small/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:15 rillig Exp $ DISTNAME= small PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511 @@ -18,8 +18,8 @@ CHESS_ENGINE= crafty DIST_SUBDIR= chessbooks NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE} PGN_FILE= ${DISTNAME}.txt diff --git a/games/crafty-doc/Makefile b/games/crafty-doc/Makefile index 3f893350b81..4b33c151a49 100644 --- a/games/crafty-doc/Makefile +++ b/games/crafty-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:15 rillig Exp $ DISTNAME= crafty-doc-18.0 CATEGORIES= games @@ -8,7 +8,7 @@ DISTFILES= crafty.doc.ps MAINTAINER= tech-pkg@NetBSD.org COMMENT= Documentation for Crafty chess engine -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes diff --git a/games/crafty/Makefile b/games/crafty/Makefile index d5644711dcb..5236b7b07c5 100644 --- a/games/crafty/Makefile +++ b/games/crafty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:15 rillig Exp $ DISTNAME= crafty-18.15 CATEGORIES= games @@ -46,7 +46,7 @@ BUILD_TARGET= generic CRAFTY_OPTS= -DBOOKDIR=\\\"${BOOKDIR}\\\" CRAFTY_OPTS+= -DTBDIR=\\\"${TBDIR}\\\" -MAKE_ENV+= opt="${CRAFTY_OPTS}" +MAKE_ENV+= opt=${CRAFTY_OPTS:Q} BOOKDIR= ${PREFIX}/lib/crafty TBDIR= ${PREFIX}/share/egtb diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index d8183466bf9..002b036a517 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:15 rillig Exp $ DISTNAME= dopewars-1.5.10 CATEGORIES= games @@ -22,8 +22,8 @@ CONFIGURE_ARGS+= --without-esd CONFIGURE_ARGS+= --without-sdl CONFIGURE_ARGS+= --localstatedir=${VARBASE}/games -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* -INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-* .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/games/exchess-book-medium/Makefile b/games/exchess-book-medium/Makefile index 173d9f7cf72..2e18dc92b68 100644 --- a/games/exchess-book-medium/Makefile +++ b/games/exchess-book-medium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $ DISTNAME= medium PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511 @@ -18,8 +18,8 @@ CHESS_ENGINE= exchess DIST_SUBDIR= chessbooks NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE} PGN_FILE= book.txt diff --git a/games/exchess-book-small/Makefile b/games/exchess-book-small/Makefile index 399774a380c..872dfd137fb 100644 --- a/games/exchess-book-small/Makefile +++ b/games/exchess-book-small/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:15 rillig Exp $ DISTNAME= small PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511 @@ -18,8 +18,8 @@ CHESS_ENGINE= exchess DIST_SUBDIR= chessbooks NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE} PGN_FILE= ${DISTNAME}.txt diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile index 71d5710bd1a..478aa354f3c 100644 --- a/games/fillets-ng/Makefile +++ b/games/fillets-ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/09/04 05:00:36 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:15 rillig Exp $ # DISTNAME= fillets-ng-0.6.0 @@ -15,7 +15,7 @@ DEPENDS+= fillets-ng-data-0.6.1:../../games/fillets-ng-data GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -SUBST_CLASSES= man +SUBST_CLASSES+= man SUBST_STAGE.man= post-patch SUBST_FILES.man= fillets.6 SUBST_MESSAGE.man= "Fixing documentation path in the manual page." diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo index b3f88e6a7f4..07598316ded 100644 --- a/games/fkiss/distinfo +++ b/games/fkiss/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2005/06/16 13:05:55 hira Exp $ +$NetBSD: distinfo,v 1.9 2005/12/05 20:50:16 rillig Exp $ SHA1 (fkiss-0.33.tar.gz) = df07895a6b2053ca505dce49f5a6ac3f745f4386 RMD160 (fkiss-0.33.tar.gz) = a34f3fba759e64079b4926926af368c502dc35ae @@ -8,6 +8,6 @@ RMD160 (fkiss-0.33a.diff) = f0d221efc08a4ad27312493def0911698909770d Size (fkiss-0.33a.diff) = 8909 bytes SHA1 (patch-ab) = b22fcd06b72b85ae413ecb970e43d76532ecc65e SHA1 (patch-ac) = db3e28fec1a4b1a7ff620023bbf6cf70b6dd99af -SHA1 (patch-ad) = b6d7f79864a48e4dfb52c30cd9d31c1bbe069a34 +SHA1 (patch-ad) = f2a63883a36a53215253c3cd0c30ce1f4b759401 SHA1 (patch-ae) = 4eafc6445da6d2512cfc66df88015287320a6fc6 SHA1 (patch-af) = 68ede499a9747228497c91ae462504ff94097c38 diff --git a/games/fkiss/patches/patch-ad b/games/fkiss/patches/patch-ad index fb3708d2f6f..ef8bf0d3cc9 100644 --- a/games/fkiss/patches/patch-ad +++ b/games/fkiss/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2003/12/04 03:22:49 ben Exp $ +$NetBSD: patch-ad,v 1.5 2005/12/05 20:50:16 rillig Exp $ --- sound.c.orig 2001-11-11 23:05:37.000000000 -0800 +++ sound.c -@@ -57,6 +57,12 @@ char id_sound[] = "$Id: sound.c,v 1.21 2 +@@ -57,6 +57,12 @@ # include <machine/soundcard.h> #endif diff --git a/games/fortunes-calvin/DESCR b/games/fortunes-calvin/DESCR index c8792d2da6e..1f8c2c37d7d 100644 --- a/games/fortunes-calvin/DESCR +++ b/games/fortunes-calvin/DESCR @@ -1,2 +1,2 @@ A compilation of quotes from Bill Watterson's fantastic "Calvin and Hobbes" -Comic Books. +Comic Books. diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index 0a1072aedb0..785a7640b69 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/08/24 10:45:32 adam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:16 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} COMMENT= Freeciv client with Xaw interface @@ -11,7 +11,7 @@ CONFLICTS= freeciv-client-gtk<=1.11.4 CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --disable-server -.include "../freeciv-share/Makefile.common" +.include "../../games/freeciv-share/Makefile.common" .include "options.mk" diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 586035834e8..b156c8bdcb6 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/08/24 10:43:32 adam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:16 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} COMMENT= Freeciv game server @@ -12,9 +12,9 @@ CONFIGURE_ARGS+= --with-readline LIBS+= -ltermcap # Uses rl_filename_completion_function() which was introduced in readline-4.2 -BUILDLINK_DEPENDS.readline= readline>=4.2 +BUILDLINK_DEPENDS.readline+= readline>=4.2 -.include "../freeciv-share/Makefile.common" +.include "../../games/freeciv-share/Makefile.common" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile index 13326993a30..146f46728fb 100644 --- a/games/freeciv-sounds/Makefile +++ b/games/freeciv-sounds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/08/24 10:44:07 adam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:16 rillig Exp $ DISTNAME= stdsounds3 PKGNAME= freeciv-sounds-3.0 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.freeciv.org/ COMMENT= Freeciv sound sets -DEPENDS= freeciv-share-[0-9]*:../../games/freeciv-share +DEPENDS+= freeciv-share-[0-9]*:../../games/freeciv-share WRKSRC= ${WRKDIR}/data NO_BUILD= yes diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile index 20b04b52110..d04a0004de0 100644 --- a/games/frozen-bubble/Makefile +++ b/games/frozen-bubble/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/17 15:21:57 tonio Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:16 rillig Exp $ # DISTNAME= frozen-bubble-1.0.0 @@ -15,7 +15,7 @@ DEPENDS+= p5-SDL>=1.19.2:../../devel/p5-SDL USE_TOOLS+= gmake perl:run -MAKE_ENV+= PERL5="${PERL5}" CP="${CP}" INSTALLDIRS="vendor" +MAKE_ENV+= PERL5=${PERL5:Q} CP=${CP:Q} INSTALLDIRS="vendor" REPLACE_PERL= frozen-bubble* PERL5_PACKLIST= auto/fb_c_stuff/.packlist diff --git a/games/genecys-client/Makefile b/games/genecys-client/Makefile index ad1a7631d9e..fd66c5b37dd 100644 --- a/games/genecys-client/Makefile +++ b/games/genecys-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/23 04:02:48 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:16 rillig Exp $ # DISTNAME= genecys-0.2 @@ -11,7 +11,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.genecys.org/ COMMENT= Client for Genecys MMORPG -DEPENDS= genecys-data>=0.2:../../games/genecys-data +DEPENDS+= genecys-data>=0.2:../../games/genecys-data GNU_CONFIGURE= yes #CONFIGURE_DIRS= ${WRKSRC}/common ${WRKSRC}/client diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile index c7bfaf6d353..8c5b8f2f09a 100644 --- a/games/glaxium/Makefile +++ b/games/glaxium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:16 rillig Exp $ # DISTNAME= glaxium_0.5 @@ -17,7 +17,7 @@ USE_LANGUAGES= c c++ BUILD_TARGET= glaxium -SUBST_CLASSES= bill +SUBST_CLASSES+= bill SUBST_STAGE.bill= post-configure SUBST_FILES.bill= conf.h SUBST_SED.bill= -e "s,share\/games,share,g" diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index 468c753fef1..f61cbf735b4 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2005/12/05 20:50:16 rillig Exp $ DISTNAME= gnome-games-2.12.1 PKGREVISION= 1 @@ -26,7 +26,7 @@ USE_PKGINSTALL= yes INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL GNU_CONFIGURE= yes -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE} # This package installs files in sysconfdir but does not read them directly, # so the following configuration argument is safe. @@ -39,9 +39,8 @@ CONF_FILES= sound/events/iagno.soundlist CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile} .endfor -.undef conffile -FILES_SUBST+= INSTALL="${INSTALL}" +FILES_SUBST+= INSTALL=${INSTALL:Q} GCONF2_SCHEMAS= aisleriot.schemas GCONF2_SCHEMAS+= blackjack.schemas diff --git a/games/gnuchess-book-medium/Makefile b/games/gnuchess-book-medium/Makefile index c6f21fd3ef2..3ec2e44f190 100644 --- a/games/gnuchess-book-medium/Makefile +++ b/games/gnuchess-book-medium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:16 rillig Exp $ DISTNAME= medium PKGNAME= ${CHESS_ENGINE}-book-${DISTNAME}-20000511 @@ -19,8 +19,8 @@ CHESS_ENGINE= gnuchess DIST_SUBDIR= chessbooks NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE} PGN_FILE= book.txt diff --git a/games/gnuchess-book/Makefile b/games/gnuchess-book/Makefile index 9ba2cbaf83d..2b5c511810d 100644 --- a/games/gnuchess-book/Makefile +++ b/games/gnuchess-book/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:16 rillig Exp $ # DISTNAME= book_1.01.pgn @@ -19,8 +19,8 @@ WRKSRC= ${WRKDIR} CHESS_ENGINE= gnuchess NO_CONFIGURE= yes -PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE} -PLIST_SUBST+= BOOK_FILE=${BOOK_FILE} +PLIST_SUBST+= CHESS_ENGINE=${CHESS_ENGINE:Q} +PLIST_SUBST+= BOOK_FILE=${BOOK_FILE:Q} BOOKDIR= ${PREFIX}/lib/${CHESS_ENGINE} PGN_FILE= ${DISTNAME} diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile index 345805b60e4..625e6d15849 100644 --- a/games/gtkballs/Makefile +++ b/games/gtkballs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:16 rillig Exp $ DISTNAME= gtkballs-3.1.5 CATEGORIES= games @@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE}/games USE_TOOLS+= gmake USE_PKGLOCALEDIR= yes -PLIST_SUBST+= VARBASE=${VARBASE} +PLIST_SUBST+= VARBASE=${VARBASE:Q} post-install: ${MV} ${PREFIX}/man/man6/gtkballs.6x ${PREFIX}/man/man6/gtkballs.6 diff --git a/games/hugo/Makefile b/games/hugo/Makefile index c22d7ae8431..2ba71fe8d6f 100644 --- a/games/hugo/Makefile +++ b/games/hugo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:16 rillig Exp $ # DISTNAME= hugov31_unix_source @@ -16,8 +16,8 @@ SITES_hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/} DIST_SUBDIR= ${PKGNAME_NOREV} USE_TOOLS+= gmake # uses halfkey (present since 1.6M) -INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6 NetBSD-1.6.* -INCOMPAT_CURSES+= NetBSD-1.6[A-L]* +INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-* NetBSD-1.6.*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-L]*-* WRKSRC= ${WRKDIR}/hugov3.1.02 LIBDIR= ${PREFIX}/share/hugo diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile index d9ffa1037cb..b63e55900b5 100644 --- a/games/icebreaker/Makefile +++ b/games/icebreaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:16 rillig Exp $ # DISTNAME= icebreaker-1.9.7 @@ -13,7 +13,7 @@ COMMENT= Penguin capturing simulation USE_TOOLS+= gmake MAKE_ENV+= mandir="${PREFIX}/man" highscoredir="/var/games" -MAKE_ENV+= prefix="${PREFIX}" +MAKE_ENV+= prefix=${PREFIX:Q} INSTALLATION_DIRS= bin man/man6 diff --git a/games/knightcap-brain/Makefile b/games/knightcap-brain/Makefile index 981cac89870..8779b817576 100644 --- a/games/knightcap-brain/Makefile +++ b/games/knightcap-brain/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:16 rillig Exp $ DISTNAME= new_brain PKGNAME= knightcap-brain-19980616 @@ -13,7 +13,7 @@ COMMENT= Book of losing moves for KnightCap ONLY_FOR_PLATFORMS= *-*-i386 WRKSRC= ${WRKDIR} -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_ONLY= # empty NO_CONFIGURE= yes diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile index f99b53aed73..1b9fb369f59 100644 --- a/games/knightcap/Makefile +++ b/games/knightcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:54 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:16 rillig Exp $ DISTNAME= KnightCap-3.6 PKGNAME= knightcap-3.6 @@ -15,7 +15,7 @@ BUILD_TARGET= KnightCap WRKSRC= ${WRKDIR}/Export MAKE_ENV+= MESA=${BUILDLINK_PREFIX.MesaLib} -MAKE_ENV+= DEFINES="${DEFINES}" +MAKE_ENV+= DEFINES=${DEFINES:Q} DEFINES= -DTB_DIR=\\\"${TBDIR}\\\" diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index e134e212403..4115b9073d7 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:51 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:16 rillig Exp $ DISTNAME= lbreakout-010315 PKGREVISION= 5 @@ -10,7 +10,7 @@ HOMEPAGE= http://lgames.sourceforge.net/ COMMENT= Breakout-style arcade game GNU_CONFIGURE= YES -CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS:Q} CONFIGURE_ARGS+= --disable-sound .include "../../devel/SDL/buildlink3.mk" diff --git a/games/level9/Makefile b/games/level9/Makefile index a0c542200ef..bfa7b8afc30 100644 --- a/games/level9/Makefile +++ b/games/level9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/01 14:39:45 dillo Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:16 rillig Exp $ DISTNAME= Level9_4.0_Source PKGNAME= level9-4.0 @@ -12,8 +12,8 @@ COMMENT= Curses port of the Level 9 text adventure interpreter WRKSRC= ${WRKDIR}/Unix # uses halfkey (present since 1.6M) -INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6-* NetBSD-1.6.* -INCOMPAT_CURSES+= NetBSD-1.6[A-L]* +INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]*-* NetBSD-1.5*-* NetBSD-1.6-* NetBSD-1.6.*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-L]*-* INSTALLATION_DIRS= bin diff --git a/games/maelstrom-sdl/Makefile b/games/maelstrom-sdl/Makefile index b192b77fd30..b4f5d91b806 100644 --- a/games/maelstrom-sdl/Makefile +++ b/games/maelstrom-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:51 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= Maelstrom-3.0.5 @@ -15,7 +15,7 @@ CONFLICTS= maelstrom-x11-[0-9]* maelstrom-[0-9]* GNU_CONFIGURE= YES -MAKE_ENV+= CP=${CP} +MAKE_ENV+= CP=${CP:Q} post-install: ${RM} ${PREFIX}/share/doc/Maelstrom/Docs/Makefile \ diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile index 57d850f838e..2481db04f7a 100644 --- a/games/maelstrom-x11/Makefile +++ b/games/maelstrom-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:52 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:17 rillig Exp $ DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz PKGNAME= maelstrom-x11-2.0.6 @@ -22,7 +22,7 @@ EXTRACT_ONLY= ${DISTNAME} WRKSRC= ${WRKDIR}/Maelstrom USE_X11BASE= YES -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${BUILDLINK_PREFIX.xpm} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.xpm} post-install: cd ${PREFIX}/share/maelstrom && \ diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index f91027af791..f738f16a4e3 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2005/11/24 20:32:34 rillig Exp $ +# $NetBSD: Makefile,v 1.47 2005/12/05 20:50:17 rillig Exp $ # -.include "../nethack-lib/Makefile.common" +.include "../../games/nethack-lib/Makefile.common" PKGNAME= nethack-qt-${NETHACK_VERSION} PKGREVISION= 3 diff --git a/games/nethack-tty/Makefile b/games/nethack-tty/Makefile index 2a8063540b0..b7f190f4446 100644 --- a/games/nethack-tty/Makefile +++ b/games/nethack-tty/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2005/09/22 14:55:07 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:17 rillig Exp $ # -.include "../nethack-lib/Makefile.common" +.include "../../games/nethack-lib/Makefile.common" PKGNAME= nethack-tty-${NETHACK_VERSION} PKGREVISION= 1 diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile index 6889a036c65..4d780f0d5f8 100644 --- a/games/nethack-x11/Makefile +++ b/games/nethack-x11/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2005/11/24 20:33:38 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:17 rillig Exp $ # -.include "../nethack-lib/Makefile.common" +.include "../../games/nethack-lib/Makefile.common" PKGNAME= nethack-x11-${NETHACK_VERSION} PKGREVISION= 1 diff --git a/games/nethack/Makefile b/games/nethack/Makefile index 596b7007be5..d0a31875599 100644 --- a/games/nethack/Makefile +++ b/games/nethack/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2005/09/22 14:55:07 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:17 rillig Exp $ # Needed so configure/patch rules don't get pulled in NO_BUILD= yes NO_CONFIGURE= yes -.include "../nethack-lib/Makefile.common" +.include "../../games/nethack-lib/Makefile.common" DISTNAME= nethack-all-${NETHACK_VERSION} CATEGORIES+= x11 diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index e9b675bfd20..9c692208026 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= nighthawk-2.1 @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/nighthawk USE_TOOLS+= gmake USE_LANGUAGES= c c++ -MAKE_ENV+= OSTYPE=${OPSYS} +MAKE_ENV+= OSTYPE=${OPSYS:Q} CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" \ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" \ -DVARBASE="\"${VARBASE}\"" diff --git a/games/openttd/Makefile b/games/openttd/Makefile index 7112adc8bb0..343cea10ca1 100644 --- a/games/openttd/Makefile +++ b/games/openttd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/09/26 16:35:05 rpaulo Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:17 rillig Exp $ DISTNAME= openttd-0.4.0.1-source PKGNAME= openttd-0.4.0.1 @@ -14,14 +14,14 @@ USE_TOOLS+= gmake pkg-config DATA_DIR= ${PREFIX}/share/games/openttd -MAKE_ENV+= PREFIX=${PREFIX} +MAKE_ENV+= PREFIX=${PREFIX:Q} MAKE_ENV+= INSTALL=1 MAKE_ENV+= BINARY_DIR=bin MAKE_ENV+= DATA_DIR=share/games/openttd MAKE_ENV+= USE_HOMEDIR=1 MAKE_ENV+= PERSONAL_DIR=.openttd MAKE_ENV+= WITH_NETWORK=1 -MAKE_ENV+= X11BASE=${X11BASE} +MAKE_ENV+= X11BASE=${X11BASE:Q} WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile index b8e92236321..fb9497d63d8 100644 --- a/games/powermanga/Makefile +++ b/games/powermanga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/12 08:41:56 hira Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= powermanga-0.79 @@ -13,7 +13,7 @@ COMMENT= Arcade 2D shoot-em-up game GNU_CONFIGURE= yes CONFIGURE_ARGS+= --localstatedir=${VARBASE} -MAKE_ENV+= TOUCH=${TOUCH} WRKSRC=${WRKSRC} +MAKE_ENV+= TOUCH=${TOUCH:Q} WRKSRC=${WRKSRC:Q} .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile index 377e8b059f1..6a049aaa083 100644 --- a/games/qnetwalk/Makefile +++ b/games/qnetwalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/10/20 11:38:20 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= qnetwalk-1.2 @@ -27,7 +27,7 @@ do-configure: (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qnetwalk.pro) # Fix hardcoded paths -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_MESSAGE.path= "Fixing hardcoded paths." SUBST_STAGE.path= pre-configure SUBST_FILES.path= qnetwalk.pro main.cpp mainwindow.cpp diff --git a/games/quake/Makefile b/games/quake/Makefile index ced2b632829..f080ddd296d 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:17 rillig Exp $ DISTNAME= q1source PKGNAME= quake-2.30 @@ -18,11 +18,11 @@ ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR} USE_TOOLS+= gmake -MAKE_ENV+= MAINDIR=${WRKSRC} +MAKE_ENV+= MAINDIR=${WRKSRC:Q} MAKE_ENV+= MESA_DIR=${BUILDLINK_PREFIX.Mesa} -MAKE_ENV+= X11BASE=${X11BASE} +MAKE_ENV+= X11BASE=${X11BASE:Q} LDFLAGS+= ${LIBOSSAUDIO} diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index 29dc1bd177a..b89ea470c38 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/08/10 01:33:48 xtraeme Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= quake2-0.3 @@ -25,7 +25,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/docs/README* ${PREFIX}/share/doc/quake2forge ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/quake2forge -SUBST_CLASSES= snd data +SUBST_CLASSES+= snd data SUBST_STAGE.snd= post-patch SUBST_FILES.snd= src/snd.c SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g" diff --git a/games/quake6/Makefile b/games/quake6/Makefile index 2644b2e1273..fef3ed78d44 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:52 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:17 rillig Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -10,7 +10,7 @@ MAINTAINER= itojun@kame.net HOMEPAGE= http://www.viagenie.qc.ca/en/ipv6-quake.shtml COMMENT= Quake over IPv6 -DEPENDS= quakedata-[0-9]*:../../games/quakedata +DEPENDS+= quakedata-[0-9]*:../../games/quakedata WRKSRC= ${WRKDIR}/quakeforge @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes BUILD_DEFS+= USE_INET6 .include "../../mk/bsd.prefs.mk" .if !(defined(USE_INET6) && ${USE_INET6} == "YES") -PKG_FAIL_REASON= "${PKGNAME} requires IPv6 support" +PKG_FAIL_REASON+= "${PKGNAME} requires IPv6 support" .endif # "bindir" setting is very non-standard for GNU autoconf diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 32636b5f673..f6075dfa36b 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/08/16 15:35:51 adam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:17 rillig Exp $ DISTNAME= rocksndiamonds-3.1.1 CATEGORIES= games x11 @@ -14,7 +14,7 @@ USE_TOOLS+= gmake INSTALLATION_DIRS= man/man6 PLIST_SRC= ${WRKDIR}/PLIST ../rocksndiamonds/PLIST -PLIST_SUBST+= SCORE_PATH=${SCORE_PATH} +PLIST_SUBST+= SCORE_PATH=${SCORE_PATH:Q} PLIST_SUBST+= ROCK_INSTALL_DIR="${INSTALL} -d -o ${RND_USER} -g ${RND_GROUP} -m 775" PKG_GROUPS= ${RND_GROUP} diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index f9c02ff4157..67136ed1d85 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/07/15 18:27:51 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:17 rillig Exp $ DISTNAME= Rollemup PKGNAME= rollemup-1.0 @@ -37,8 +37,8 @@ ONLY_FOR_PLATFORM= *-*-i386 .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -DEPENDS= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 +DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 CHECK_SHLIBS= no .endif @@ -61,7 +61,7 @@ do-install: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @(cd ${PREFIX}; \ ${FIND} ${GAMES_DIR}/Rollemup -type f -print >> ${PLIST_SRC}; \ - for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | sort -r`; do \ + for DIR in `${FIND} ${GAMES_DIR}/Rollemup -type d -print | ${SORT} -r`; do \ ${ECHO} "@dirrm $$DIR" >> ${PLIST_SRC}; \ done) @${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/Rollemup diff --git a/games/sarien/Makefile b/games/sarien/Makefile index 2c5abe4183d..a944d63fd79 100644 --- a/games/sarien/Makefile +++ b/games/sarien/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:55 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= sarien-0.7.0 @@ -14,7 +14,7 @@ GNU_CONFIGURE= YES USE_PKGINSTALL= YES USE_TOOLS+= gmake -CONFIGURE_ARGS= --with-sdl +CONFIGURE_ARGS+= --with-sdl CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" EGDIR= ${PREFIX}/share/examples/sarien diff --git a/games/sjeng/Makefile b/games/sjeng/Makefile index fec91267b16..be9631859ba 100644 --- a/games/sjeng/Makefile +++ b/games/sjeng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:57 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $ DISTNAME= Sjeng-Free-11.0 PKGNAME= sjeng-11.0 @@ -24,7 +24,7 @@ DOCDIR= ${PREFIX}/share/doc/sjeng EGDIR= ${PREFIX}/share/examples/sjeng .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" -GCC_REQD= 3.0 +GCC_REQD+= 3.0 .endif post-build: diff --git a/games/sl/Makefile b/games/sl/Makefile index 20caa5d8d26..c99da088920 100644 --- a/games/sl/Makefile +++ b/games/sl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/07/24 18:24:45 kristerw Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $ # DISTNAME= sl @@ -17,7 +17,7 @@ COMMENT= Animated SL that runs across the terminal when you type `sl' DIST_SUBDIR= ${PKGNAME_NOREV} -BUILD_DEPENDS= nkf-[0-9]*:../../converters/nkf +BUILD_DEPENDS+= nkf-[0-9]*:../../converters/nkf INSTALLATION_DIRS= bin man/ja_JP.EUC/man1 diff --git a/games/spider/Makefile b/games/spider/Makefile index 8d72d06e435..0e68ab34d5c 100644 --- a/games/spider/Makefile +++ b/games/spider/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/05/12 21:56:52 grant Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:18 rillig Exp $ DISTNAME= spider PKGNAME= spider-1.1 @@ -6,7 +6,7 @@ CATEGORIES= games x11 MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/ MAINTAINER= tech-pkg@NetBSD.org -COMMENT= solitaire card game from xcontrib +COMMENT= Solitaire card game from xcontrib USE_IMAKE= yes INSTALL_TARGET= install install.doc diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile index 3fe0db01ada..7158826ee38 100644 --- a/games/tileworld/Makefile +++ b/games/tileworld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:52 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:18 rillig Exp $ DISTNAME= tworld-1.2.1 PKGNAME= ${DISTNAME:S/^t/tile/} @@ -15,7 +15,7 @@ GNU_CONFIGURE= YES BUILD_TARGET= tworld -MAKE_ENV+= ECHO="${ECHO}" DATE="${DATE}" +MAKE_ENV+= ECHO=${ECHO:Q} DATE=${DATE:Q} .include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile index 7efce3744a3..5777766375e 100644 --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/02 23:02:06 reed Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:18 rillig Exp $ # DISTNAME= tuxracer-0.61 @@ -19,7 +19,7 @@ GNU_CONFIGURE= YES CFLAGS+= -DGLX_GLXEXT_PROTOTYPES CONFIGURE_ARGS+= --with-data-dir=${PREFIX}/share/tuxracer CONFIGURE_ARGS+= --with-tcl-libs=${BUILDLINK_PREFIX.tcl}/lib -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" +CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} post-install: @-${MKDIR} ${PREFIX}/share/doc/html/tuxracer ${PREFIX}/share/examples/tuxracer ${PREFIX}/share/tuxracer diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index c1cc0a956d7..9259ea12e4c 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/10/20 10:41:09 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:18 rillig Exp $ DISTNAME= wesnoth-1.0.1 CATEGORIES= games @@ -14,8 +14,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} UNLIMIT_RESOURCES+= datasize -BUILDLINK_DEPENDS.SDL= SDL>=1.2.7 -BUILDLINK_DEPENDS.SDL_mixer= SDL_mixer>=1.2.5nb3 +BUILDLINK_DEPENDS.SDL+= SDL>=1.2.7 +BUILDLINK_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb3 .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile index e1bf8b39f97..2967317a931 100644 --- a/games/xarchon/Makefile +++ b/games/xarchon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:52 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/05 20:50:18 rillig Exp $ # DISTNAME= xarchon-0.60 @@ -18,7 +18,7 @@ USE_LANGUAGES= c c++ .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= CC="${CC}" +CONFIGURE_ENV+= CC=${CC:Q} .endif #HF#DEPENDS+= glade-[0-9]*:../../devel/glade diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 9f6b62c6731..16578105571 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/09/28 20:52:22 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xboard-4.2.6 PKGREVISION= 2 @@ -11,7 +11,7 @@ COMMENT= Graphical frontend for chess engines and servers CONFIGURE_ARGS+= --enable-xpm CONFIGURE_ARGS+= --enable-zippy # interface to ICS -CONFIGURE_ENV+= PERLPATH="${PERL5}" +CONFIGURE_ENV+= PERLPATH=${PERL5:Q} GNU_CONFIGURE= yes USE_TOOLS+= perl:run diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile index 214d3c13565..8910e2e4424 100644 --- a/games/xbomb/Makefile +++ b/games/xbomb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:52 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xbomb-2.1a CATEGORIES= games x11 @@ -13,7 +13,7 @@ COMMENT= Square, hexagonal, and triangual minesweeper clone USE_TOOLS+= gmake BUILD_TARGET= xbomb -MAKE_ENV+= SCORE_PATH="${SCORE_PATH}" +MAKE_ENV+= SCORE_PATH=${SCORE_PATH:Q} SCORE_PATH= ${VARBASE}/games/xbomb SCORE_USER= games @@ -21,7 +21,7 @@ SCORE_GROUP= games PKG_USERS= ${SCORE_USER}:${SCORE_GROUP} PKG_GROUPS= ${SCORE_GROUP} -PLIST_SUBST+= SCORE_PATH=${SCORE_PATH} +PLIST_SUBST+= SCORE_PATH=${SCORE_PATH:Q} PLIST_SUBST+= GAME_DIR="${INSTALL} -d -o ${SCORE_USER} -g ${SCORE_GROUP} -m 775" .include "../../mk/x11.buildlink3.mk" diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 71a344f3c63..230ff7080f9 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:03 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xconq-7.4.1 PKGREVISION= 4 @@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib" -MAKE_ENV+= LOCALBASE="${LOCALBASE}" +MAKE_ENV+= LOCALBASE=${LOCALBASE:Q} USE_MAKEINFO= YES INFO_FILES= hacking.info xcdesign.info xconq.info diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile index 299b92d1330..f06b7f7c1c1 100644 --- a/games/xdoom/Makefile +++ b/games/xdoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/07/19 15:25:33 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 20:50:18 rillig Exp $ DISTNAME= linuxdoom-1.10 PKGNAME= xdoom-1.10 @@ -12,7 +12,7 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.idsoftware.com/archives/doomarc.html COMMENT= 3D shoot-em-up for 8-bit X11 displays -BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip +BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip LICENSE= xdoom-license @@ -21,11 +21,11 @@ EXTRACT_ONLY= doomsrc.zip EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY} USE_X11BASE= yes USE_TOOLS+= gmake gunzip -MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX} +MAKE_ENV+= X11BASE=${X11BASE:Q} INSTALL_PREFIX=${PREFIX:Q} .include "../../mk/bsd.prefs.mk" -.ifdef ${OPSYS} == "Linux" +.if ${OPSYS} == "Linux" CFLAGS+= -DLINUX .endif diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile index 542ca6d82fb..ebdf42daa22 100644 --- a/games/xemeraldia/Makefile +++ b/games/xemeraldia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xemeraldia-0.3 PKGNAME= xemeraldia-0.31 @@ -16,8 +16,8 @@ USE_IMAKE= yes BUILD_TARGET= xemeraldia GAMES_DIR= share/games -MAKE_ENV+= GAMES_DIR="${GAMES_DIR}" -PLIST_SUBST= GAMES_DIR="${GAMES_DIR}" +MAKE_ENV+= GAMES_DIR=${GAMES_DIR:Q} +PLIST_SUBST= GAMES_DIR=${GAMES_DIR:Q} post-install: @${INSTALL_DATA_DIR} ${PREFIX}/${GAMES_DIR}/xemeraldia diff --git a/games/xemeraldia/PLIST b/games/xemeraldia/PLIST index d513dda7b0c..572a7c3368a 100644 --- a/games/xemeraldia/PLIST +++ b/games/xemeraldia/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2002/06/26 10:29:43 seb Exp $ +@comment $NetBSD: PLIST,v 1.5 2005/12/05 20:50:18 rillig Exp $ bin/xemeraldia lib/X11/app-defaults/XEmeraldia @exec ${MKDIR} %D/${GAMES_DIR}/xemeraldia @exec touch -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores @exec ${CHMOD} 666 %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores @unexec ${RM} -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores -@unexec ${RMDIR} %D/${GAMES_DIR}/xemeraldia +@dirrm ${GAMES_DIR}/xemeraldia diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile index a78ba3f0879..c7f21cba7e9 100644 --- a/games/xgalaga/Makefile +++ b/games/xgalaga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/11/05 17:15:52 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xgalaga-2.0.34 PKGREVISION= 2 @@ -14,8 +14,8 @@ GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${PREFIX}/share/xgalaga CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/bin SETGIDGAME= yes -MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP} \ - GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE} +MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} GAMEGRP=${GAMEGRP:Q} \ + GAMEMODE=${GAMEMODE:Q} GAMEDATAMODE=${GAMEDATAMODE:Q} post-install: ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README diff --git a/games/xjump/Makefile b/games/xjump/Makefile index 784e2b506aa..ed417504008 100644 --- a/games/xjump/Makefile +++ b/games/xjump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/06 19:25:23 tonio Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xjump_2.7.5.orig PKGNAME= xjump-2.7.5 @@ -14,7 +14,7 @@ COMMENT= Jumping game for X WRKSRC= ${WRKDIR}/xjump-2.7.5.orig BUILD_TARGET= xjump INSTALLATION_DIRS= bin -MAKE_ENV+= VARBASE=${VARBASE} +MAKE_ENV+= VARBASE=${VARBASE:Q} do-install: ${INSTALL_GAME} ${WRKSRC}/xjump ${PREFIX}/bin/xjump diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index b4098af4546..55bb3e0c994 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/06/01 20:08:00 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xpuyopuyo-0.9.1 PKGREVISION= 5 @@ -18,7 +18,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-gnome # install desktop and pixmap files -CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}" +CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=${GNOME_CONFIG:Q} GNOME_CONFIG= ${WRKDIR}/gnome-config diff --git a/games/xroach/Makefile b/games/xroach/Makefile index 26cb51675ca..1c29732c42b 100644 --- a/games/xroach/Makefile +++ b/games/xroach/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/14 16:38:17 minskim Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:18 rillig Exp $ # DISTNAME= xroach @@ -12,8 +12,8 @@ COMMENT= Cockroaches hide under your windows DIST_SUBDIR= xroach-4.4 DECOMPRESS_CMD= ${CAT} -MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE} \ - MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE} +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q} \ + MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q} MANMODE=${MANMODE:Q} MANCOMPRESSED_IF_MANZ= yes .include "../../mk/x11.buildlink3.mk" diff --git a/games/xskat/Makefile b/games/xskat/Makefile index e16d703f13b..2ef8cf445fb 100644 --- a/games/xskat/Makefile +++ b/games/xskat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/03/24 21:12:54 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:18 rillig Exp $ DISTNAME= xskat-3.4 PKGREVISION= 1 @@ -14,7 +14,7 @@ USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" .if defined(DEFAULT_IRC_SERVER) -MAKE_ENV+= IRC_SERVER=${DEFAULT_IRC_SERVER} +MAKE_ENV+= IRC_SERVER=${DEFAULT_IRC_SERVER:Q} .else MAKE_ENV+= IRC_SERVER=irc.fu-berlin.de .endif diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile index a0646b5b230..9e39a6b0f1a 100644 --- a/games/xsoldier/Makefile +++ b/games/xsoldier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/08/19 18:12:37 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:18 rillig Exp $ # DISTNAME= xsoldier-0.96 @@ -13,7 +13,7 @@ USE_PKGINSTALL= YES USE_IMAKE= YES NO_INSTALL_MANPAGES= YES -MAKE_ENV+= BINOWN=${BINOWN} +MAKE_ENV+= BINOWN=${BINOWN:Q} CONF_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \ /var/games/xsoldier \ |