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

${PREFIX}.

7 files changed, 21 insertions, 21 deletions

diff --git a/lang/SmartEiffel/Makefile b/lang/SmartEiffel/Makefile
index dafeea97f25..3351c736bbb 100644
--- a/lang/SmartEiffel/Makefile
+++ b/lang/SmartEiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/28 15:16:06 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	se
 PKGNAME=	SmartEiffel-2.0
@@ -31,6 +31,6 @@ post-build:
 	${RM} -f ${WRKSRC}/sys/system.se~
 
 do-install:
-	${CP} -r ${WRKSRC} ${LOCALBASE}
+	${CP} -r ${WRKSRC} ${PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index 4c7e13be3e8..4d3213fb5ea 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/17 04:49:47 jlam Exp $
 #
 
 DISTNAME=	bacisrc
@@ -25,12 +25,12 @@ do-build:
 		cd ${WRKSRC}/pascomp && ${MAKE}
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${LOCALBASE}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${LOCALBASE}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${LOCALBASE}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${LOCALBASE}/bin
-		${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/baci
-		${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${LOCALBASE}/share/doc/baci
+		${INSTALL_PROGRAM} ${WRKSRC}/ccomp/bacc ${PREFIX}/bin
+		${INSTALL_PROGRAM} ${WRKSRC}/disasm/badis ${PREFIX}/bin
+		${INSTALL_PROGRAM} ${WRKSRC}/interp/bainterp ${PREFIX}/bin
+		${INSTALL_PROGRAM} ${WRKSRC}/pascomp/bapas ${PREFIX}/bin
+		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/baci
+		${INSTALL_DATA} ${WRKDIR}/bacidoc/* ${PREFIX}/share/doc/baci
 		${CP} ${PKGDIR}/PLIST ${WRKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index c4d73c98a0c..307b4c0a347 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/05/02 17:42:06 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=		clisp-2.33.2
 CATEGORIES=		lang
@@ -32,7 +32,7 @@ do-configure:
 	(cd .. ; ${SETENV} ${CONFIGURE_ENV} \
 		${CONFIGURE_SCRIPT} --host=${MACHINE_GNU_PLATFORM} \
 			--prefix=${PREFIX}) && \
-	./makemake --prefix=${LOCALBASE} --with-readline --with-gettext \
+	./makemake --prefix=${PREFIX} --with-readline --with-gettext \
 		--with-dynamic-ffi --fsstnd=netbsd >Makefile
 
 pre-build:
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index d8edf28b66a..576ecddd2c7 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:58 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/06/17 04:49:47 jlam Exp $
 #
 
 DISTNAME=		plt-${DRSCHEME_VERSION}-src-unix
@@ -48,7 +48,7 @@ post-patch:
 		${WRKDIR}/plt/man/man1/drscheme.1 			\
 		${WRKDIR}/plt/man/man1/mred.1; do 			\
 			${MV} -f $$patchee ${WRKSRC}/foo ; 		\
-			${SED} -e 's|@PREFIX@|${LOCALBASE}|' <${WRKSRC}/foo \
+			${SED} -e 's|@PREFIX@|${PREFIX}|' <${WRKSRC}/foo \
 				 > $$patchee ; 				\
 	done;
 	@${MV} -f ${WRKSRC}/mred/Makefile.in ${WRKSRC}/foo
@@ -57,7 +57,7 @@ post-patch:
 	@${FIND} ${WRKDIR} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 post-install:
-	${INSTALL_MAN_DIR} ${LOCALBASE}/man/man1
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/../man/man1/*.1 ${PREFIX}/man/man1/
 	@cd ${PREFIX}/lib/plt && PATH="${OLD_PATH}" ${SH} install || ${TRUE}
 .for f in ${PROGRAMS}
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index c789bbc4a8c..c16092111ab 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/29 11:12:01 shannonjr Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/17 04:49:47 jlam Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
@@ -163,8 +163,8 @@ do-install:
 post-install:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/ada > ${WRKDIR}/ada
 	${ECHO} '"$$@"' >> ${WRKDIR}/ada
-	${INSTALL_DATA} ${WRKDIR}/ada ${LOCALBASE}/bin/ada
-	${CHMOD} +x ${WRKDIR}/ada ${LOCALBASE}/bin/ada
+	${INSTALL_DATA} ${WRKDIR}/ada ${PREFIX}/bin/ada
+	${CHMOD} +x ${WRKDIR}/ada ${PREFIX}/bin/ada
 	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print	\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"	\
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 3dab9f2eea5..0a160aee6e8 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/16 06:58:01 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/06/17 04:49:47 jlam Exp $
 
 DISTNAME=	ruby-${RUBY_VERSION}
 PKGREVISION=	2
@@ -31,7 +31,7 @@ do-install:
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 .if ${RUBY_NAME} != "ruby"
 .for f in ${RUBY_COMMANDS}
-	${LN} -sf ${f}${RUBY_VER} ${LOCALBASE}/bin/${f}
+	${LN} -sf ${f}${RUBY_VER} ${PREFIX}/bin/${f}
 	${ECHO} bin/${f} >> ${PLIST_SRC}
 .endfor
 	${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby.1
diff --git a/lang/sr/Makefile b/lang/sr/Makefile
index 622b3f4e769..1145f0c0014 100644
--- a/lang/sr/Makefile
+++ b/lang/sr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:47 jlam Exp $
 #
 
 DISTNAME=		sr233
@@ -32,7 +32,7 @@ pre-configure:
 				> ${WRKSRC}/Configuration
 
 pre-install:
-			-${MKDIR} ${LOCALBASE}/lib/sr
+			-${MKDIR} ${PREFIX}/lib/sr
 
 post-install:
 			${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${PREFIX}/bin