Fix inappropriate uses of ${LOCALBASE} or ${X11PREFIX} instead of

${PREFIX}.

11 files changed, 40 insertions, 40 deletions

diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index ea3d4bc3c12..2471f2526f3 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=	crossfire-client-1.0.0
@@ -20,7 +20,7 @@ CF_RAW=		client-0.95.2-raw-sounds.tgz
 USE_PERL5=	yes
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-sound-dir=${LOCALBASE}/share/cfclient/sounds
+CONFIGURE_ARGS+=	--with-sound-dir=${PREFIX}/share/cfclient/sounds
 PKGSRC_USE_TOOLS+=	gtar
 
 REPLACE_PERL=	utils/deftoheader.pl items.pl
@@ -35,13 +35,13 @@ pre-build:
 	cd ${WRKSRC} && ${MAKE} soundsdef.h
 
 post-install:
-	@${INSTALL_DATA_DIR} ${LOCALBASE}/share/cfclient
-	cd ${LOCALBASE}/share/cfclient && \
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/cfclient
+	cd ${PREFIX}/share/cfclient && \
 	    ${GZCAT} ${DISTDIR}/${CF_SND} | ${GTAR} xmf -
-	cd ${LOCALBASE}/share/cfclient && \
+	cd ${PREFIX}/share/cfclient && \
 	    ${GZCAT} ${DISTDIR}/${CF_RAW} | ${GTAR} xmf -
