pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/*: replace LOCALBASE with PREFIX

Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Wed May 22 21:30:26 2019 +0200
Changeset:	c6ca8059ad0fc08359c7c3726b67049063bb0348

Modified Files:
	Chinput/Makefile
	aolserver/Makefile
	clementine/Makefile
	cross-binutils/Makefile
	daphne/Makefile
	dolfin/Makefile
	empathy/Makefile
	erlang-basho/Makefile
	erlang15/Makefile
	flim/Makefile
	gDesklets-rssgrab/Makefile
	gDesklets-starterbar/Makefile
	galib/Makefile
	gcc42/Makefile
	gcc42/buildlink3.mk
	gcc43/buildlink3.mk
	gcc46-libs/Makefile
	gcc47-libs/Makefile
	gdal-grass/Makefile
	gfontview/Makefile
	glkloader/Makefile
	ices/Makefile
	iptables/Makefile
	jacorb-lib/Makefile
	kde-runtime4/Makefile
	libpusb/Makefile
	libreoffice-git/options.mk
	linux-kbd/Makefile
	lorder/Makefile
	mplayer-mt/options.mk
	mplayer-snapshot-share/options.mk
	muscle-cflexplugin/Makefile
	muscle-mcardplugin/Makefile
	muscle-pam/Makefile
	muscle-pkcs11/Makefile
	mysqltcl/Makefile
	obmenu/Makefile
	ogmrip/Makefile
	pdq/Makefile
	phantomjs/Makefile
	phantomjs2/Makefile
	py-bsddb/Makefile
	qt5-qtbase-git/Makefile
	scilab/Makefile
	scm/Makefile
	scr2png/Makefile
	scummvm-git/Makefile
	service/Makefile
	sgmltools-lite/Makefile
	shoutcast/Makefile
	sun-j2me/Makefile
	sxemacs/Makefile
	ubit/Makefile
	umix/Makefile
	vista-fonts/Makefile
	vreng/Makefile
	wings/Makefile
	xalan-c-1.10/options.mk
	xalan-c/options.mk

Log Message:
wip/*: replace LOCALBASE with PREFIX

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c6ca8059ad0fc08359c7c3726b67049063bb0348

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Chinput/Makefile                  |  4 ++--
 aolserver/Makefile                |  2 +-
 clementine/Makefile               | 12 ++++++------
 cross-binutils/Makefile           |  2 +-
 daphne/Makefile                   |  4 ++--
 dolfin/Makefile                   |  4 ++--
 empathy/Makefile                  |  2 +-
 erlang-basho/Makefile             |  2 +-
 erlang15/Makefile                 |  2 +-
 flim/Makefile                     |  2 +-
 gDesklets-rssgrab/Makefile        |  2 +-
 gDesklets-starterbar/Makefile     |  2 +-
 galib/Makefile                    |  2 +-
 gcc42/Makefile                    |  4 ++--
 gcc42/buildlink3.mk               |  2 +-
 gcc43/buildlink3.mk               |  2 +-
 gcc46-libs/Makefile               |  2 +-
 gcc47-libs/Makefile               |  2 +-
 gdal-grass/Makefile               |  2 +-
 gfontview/Makefile                |  2 +-
 glkloader/Makefile                |  2 +-
 ices/Makefile                     |  2 +-
 iptables/Makefile                 |  8 ++++----
 jacorb-lib/Makefile               |  2 +-
 kde-runtime4/Makefile             |  2 +-
 libpusb/Makefile                  |  2 +-
 libreoffice-git/options.mk        |  6 +++---
 linux-kbd/Makefile                |  4 ++--
 lorder/Makefile                   |  2 +-
 mplayer-mt/options.mk             |  2 +-
 mplayer-snapshot-share/options.mk |  2 +-
 muscle-cflexplugin/Makefile       |  2 +-
 muscle-mcardplugin/Makefile       |  2 +-
 muscle-pam/Makefile               |  2 +-
 muscle-pkcs11/Makefile            |  2 +-
 mysqltcl/Makefile                 |  8 ++++----
 obmenu/Makefile                   |  2 +-
 ogmrip/Makefile                   |  2 +-
 pdq/Makefile                      |  2 +-
 phantomjs/Makefile                |  2 +-
 phantomjs2/Makefile               |  2 +-
 py-bsddb/Makefile                 |  2 +-
 qt5-qtbase-git/Makefile           |  2 +-
 scilab/Makefile                   |  6 +++---
 scm/Makefile                      |  4 ++--
 scr2png/Makefile                  |  2 +-
 scummvm-git/Makefile              |  4 ++--
 service/Makefile                  |  2 +-
 sgmltools-lite/Makefile           |  4 ++--
 shoutcast/Makefile                |  4 ++--
 sun-j2me/Makefile                 |  2 +-
 sxemacs/Makefile                  |  2 +-
 ubit/Makefile                     |  2 +-
 umix/Makefile                     |  2 +-
 vista-fonts/Makefile              |  2 +-
 vreng/Makefile                    |  8 ++++----
 wings/Makefile                    |  6 +++---
 xalan-c-1.10/options.mk           |  2 +-
 xalan-c/options.mk                |  2 +-
 59 files changed, 88 insertions(+), 88 deletions(-)

diffs:
diff --git a/Chinput/Makefile b/Chinput/Makefile
index 51b8d2ec6a..f38195087e 100644
--- a/Chinput/Makefile
+++ b/Chinput/Makefile
@@ -18,12 +18,12 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=	${EGDIR}/Chinput.ad ${PKG_SYSCONFDIR}/Chinput.ad
 
 post-patch:
-	${SED} -e 's:/usr/dict:'${LOCALBASE}/lib/unicon':g' < \
+	${SED} -e 's:/usr/dict:'${PREFIX}/lib/unicon':g' < \
 		${WRKSRC}/src/init.c > ${WRKSRC}/src/init.c.tmp
 	${SED} -e 's:/usr/lib/ZWinPro:'${PREFIX}/etc':g' < \
 		${WRKSRC}/src/init.c.tmp > ${WRKSRC}/src/init.c
 	${MV} ${WRKSRC}/resource/Chinput.ad ${WRKSRC}/resource/Chinput.ad.tmp
-	${SED} -e 's:/usr/lib/unicon2:'${LOCALBASE}/lib/unicon':g' < \
+	${SED} -e 's:/usr/lib/unicon2:'${PREFIX}/lib/unicon':g' < \
 		${WRKSRC}/resource/Chinput.ad.tmp > \
 		${WRKSRC}/resource/Chinput.ad
 
diff --git a/aolserver/Makefile b/aolserver/Makefile
index a61bc89e94..947adaa74b 100644
--- a/aolserver/Makefile
+++ b/aolserver/Makefile
@@ -13,7 +13,7 @@ COMMENT=		America Online's open source web server
 
 
 MAKE_FLAGS+=		NSHOME=${WRKSRC}
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-tcl=${PREFIX}/lib
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_PKGLOCALEDIR=	yes
diff --git a/clementine/Makefile b/clementine/Makefile
index bd01bfc078..a506ee9810 100644
--- a/clementine/Makefile
+++ b/clementine/Makefile
@@ -24,14 +24,14 @@ CFLAGS+=	-Wno-inconsistent-missing-override \
 		-Wno-unused-function
 
 CMAKE_ARGS+=	-DENABLE_SPOTIFY_BLOB=OFF \
-		-DCRYPTOPP_LIBS=${LOCALBASE}/lib/libcryptopp.so \
-		-DCRYPTOPP_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
-		-DCRYPTOPP_LIBDIR=${LOCALBASE}/lib \
+		-DCRYPTOPP_LIBS=${PREFIX}/lib/libcryptopp.so \
+		-DCRYPTOPP_INCLUDEDIR=${PREFIX}/include/cryptopp \
+		-DCRYPTOPP_LIBDIR=${PREFIX}/lib \
 		-DCRYPTOPP_LDFLAGS=-lcryptopp \
 		-DCRYPTOPP_LIBRARIES=cryptopp \
-		-DCRYPTOPP_LIBRARY_DIRS=${LOCALBASE}/lib \
-		-DCRYPTOPP_cryptopp_INCLUDEDIR=${LOCALBASE}/include/cryptopp \
-		-DCRYPTOPP_cryptopp_LIBDIR=${LOCALBASE}/lib \
+		-DCRYPTOPP_LIBRARY_DIRS=${PREFIX}/lib \
+		-DCRYPTOPP_cryptopp_INCLUDEDIR=${PREFIX}/include/cryptopp \
+		-DCRYPTOPP_cryptopp_LIBDIR=${PREFIX}/lib \
 		-DCRYPTOPP_FOUND=1 \
 		-DENABLE_DBUS=ON \
 		-DBUILD_WERROR=OFF
diff --git a/cross-binutils/Makefile b/cross-binutils/Makefile
index f220d47a74..5cc1bb6abe 100644
--- a/cross-binutils/Makefile
+++ b/cross-binutils/Makefile
@@ -33,7 +33,7 @@ PKGSRC_MAKE_ENV+=	SH=/bin/ksh
 MAKE_ARGS+=		CFLAGS="${CFLAGS}"
 BUILD_TARGET=		all-binutils all-ld
 
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+PLIST_SUBST+=		LOCALBASE=${PREFIX}
 
 BINDIR=			${PREFIX}/cross/libexec/binutils
 
diff --git a/daphne/Makefile b/daphne/Makefile
index fd78364332..aff5438f0f 100644
--- a/daphne/Makefile
+++ b/daphne/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE=		YES
 CONFIGURE_DIRS=		src/vldp2
 BUILD_DIRS=		src
 
-MAKE_ENV+=		DATA_DIR=${LOCALBASE}/share/daphne
-MAKE_ENV+=		LIB_DIR=${LOCALBASE}/lib/daphne
+MAKE_ENV+=		DATA_DIR=${PREFIX}/share/daphne
+MAKE_ENV+=		LIB_DIR=${PREFIX}/lib/daphne
 .if ${MACHINE_ARCH} == "i386"
 MAKE_ENV+=		USE_MMX_RGB2YUV=1
 MAKE_ENV+=		PFLAGS="-DNATIVE_CPU_X86 -DMMX_RGB2YUV"
diff --git a/dolfin/Makefile b/dolfin/Makefile
index ebf23a09d1..fbf23b4553 100644
--- a/dolfin/Makefile
+++ b/dolfin/Makefile
@@ -22,7 +22,7 @@ REPLACE_PYTHON+=	scripts/dolfin-convert/dolfin-convert
 
 CMAKE_ARGS+=	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DDOLFIN_ENABLE_MPI:BOOL=OFF \
-		-DLOCALBASE=${LOCALBASE}
+		-DLOCALBASE=${PREFIX}
 
 # CHOLMOD_DIR, UMFPACK_DIR, etc. will default to .buildlink.  See CMakeCache.txt
 # Installed dolfin-config.cmake contains .buildlink where it should use
@@ -40,7 +40,7 @@ CMAKE_ARGS+=	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 CXXFLAGS+=	-fpermissive
 
 .if ${OPSYS} == "Darwin"
-CXXFLAGS+=	-I${LOCALBASE}/${PYINC}
+CXXFLAGS+=	-I${PREFIX}/${PYINC}
 .endif
 
 # Fix for variadic template warnings, but causes make_pair() error
diff --git a/empathy/Makefile b/empathy/Makefile
index 9a284436aa..59bbb7f0b2 100644
--- a/empathy/Makefile
+++ b/empathy/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--with-ca-file=/etc/ssl/certs/ca-certificates.crt
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
 # with --nonet, xsltproc needs a helping hand finding some dtds
-XSLTPROC_PATH=		${LOCALBASE}/share/doc/dbus
+XSLTPROC_PATH=		${PREFIX}/share/doc/dbus
 
 # notyet
 #CONFIGURE_ARGS+=	--enable-meego
diff --git a/erlang-basho/Makefile b/erlang-basho/Makefile
index 20ed92980f..95abba6f52 100644
--- a/erlang-basho/Makefile
+++ b/erlang-basho/Makefile
@@ -59,7 +59,7 @@ MAKE_ENV+=		DESTDIR=${DESTDIR}
 
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
-REPLACE.escript.new=	${LOCALBASE}/bin/escript
+REPLACE.escript.new=	${PREFIX}/bin/escript
 REPLACE_FILES.escript=	\
 	lib/reltool/examples/display_args \
 	lib/reltool/examples/mnesia_core_dump_viewer \
diff --git a/erlang15/Makefile b/erlang15/Makefile
index e6692f56dc..dbd5f6d2d9 100644
--- a/erlang15/Makefile
+++ b/erlang15/Makefile
@@ -32,7 +32,7 @@ MAKE_ENV+=		DESTDIR=${DESTDIR}
 
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
-REPLACE.escript.new=	${LOCALBASE}/bin/escript
+REPLACE.escript.new=	${PREFIX}/bin/escript
 REPLACE_FILES.escript=	\
 	lib/reltool/examples/display_args \
 	lib/reltool/examples/mnesia_core_dump_viewer \
diff --git a/flim/Makefile b/flim/Makefile
index e7792b47e4..1fa4ac6c05 100644
--- a/flim/Makefile
+++ b/flim/Makefile
@@ -47,7 +47,7 @@ post-build:
 	cd ${WRKSRC}; for i in mime-en mime-ja; do			\
 		${RM} -f $${i}.info*;					\
 		${CP} $${i}.texi $${i}.texi.orig;			\
-		${LOCALBASE}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
+		${PREFIX}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
 		makeinfo --force --no-validate $${i}.texi;		\
 	done
 
diff --git a/gDesklets-rssgrab/Makefile b/gDesklets-rssgrab/Makefile
index d36a052301..ce82d0155b 100644
--- a/gDesklets-rssgrab/Makefile
+++ b/gDesklets-rssgrab/Makefile
@@ -15,7 +15,7 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 NAME=		rssgrab
-GDESKLETSDIR=	${LOCALBASE}/share/gdesklets
+GDESKLETSDIR=	${PREFIX}/share/gdesklets
 
 REPLACE_PYTHON=	${NAME}/feedparser.py
 
diff --git a/gDesklets-starterbar/Makefile b/gDesklets-starterbar/Makefile
index 9810df98f8..d1f11a7bea 100644
--- a/gDesklets-starterbar/Makefile
+++ b/gDesklets-starterbar/Makefile
@@ -16,7 +16,7 @@ NO_BUILD=	yes
 USE_TOOLS+=	pax
 
 NAME=		StarterBar
-GDESKLETSDIR=	${LOCALBASE}/share/gdesklets
+GDESKLETSDIR=	${PREFIX}/share/gdesklets
 
 post-extract:
 	${PYTHONBIN} ${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
diff --git a/galib/Makefile b/galib/Makefile
index a94dd63f05..9866ba4a2e 100644
--- a/galib/Makefile
+++ b/galib/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+=		gmake
 
 pre-configure:
 	cd ${WRKSRC}; 					\
-	${CAT} makevars|${SED} -e s,DESTDIR=\/usr\/local,DESTDIR=${LOCALBASE}, > makevars.tmp; \
+	${CAT} makevars|${SED} -e s,DESTDIR=\/usr\/local,DESTDIR=${PREFIX}, > makevars.tmp; \
 	${CP} makevars makevars.old; ${CP} makevars.tmp makevars; \
 	${CP} makefile Makefile
 
diff --git a/gcc42/Makefile b/gcc42/Makefile
index aaf2ca41e1..d155cada8f 100644
--- a/gcc42/Makefile
+++ b/gcc42/Makefile
@@ -50,8 +50,8 @@ MAKEFLAGS+=		USE_BINUTILS=${USE_BINUTILS:Q}
 .endif
 .if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
 DEPENDS+=		binutils>=2.14:../../devel/binutils
-CONFIGURE_ARGS+=	--with-as=${LOCALBASE}/bin/as
-CONFIGURE_ARGS+=	--with-ld=${LOCALBASE}/bin/ld
+CONFIGURE_ARGS+=	--with-as=${PREFIX}/bin/as
+CONFIGURE_ARGS+=	--with-ld=${PREFIX}/bin/ld
 CONFIGURE_ARGS+=	--with-gnu-as
 CONFIGURE_ARGS+=	--with-gnu-ld
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
diff --git a/gcc42/buildlink3.mk b/gcc42/buildlink3.mk
index b2b4f25a40..dfb7b6a9e2 100644
--- a/gcc42/buildlink3.mk
+++ b/gcc42/buildlink3.mk
@@ -1,6 +1,6 @@
 # $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:41 jsonn Exp $
 
-BUILDLINK_PREFIX.gcc42:=	${LOCALBASE}/gcc42
+BUILDLINK_PREFIX.gcc42:=	${PREFIX}/gcc42
 
 BUILDLINK_TREE+=	gcc42
 
diff --git a/gcc43/buildlink3.mk b/gcc43/buildlink3.mk
index c58e918e37..c61ec46a45 100644
--- a/gcc43/buildlink3.mk
+++ b/gcc43/buildlink3.mk
@@ -1,6 +1,6 @@
 # $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:43:41 jsonn Exp $
 
-BUILDLINK_PREFIX.gcc43:=	${LOCALBASE}/gcc43
+BUILDLINK_PREFIX.gcc43:=	${PREFIX}/gcc43
 
 BUILDLINK_TREE+=	gcc43
 
diff --git a/gcc46-libs/Makefile b/gcc46-libs/Makefile
index fab0dbffe9..7073e7094c 100644
--- a/gcc46-libs/Makefile
+++ b/gcc46-libs/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC46_DIST_VERSION}{,nb[0-9]*}:../../wip/gcc46
 .include "../../mk/bsd.prefs.mk"
 
 LIBGCC_SUBPREFIX=	${GCC_PKGNAME}
-LIBGCC_PREFIX=		${LOCALBASE}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX=		${PREFIX}/${LIBGCC_SUBPREFIX}
 GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 
diff --git a/gcc47-libs/Makefile b/gcc47-libs/Makefile
index 3bb19a590d..5559827c32 100644
--- a/gcc47-libs/Makefile
+++ b/gcc47-libs/Makefile
@@ -29,7 +29,7 @@ BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC47_DIST_VERSION}{,nb[0-9]*}:../../wip/gcc47
 .include "../../mk/bsd.prefs.mk"
 
 LIBGCC_SUBPREFIX=	${GCC_PKGNAME}
-LIBGCC_PREFIX=		${LOCALBASE}/${LIBGCC_SUBPREFIX}
+LIBGCC_PREFIX=		${PREFIX}/${LIBGCC_SUBPREFIX}
 GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 
diff --git a/gdal-grass/Makefile b/gdal-grass/Makefile
index 640a178762..7ec51ec8d4 100644
--- a/gdal-grass/Makefile
+++ b/gdal-grass/Makefile
@@ -15,7 +15,7 @@ COMMENT=		Standalone GRASS 6 drivers for GDAL and OGR
 
 WRKSRC=			${WRKDIR}/gdal-grass-1.3.1
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gdal=${LOCALBASE}/bin/gdal-config
+CONFIGURE_ARGS+=	--with-gdal=${PREFIX}/bin/gdal-config
 CONFIGURE_ARGS+=	--with-grass=${GRASS_HOME}
 USE_LANGUAGES=		c++
 BUILD_TARGET=		default
diff --git a/gfontview/Makefile b/gfontview/Makefile
index c4efa2aaf1..181956ae1c 100644
--- a/gfontview/Makefile
+++ b/gfontview/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Outline font viewer for X11
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-fontdir=${LOCALBASE}/share/ghostscript/fonts
+CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/share/ghostscript/fonts
 
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../graphics/freetype-lib/buildlink3.mk"
diff --git a/glkloader/Makefile b/glkloader/Makefile
index 67b3058540..885068fe90 100644
--- a/glkloader/Makefile
+++ b/glkloader/Makefile
@@ -19,7 +19,7 @@ EGDIR=		${DOCDIR}/samples
 CONF_FILES=	${EGDIR}/glkloaderrc ${PKG_SYSCONFDIR}/glkloaderrc
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/glkstart.h ${LOCALBASE}/include/glkloader
+	${INSTALL_DATA} ${FILESDIR}/glkstart.h ${PREFIX}/include/glkloader
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/glkloaderrc ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
diff --git a/ices/Makefile b/ices/Makefile
index b1c8f58109..2a1479e876 100644
--- a/ices/Makefile
+++ b/ices/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-lame=${BUILDLINK_PREFIX.lame} \
 			--with-perl=${BUILDLINK_PREFIX.perl} \
 			--with-xml=${BUILDLINK_PREFIX.libxml2}/bin \
-			--with-docdir=${LOCALBASE}/share/doc/ices \
+			--with-docdir=${PREFIX}/share/doc/ices \
 			--with-libshout=${BUILDLINK_PREFIX.libshout}
 
 .include "../../audio/libshout/buildlink3.mk"
diff --git a/iptables/Makefile b/iptables/Makefile
index f1acdd9f37..76ec2c8aa4 100644
--- a/iptables/Makefile
+++ b/iptables/Makefile
@@ -21,13 +21,13 @@ PKGMANDIR?=		man  # until this in official pkgsrc
 
 do-build:
 	cd ${WRKSRC} && \
-	${GMAKE} BINDIR=${LOCALBASE}/bin LIBDIR=${LOCALBASE}/lib \
-		MANDIR=${LOCALBASE}/${PKGMANDIR}
+	${GMAKE} BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib \
+		MANDIR=${PREFIX}/${PKGMANDIR}
 
 do-install:
 	cd ${WRKSRC} && \
-	${GMAKE} BINDIR=${LOCALBASE}/bin LIBDIR=${LOCALBASE}/lib \
-		MANDIR=${LOCALBASE}/${PKGMANDIR} install
+	${GMAKE} BINDIR=${PREFIX}/bin LIBDIR=${PREFIX}/lib \
+		MANDIR=${PREFIX}/${PKGMANDIR} install
 
 # If you are a developer, you can install the headers, development libraries
 # and associated development man pages, with:
diff --git a/jacorb-lib/Makefile b/jacorb-lib/Makefile
index d869fc19e3..e3784b079d 100644
--- a/jacorb-lib/Makefile
+++ b/jacorb-lib/Makefile
@@ -29,5 +29,5 @@ do-install:
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
 
-MAKE_PROGRAM=		${LOCALBASE}/bin/ant
+MAKE_PROGRAM=		${PREFIX}/bin/ant
 MAKE_FLAGS=		-Dpkgsrc.prefix=${PREFIX}
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index b196feaeec..294ca579a4 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -58,7 +58,7 @@ PLIST.x11=	yes
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	kioslave/info/kde-info2html.conf
-SUBST_SED.paths=	-e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_SED.paths=	-e 's,@LOCALBASE@,${PREFIX},g'
 SUBST_STAGE.paths=	post-patch
 
 REPLACE_PERL+= \
diff --git a/libpusb/Makefile b/libpusb/Makefile
index dc9f46a1ff..01e1a18e17 100644
--- a/libpusb/Makefile
+++ b/libpusb/Makefile
@@ -24,6 +24,6 @@ SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Setting up hardcoded path.
 SUBST_FILES.path=	Makefile
 SUBST_STAGE.path=	post-patch
-SUBST_SED.path=		-e 's|/usr/pkg|${LOCALBASE}|'
+SUBST_SED.path=		-e 's|/usr/pkg|${PREFIX}|'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libreoffice-git/options.mk b/libreoffice-git/options.mk
index 70f7561005..a15292fd30 100644
--- a/libreoffice-git/options.mk
+++ b/libreoffice-git/options.mk
@@ -18,10 +18,10 @@ PLIST_VARS+=	java kde4 gtk3
 USE_JAVA=		yes
 USE_JAVA2=		yes
 BUILD_DEPENDS+=	apache-ant-[0-9]*:../../devel/apache-ant
-CONFIGURE_ARGS+=	--with-ant-home=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-ant-home=${PREFIX}
 
 DEPENDS+=		hsqldb18-[0-9]*:../../databases/hsqldb18
-CONFIGURE_ARGS+=	--with-hsqldb-jar=${LOCALBASE}/lib/java/hsqldb18/hsqldb.jar
+CONFIGURE_ARGS+=	--with-hsqldb-jar=${PREFIX}/lib/java/hsqldb18/hsqldb.jar
 CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-java \
 			--with-jdk-home=${PKG_JAVA_HOME} \
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--disable-gtk3
 
 .if !empty(PKG_OPTIONS:Mkde4)
 CONFIGURE_ARGS+=	--enable-kde4
-CONFIGURE_ENV+=		KDE4DIR="${LOCALBASE}"
+CONFIGURE_ENV+=		KDE4DIR="${PREFIX}"
 PLIST.kde4=		yes
 .include "../../x11/kdelibs4/buildlink3.mk"
 .else
diff --git a/linux-kbd/Makefile b/linux-kbd/Makefile
index e96e444f4b..f4bdcdec91 100644
--- a/linux-kbd/Makefile
+++ b/linux-kbd/Makefile
@@ -24,13 +24,13 @@ CONFIGURE_ARGS+=	--mandir=/man
 
 .if !exists(/usr/bin/lex)
 BUILD_DEPENDS+=		flex-[0-9]*:../../devel/flex
-LEX=			${LOCALBASE}/bin/flex -8
+LEX=			${PREFIX}/bin/flex -8
 MAKE_ENV+=		LEX=${LEX:Q}
 .endif
 
 .if !exists(/usr/bin/yacc)
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
-YACC=		${LOCALBASE}/bin/bison -y
+YACC=		${PREFIX}/bin/bison -y
 MAKE_ENV+=	YACC=${YACC:Q}
 .endif
 
diff --git a/lorder/Makefile b/lorder/Makefile
index 6c766643b6..c09a3df29f 100644
--- a/lorder/Makefile
+++ b/lorder/Makefile
@@ -20,7 +20,7 @@ NO_BUILD=	YES
 # XXX This would be a good place to use PREFER_PKGSRC
 .if empty(OPSYS:M*BSD)
 DEPENDS+=	mktemp>=1.4:../../sysutils/mktemp
-MKTEMP=		${LOCALBASE}/bin/mktemp
+MKTEMP=		${PREFIX}/bin/mktemp
 .else
 MKTEMP=		mktemp
 .endif
diff --git a/mplayer-mt/options.mk b/mplayer-mt/options.mk
index 406cbdfce1..381458cb1e 100644
--- a/mplayer-mt/options.mk
+++ b/mplayer-mt/options.mk
@@ -205,7 +205,7 @@ CONFIGURE_ARGS+=	--disable-runtime-cpudetection
 
 .  if !empty(PKG_OPTIONS:Mmplayer-win32)
 EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
-PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
+PREFIX.win32-codecs_DEFAULT=	${PREFIX}
 CONFIGURE_ARGS+=		--enable-win32dll
 CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
diff --git a/mplayer-snapshot-share/options.mk b/mplayer-snapshot-share/options.mk
index 4be2aa8449..bd646b698e 100644
--- a/mplayer-snapshot-share/options.mk
+++ b/mplayer-snapshot-share/options.mk
@@ -226,7 +226,7 @@ CONFIGURE_ARGS+=	--disable-runtime-cpudetection
 
 .  if !empty(PKG_OPTIONS:Mmplayer-win32)
 EVAL_PREFIX+=			PREFIX.win32-codecs=win32-codecs
-PREFIX.win32-codecs_DEFAULT=	${LOCALBASE}
+PREFIX.win32-codecs_DEFAULT=	${PREFIX}
 CONFIGURE_ARGS+=		--enable-win32dll
 #CONFIGURE_ARGS+=		--win32codecsdir="${PREFIX.win32-codecs}/lib/win32"
 DEPENDS+=			win32-codecs>=011227:../../multimedia/win32-codecs
diff --git a/muscle-cflexplugin/Makefile b/muscle-cflexplugin/Makefile
index 8aea80a9e0..aa25c54b5c 100644
--- a/muscle-cflexplugin/Makefile
+++ b/muscle-cflexplugin/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake
 
-CPPFLAGS+=		-I${LOCALBASE}/include/PCSC
+CPPFLAGS+=		-I${PREFIX}/include/PCSC
 
 CONTSRCDIR=	${WRKSRC}/src/slbCryptoflex.bundle/Contents/
 CONTDIR=	${PREFIX}/lib/pcsc-lite/drivers/slbCryptoflex.bundle/Contents
diff --git a/muscle-mcardplugin/Makefile b/muscle-mcardplugin/Makefile
index 248278fb7e..813ceb4e61 100644
--- a/muscle-mcardplugin/Makefile
+++ b/muscle-mcardplugin/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake
 
-CPPFLAGS+=		-I${LOCALBASE}/include/PCSC
+CPPFLAGS+=		-I${PREFIX}/include/PCSC
 
 CONFIGURE_ARGS+=	--enable-callback
 
diff --git a/muscle-pam/Makefile b/muscle-pam/Makefile
index 1ef5b74821..8a8342df77 100644
--- a/muscle-pam/Makefile
+++ b/muscle-pam/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PAM plugin for MUSCLE SmartCard framework
 WRKSRC=			${WRKDIR}/${DISTNAME}/MusclePAM
 USE_TOOLS+=		gmake
 
-CPPFLAGS+=		-I${LOCALBASE}/include/PCSC
+CPPFLAGS+=		-I${PREFIX}/include/PCSC
 
 PKG_SYSCONFSUBDIR=	musclepam
 EGDIR=			${PREFIX}/share/examples/muscle-pam
diff --git a/muscle-pkcs11/Makefile b/muscle-pkcs11/Makefile
index 947eae26d7..c094e98a60 100644
--- a/muscle-pkcs11/Makefile
+++ b/muscle-pkcs11/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake
 
-CPPFLAGS+=		-I${LOCALBASE}/include/PCSC
+CPPFLAGS+=		-I${PREFIX}/include/PCSC
 
 EGDIR=			${PREFIX}/share/examples/muscle-pkcs11
 
diff --git a/mysqltcl/Makefile b/mysqltcl/Makefile
index fde4fdb700..8737bd7787 100644
--- a/mysqltcl/Makefile
+++ b/mysqltcl/Makefile
@@ -16,11 +16,11 @@ DIST_SUBDIR=		${PKGNAME_NOREV}
 
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tclinclude=${BUILDLINK_PREFIX.tcl}/include/tcl/generic
-CONFIGURE_ARGS+=	--with-mysql-include=${LOCALBASE}/include/mysql
-CONFIGURE_ARGS+=	--with-mysql-lib=${LOCALBASE}/lib/mysql
-CONFIGURE_ARGS+=	--libdir=${LOCALBASE}/lib/tcl
+CONFIGURE_ARGS+=	--with-mysql-include=${PREFIX}/include/mysql
+CONFIGURE_ARGS+=	--with-mysql-lib=${PREFIX}/lib/mysql
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/tcl
 
-LIBS +=			${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql
+LIBS +=			${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/obmenu/Makefile b/obmenu/Makefile
index 9b1514949b..eefbe421eb 100644
--- a/obmenu/Makefile
+++ b/obmenu/Makefile
@@ -15,7 +15,7 @@ SUBST_CLASSES+=		obmenu
 SUBST_MESSAGE.obmenu=	Fixing LOCALBASE path.
 SUBST_STAGE.obmenu=	pre-patch
 SUBST_FILES.obmenu=	obmenu
-SUBST_SED.obmenu+=	-e 's|/usr/share|${LOCALBASE}/share|g'
+SUBST_SED.obmenu+=	-e 's|/usr/share|${PREFIX}/share|g'
 
 PYDISTUTILSPKG=	yes
 REPLACE_PYTHON=	${WRKSRC}/obmenu ${WRKSRC}/obxml.py
diff --git a/ogmrip/Makefile b/ogmrip/Makefile
index 066d3ac604..265641d4f0 100644
--- a/ogmrip/Makefile
+++ b/ogmrip/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
 BUILD_DEPENDS+=		gsed-[0-9]*:../../textproc/gsed
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	SED_PROG=${LOCALBASE}/bin/gsed
+CONFIGURE_ARGS+=	SED_PROG=${PREFIX}/bin/gsed
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
diff --git a/pdq/Makefile b/pdq/Makefile
index d4279c81ff..3b0493d950 100644
--- a/pdq/Makefile
+++ b/pdq/Makefile
@@ -11,7 +11,7 @@ LICENSE=		gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${LOCALBASE} == "/usr" || !exists(/usr/bin/file)
+.if ${PREFIX} == "/usr" || !exists(/usr/bin/file)
 DEPENDS+=		file-[0-9]*:../../sysutils/file
 .endif
 
diff --git a/phantomjs/Makefile b/phantomjs/Makefile
index aa056996de..e373c57d31 100644
--- a/phantomjs/Makefile
+++ b/phantomjs/Makefile
@@ -36,7 +36,7 @@ post-extract:
 	${INSTALL_DATA} ${FILESDIR}/qplatformdefs.h ${WRKSRC}/src/qt/mkspecs/solaris-g++
 
 pre-configure:
-	sed	-e 's:@LOCALBASE@:${LOCALBASE}:g' \
+	sed	-e 's:@LOCALBASE@:${PREFIX}:g' \
 		-e 's:@X11BASE@:${X11BASE}:g' \
 		-e 's:@X11PREFIX@:${X11PREFIX}:g' \
 		-e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
diff --git a/phantomjs2/Makefile b/phantomjs2/Makefile
index dbf18f77a6..a5773c5ca4 100644
--- a/phantomjs2/Makefile
+++ b/phantomjs2/Makefile
@@ -50,7 +50,7 @@ PHANTOMJS_WEBKIT_DISABLE+=	video
 PHANTOMJS_WEBKIT_DISABLE+=	gamepad
 
 pre-configure:
-	${SED}	-e 's:@LOCALBASE@:${LOCALBASE}:g' \
+	${SED}	-e 's:@LOCALBASE@:${PREFIX}:g' \
 		-e 's:@X11BASE@:${X11BASE}:g' \
 		-e 's:@X11PREFIX@:${X11PREFIX}:g' \
 		-e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
diff --git a/py-bsddb/Makefile b/py-bsddb/Makefile
index 435a2cf57f..18bbd24c7c 100644
--- a/py-bsddb/Makefile
+++ b/py-bsddb/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/_bsddb.c
 EXTRACT_ELEMENTS+=	${PYSUBDIR}/Modules/bsddb.h
 .endif
 
-PY_SETUP_SUBST+=	BLPREFIX=${LOCALBASE}
+PY_SETUP_SUBST+=	BLPREFIX=${PREFIX}
 PY_SETUP_SUBST+=	DBRTPREFIX=${BUILDLINK_PREFIX.db4}
 PY_SETUP_SUBST+=	DBPREFIX=${BUILDLINK_PREFIX.db4}
 
diff --git a/qt5-qtbase-git/Makefile b/qt5-qtbase-git/Makefile
index a561afeaf3..fd9d0a5fd0 100644
--- a/qt5-qtbase-git/Makefile
+++ b/qt5-qtbase-git/Makefile
@@ -146,7 +146,7 @@ PC_FILES=		Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
 			Qt5Widgets.pc Qt5Xml.pc
 
 pre-configure:
-	${SED}  -e 's:@LOCALBASE@:${LOCALBASE}:g' \
+	${SED}  -e 's:@LOCALBASE@:${PREFIX}:g' \
 		-e 's:@X11BASE@:${X11BASE}:g' \
 		-e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
 		-e 's:@CC@:${CC:Q}:g' \
diff --git a/scilab/Makefile b/scilab/Makefile
index f57d39592f..3a4dc97d85 100644
--- a/scilab/Makefile
+++ b/scilab/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ENV+=		FC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG}${BUILDLINK_
 # override HOME to avoid picking up a bad ${HOME}/.scilab during the build
 MAKE_ENV+=		HOME=${WRKSRC}
 MAKE_ENV+=		PVM_ROOT=${PVM_ROOT:Q}
-CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=		LOCALBASE=${PREFIX}
 
 # FIXME -- this ugly hack will go away on newer versions of scilab where the build
 # system has been improved significantly see:
@@ -50,7 +50,7 @@ CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 CFLAGS+=		-DG95_FORTRAN=1
 .endif
 
-PVM_ROOT?=		${LOCALBASE}/pvm3
+PVM_ROOT?=		${PREFIX}/pvm3
 CONFIGURE_ENV+=		PVM_ROOT=${PVM_ROOT:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
 PLIST_SUBST+=		SCIBASE=${SCIBASE:Q}
@@ -110,7 +110,7 @@ post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/util/scidem.orig
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/util/scidoc.orig
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/libtool
-	${LN} -s ${LOCALBASE}/bin/libtool ${DESTDIR}${PREFIX}/lib/${SCIBASE}/libtool
+	${LN} -s ${PREFIX}/bin/libtool ${DESTDIR}${PREFIX}/lib/${SCIBASE}/libtool
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/bin/dold
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/config/*.subst.sav
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${SCIBASE}/config/config.guess
diff --git a/scm/Makefile b/scm/Makefile
index 0f02f6d3fe..703ff3b593 100644
--- a/scm/Makefile
+++ b/scm/Makefile
@@ -49,13 +49,13 @@ BUILD_SCRIPT=	${FILESDIR}/buildscm.sh
 .endif
 
 post-patch:
-	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	${SED} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		< ${FILESDIR}/require.scm > ${WRKSRC}/require.scm
 
 post-build:
 	${CAT} ${BUILD_SCRIPT} \
 		| ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		| ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		| ${SED} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
 		> ${WRKSRC}/buildscm.sh
 	cd ${WRKSRC} && ${SH} ./buildscm.sh
 
diff --git a/scr2png/Makefile b/scr2png/Makefile
index 095c78662e..3722c6fa00 100644
--- a/scr2png/Makefile
+++ b/scr2png/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Converts the output of FreeBSD "vidcontrol -p" to PNG
 WRKSRC=			${WRKDIR}
 CFLAGS+=		-DPREFIX=\"${PREFIX}\"
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gd}/lib
-LDFLAGS+=		-L${LOCALBASE}/lib
+LDFLAGS+=		-L${PREFIX}/lib
 MAKE_ENV+=		MKMAN=no
 PKGMANDIR?=		man
 
diff --git a/scummvm-git/Makefile b/scummvm-git/Makefile
index 40939b78a1..46ebae6695 100644
--- a/scummvm-git/Makefile
+++ b/scummvm-git/Makefile
@@ -14,8 +14,8 @@ NO_SRC_ON_CDROM=	# changes daily
 USE_TOOLS+=		gmake perl
 USE_LANGUAGES=		c c++
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
-CONFIGURE_ARGS+=	--mandir=${LOCALBASE}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 
 .include "options.mk"
 
diff --git a/service/Makefile b/service/Makefile
index 8f5dbb4d37..0e19cc9b64 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -17,7 +17,7 @@ SUBST_CLASSES+=			localbase
 SUBST_MESSAGE.localbase=	Fixing localbase.
 SUBST_STAGE.localbase=		post-extract
 SUBST_FILES.localbase=		service.sh
-SUBST_SED.localbase=		-e "s,/usr/pkg,${LOCALBASE},"
+SUBST_SED.localbase=		-e "s,/usr/pkg,${PREFIX},"
 
 
 do-fetch:
diff --git a/sgmltools-lite/Makefile b/sgmltools-lite/Makefile
index 0a3b0b0192..37e4aeadcb 100644
--- a/sgmltools-lite/Makefile
+++ b/sgmltools-lite/Makefile
@@ -23,9 +23,9 @@ GNU_CONFIGURE=	YES
 CONFIGURE_ENV=	PYTHON=${PYTHONBIN:Q}
 
 PKG_SYSCONFSUBDIR=	sgml
-EGDIR=			${LOCALBASE}/share/examples/sgmltools-lite
+EGDIR=			${PREFIX}/share/examples/sgmltools-lite
 CONFIGURE_ARGS+=	--with-etcsgml=${EGDIR}
-CONFIGURE_ARGS+=	--datadir=${LOCALBASE}/share
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
 
 # Avoid using -s on /usr/pkg/bin/sgmltools
 _STRIPFLAG_INSTALL=
diff --git a/shoutcast/Makefile b/shoutcast/Makefile
index f1718cf785..2fc6918a48 100644
--- a/shoutcast/Makefile
+++ b/shoutcast/Makefile
@@ -19,10 +19,10 @@ BUILD_DIRS=		# empty
 PKG_SYSCONFSUBDIR=	shoutcast
 
 post-build:
-	@${SED} -e "s,@LOCALBASE@,${LOCALBASE},g" < ${WRKSRC}/sc_serv.conf > ${WRKSRC}/tmp
+	@${SED} -e "s,@LOCALBASE@,${PREFIX},g" < ${WRKSRC}/sc_serv.conf > ${WRKSRC}/tmp
 	@${SED} -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" < ${WRKSRC}/tmp >${WRKSRC}/sc_serv.conf
 
 do-install:
-	@${FILESDIR}/install.sh ${WRKDIR}/shoutcast-1-9-2-linux-glibc6 ${DESTDIR}${LOCALBASE} ${DESTDIR}${PKG_SYSCONFDIR}
+	@${FILESDIR}/install.sh ${WRKDIR}/shoutcast-1-9-2-linux-glibc6 ${DESTDIR}${PREFIX} ${DESTDIR}${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sun-j2me/Makefile b/sun-j2me/Makefile
index a24fc797f6..7753779e65 100644
--- a/sun-j2me/Makefile
+++ b/sun-j2me/Makefile
@@ -29,7 +29,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-JAVA_HOME=	${LOCALBASE}/java/sun-j2me/
+JAVA_HOME=	${PREFIX}/java/sun-j2me/
 
 MESSAGE_SUBST+=	JAVA_HOME="${JAVA_HOME}"
 
diff --git a/sxemacs/Makefile b/sxemacs/Makefile
index 03c286e502..44001e8d5b 100644
--- a/sxemacs/Makefile
+++ b/sxemacs/Makefile
@@ -96,7 +96,7 @@ CONFIGURE_ARGS+=	${WITH_DIALOGS}
 CONFIGURE_ARGS+=	--with-infopath=${INFOPATH:Q}
 CONFIGURE_ARGS+=	--with-site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
 CONFIGURE_ARGS+=	--with-site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
-CONFIGURE_ARGS+=	--with-site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib
+CONFIGURE_ARGS+=	--with-site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
 
 CFLAGS+=		-Dunix
 
diff --git a/ubit/Makefile b/ubit/Makefile
index 269ca07a1f..c8727db3e8 100644
--- a/ubit/Makefile
+++ b/ubit/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 #CONFIGURE_ENV+=
-CONFIGURE_ARGS+=	--with-gl-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-gl-prefix=${PREFIX}
 
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/umix/Makefile b/umix/Makefile
index 54f37882ec..7a5d8ee407 100644
--- a/umix/Makefile
+++ b/umix/Makefile
@@ -19,7 +19,7 @@ LIBS+=			${LIBOSSAUDIO}
 
 pre-configure:
 	cd ${WRKSRC} && aclocal
-	cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
+	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --automake
 	cd ${WRKSRC} && automake --add-missing
 	cd ${WRKSRC} && autoconf
 
diff --git a/vista-fonts/Makefile b/vista-fonts/Makefile
index b8f14330d8..8dcc167318 100644
--- a/vista-fonts/Makefile
+++ b/vista-fonts/Makefile
@@ -22,7 +22,7 @@ BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-EXTRACT_CMD=	${LOCALBASE}/bin/cabextract -q -s $${extract_file} ppviewer.cab
+EXTRACT_CMD=	${PREFIX}/bin/cabextract -q -s $${extract_file} ppviewer.cab
 FONTDIR=	${PREFIX}/share/fonts/X11/TTF
 DOCDIR=		${PREFIX}/share/doc/vista-fonts
 FONTS_DIRS.ttf=	${FONTDIR}
diff --git a/vreng/Makefile b/vreng/Makefile
index 7babf74a20..4c5ce3e954 100644
--- a/vreng/Makefile
+++ b/vreng/Makefile
@@ -24,15 +24,15 @@ CFLAGS+=	-D_POSIX_PTHREAD_SEMANTICS
 
 #CONFIGURE_ENV+=
 #CONFIGURE_ARGS+=	--enable-ocaml
-CONFIGURE_ARGS+=	--with-GL-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		PERLPATH=${LOCALBASE}/bin/perl
+CONFIGURE_ARGS+=	--with-GL-prefix=${PREFIX}
+CONFIGURE_ENV+=		PERLPATH=${PREFIX}/bin/perl
 
 #mpeg
 #java
 .include "../../databases/mysql56-client/buildlink3.mk"
 #BUILDLINK_LDFLAGS.mysql-client?=        -Wl,-R${LOCALBASE}/lib/mysql
-LDFLAGS.SunOS+=		-R${LOCALBASE}/lib/mysql
-LIBS.SunOS+=		-R${LOCALBASE}/lib/mysql
+LDFLAGS.SunOS+=		-R${PREFIX}/lib/mysql
+LIBS.SunOS+=		-R${PREFIX}/lib/mysql
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../wip/ubit/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/wings/Makefile b/wings/Makefile
index 36053b7537..a61b2658cc 100644
--- a/wings/Makefile
+++ b/wings/Makefile
@@ -15,10 +15,10 @@ USE_TOOLS+=		gmake
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	unix/install_wings.src
-SUBST_SED.paths=	-e 's,%%LOCALBASE%%,${LOCALBASE},'
+SUBST_SED.paths=	-e 's,%%LOCALBASE%%,${PREFIX},'
 
 ESDL_VERSION=		0.95.0630
-ESDL_PATH=		${LOCALBASE}/lib/erlang/lib/esdl-${ESDL_VERSION}
+ESDL_PATH=		${PREFIX}/lib/erlang/lib/esdl-${ESDL_VERSION}
 
 REPLACE_INTERPRETER+=	bash
 REPLACE.bash.old=	/bin/bash
@@ -30,7 +30,7 @@ post-build:
 
 do-install:
 	cd ${WRKSRC}/wings-0.98.29b-netbsd && ${SH} install_wings
-	${INSTALL} -lsr ${LOCALBASE}/lib/erlang/lib/${PKGNAME}/wings ${LOCALBASE}/bin
+	${INSTALL} -lsr ${PREFIX}/lib/erlang/lib/${PKGNAME}/wings ${PREFIX}/bin
 
 .include "../../lang/erlang/buildlink3.mk"
 BUILDLINK_API_DEPENDS.erlang+=	erlang>=10
diff --git a/xalan-c-1.10/options.mk b/xalan-c-1.10/options.mk
index c8d44ba56d..faad345415 100644
--- a/xalan-c-1.10/options.mk
+++ b/xalan-c-1.10/options.mk
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS=	icu
 ###
 .if !empty(PKG_OPTIONS:Micu)
 CONFIGURE_ARGS+=	-t icu
-XALAN_ENV+=	ICUROOT="${LOCALBASE}"
+XALAN_ENV+=	ICUROOT="${PREFIX}"
 PLIST_SRC+=	PLIST.icu
 .include "../../textproc/icu/buildlink3.mk"
 .else
diff --git a/xalan-c/options.mk b/xalan-c/options.mk
index 1bdf1abda2..933b6d05ec 100644
--- a/xalan-c/options.mk
+++ b/xalan-c/options.mk
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS=	icu
 ###
 .if !empty(PKG_OPTIONS:Micu)
 CONFIGURE_ARGS+=	-t icu
-XALAN_ENV+=	ICUROOT="${LOCALBASE}"
+XALAN_ENV+=	ICUROOT="${PREFIX}"
 PLIST_SRC+=	PLIST.icu
 .include "../../textproc/icu/buildlink3.mk"
 .else
Home | Main Index | Thread Index | Old Index