-	${INSTALL_DATA} ${WRKSRC}/def_keys ${LOCALBASE}/share/cfclient
-	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/cfclient
+	${INSTALL_DATA} ${WRKSRC}/def_keys ${PREFIX}/share/cfclient
+	@${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/share/cfclient
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index 79c41121f75..55133596e85 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -34,13 +34,13 @@ REPLACE_PERL+=	doc/include_html.pl doc/playbook/make_index.pl
 REPLACE_PERL+=	doc/spoiler-html/makeps.pl
 
 post-install:
-	cd ${LOCALBASE}/share/crossfire && \
+	cd ${PREFIX}/share/crossfire && \
 	    ${GZCAT} ${DISTDIR}/${CF_MAPS} | ${GTAR} xmf -
-	@${CHOWN} ${ROOT_USER}:games ${LOCALBASE}/bin/crossfire
-	@${CHMOD} 2755 ${LOCALBASE}/bin/crossfire
-	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/share/crossfire
-	@${CHOWN} -R ${ROOT_USER}:games ${LOCALBASE}/var/crossfire
-	@${CHMOD} -R g+w ${LOCALBASE}/var/crossfire
+	@${CHOWN} ${ROOT_USER}:games ${PREFIX}/bin/crossfire
+	@${CHMOD} 2755 ${PREFIX}/bin/crossfire
+	@${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/share/crossfire
+	@${CHOWN} -R ${ROOT_USER}:games ${PREFIX}/var/crossfire
+	@${CHMOD} -R g+w ${PREFIX}/var/crossfire
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 757247f5437..e567e1d081d 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=		freesci-0.3.4c
@@ -18,8 +18,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-ggi --without-directfb
 
 post-install:
-	${INSTALL_DATA_DIR} ${LOCALBASE}/share/examples/freesci
-	${INSTALL_DATA} ${FILESDIR}/config ${LOCALBASE}/share/examples/freesci
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/freesci
+	${INSTALL_DATA} ${FILESDIR}/config ${PREFIX}/share/examples/freesci
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index b536b9af1f4..2d973978060 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=	lbreakout2-2.5.2
 PKGREVISION=	1
@@ -10,8 +10,8 @@ HOMEPAGE=	http://lgames.sourceforge.net/
 COMMENT=	Breakout-style arcade game
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-highscore-path=${LOCALBASE}/share/games/ \
-			--with-docdir=${LOCALBASE}/share/doc/html
+CONFIGURE_ARGS+=	--with-highscore-path=${PREFIX}/share/games/ \
+			--with-docdir=${PREFIX}/share/doc/html
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index d889793d4d7..62d8dae0196 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:03 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=	scummvm-0.7.1
 CATEGORIES=	games
@@ -12,7 +12,7 @@ COMMENT=	LucasArts Script Creation Utility for Maniac Mansion
 USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 UNLIMIT_RESOURCES=	datasize
 
diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 958c93c6593..c9fa824993e 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/12 08:22:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=		tanked-0.90
@@ -10,12 +10,12 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Multiplayer internet tank game for X11
 
 USE_X11BASE=		YES
-USE_TOOLS+=		imake
+USE_TOOLS+=		imake gmake
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/client/tanked.man
 	@${MV} ${WRKSRC}/server/maps.list ${WRKSRC}/server/maps.list.bak
-	@${SED} -e 's@XXX@${X11PREFIX}/share/tanked/@' \
+	@${SED} -e 's@XXX@${PREFIX}/share/tanked/@' \
 		< ${WRKSRC}/server/maps.list.bak > ${WRKSRC}/server/maps.list
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 5d4d09b4ab3..75d9cfc8918 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=		xboing2.4
@@ -19,9 +19,9 @@ NO_INSTALL_MANPAGES=	YES
 MAKE_ENV+=		VARBASE=${VARBASE:Q}
 
 post-install:
-	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${X11PREFIX}/bin/xboing
-	${CHMOD} ${GAMEMODE} ${X11PREFIX}/bin/xboing
-	${INSTALL_MAN} ${WRKSRC}/xboing.man ${X11PREFIX}/man/man6/xboing.6
+	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/xboing
+	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xboing
+	${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index f87ac22cfa4..10362aa0cbf 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/06/16 06:57:56 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10
@@ -21,7 +21,7 @@ EXTRACT_ONLY=	doomsrc.zip
 EXTRACT_CMD=	unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
 USE_X11BASE=	yes
 USE_TOOLS+=	gmake
-MAKE_ENV+=	X11BASE=${X11BASE} INSTALL_PREFIX=${X11PREFIX}
+MAKE_ENV+=	X11BASE=${X11BASE} INSTALL_PREFIX=${PREFIX}
 
 PKGSRC_USE_TOOLS+=	gtar gunzip
 
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index fa46cab1f66..ccc11f81635 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/14 18:07:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=		xjig-2.4
@@ -16,7 +16,7 @@ USE_LANGUAGES=		c c++
 BUILD_TARGET=		xjig all
 
 post-install:
-	${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xjig
-	${INSTALL_DATA} ${WRKSRC}/tina.gif ${X11PREFIX}/lib/xjig
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/xjig
+	${INSTALL_DATA} ${WRKSRC}/tina.gif ${PREFIX}/lib/xjig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 5ab02344a92..726c64d478c 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=	xpipeman-1.5
@@ -16,9 +16,9 @@ INSTALLATION_DIRS=	bin man/man6
 
 do-install:
 	${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xpipeman \
-		${X11PREFIX}/bin/xpipeman
-	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${X11PREFIX}/man/man6/xpipeman.6
-	${INSTALL} -d -o bin -g games -m 0775 ${X11PREFIX}/share/xpipeman
+		${PREFIX}/bin/xpipeman
+	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/man/man6/xpipeman.6
+	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/xpipeman
 	if [ ! -r /var/games/xpipescores ]; then \
 		${INSTALL} -o bin -g games -m 0664 ${WRKSRC}/xpipescores /var/games ; \
 	fi
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 927fb5baff1..3139be0d66a 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:53 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=	zoom-1.0.1
@@ -26,7 +26,7 @@ GCC_REQD+=		3.0
 .endif
 UNLIMIT_RESOURCES+=	datasize
 
-DOCDIR=			${LOCALBASE}/share/doc/html/zoom
+DOCDIR=			${PREFIX}/share/doc/html/zoom
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	for f in colours.png configXwin.html configmac.html fonts.png \