Fix ports using PREFIX in their depends instead of LOCALBASE.

With hat:	portmgr
Sponsored by:	Absolight

46 files changed, 84 insertions, 84 deletions

diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index 8079a67385e0..5ac1be3a46ac 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/itext.jar:devel/itext			\
 		${JAVALIBDIR}/crimson.jar:textproc/crimson		\
 		${JAVALIBDIR}/poi.jar:textproc/apache-poi		\
 		${JAVALIBDIR}/jfreechart.jar:java/jfreechart	\
-		${JAVASHAREDIR}/batik/batik.jar:graphics/batik	\
+		${JAVALIBDIR}/../batik/batik.jar:graphics/batik	\
 		${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils\
 		${JAVALIBDIR}/commons-digester.jar:textproc/jakarta-commons-digester
 
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index b16566b689cc..12742b6f589a 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java Windowing Toolkit for Text Terminals
 
 BUILD_DEPENDS=	gmake:devel/gmake
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc
index a62a4d51657e..220cef980512 100644
--- a/devel/eric6/Makefile.inc
+++ b/devel/eric6/Makefile.inc
@@ -16,7 +16,7 @@ COMMENT=	Full featured Python and Ruby editor and IDE based on Qt
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS?=	${PREFIX}/bin/eric6:devel/eric6
+RUN_DEPENDS?=	${LOCALBASE}/bin/eric6:devel/eric6
 
 I18N_LANG?=	ru
 INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
diff --git a/devel/gitblit/Makefile b/devel/gitblit/Makefile
index bc8c225b025f..de9f24cc23d3 100644
--- a/devel/gitblit/Makefile
+++ b/devel/gitblit/Makefile
@@ -55,13 +55,13 @@ RUN_DEPENDS+=	nginx:www/nginx
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 GB_HOME=	${PREFIX}/apache-tomcat-6.0/webapps/${PORTNAME}
-RUN_DEPENDS+=	${PREFIX}/etc/rc.d/tomcat6:www/tomcat6
+RUN_DEPENDS+=	${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat6
 .elif ${PORT_OPTIONS:MTOMCAT7}
 GB_HOME=	${PREFIX}/apache-tomcat-7.0/webapps/${PORTNAME}
-RUN_DEPENDS+=	${PREFIX}/etc/rc.d/tomcat7:www/tomcat7
+RUN_DEPENDS+=	${LOCALBASE}/etc/rc.d/tomcat7:www/tomcat7
 .elif ${PORT_OPTIONS:MTOMCAT8}
 GB_HOME=	${PREFIX}/apache-tomcat-8.0/webapps/${PORTNAME}
-RUN_DEPENDS+=	${PREFIX}/etc/rc.d/tomcat8:www/tomcat8
+RUN_DEPENDS+=	${LOCALBASE}/etc/rc.d/tomcat8:www/tomcat8
 .endif
 
 do-extract:
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index 838ef48d476d..4e10ef16d410 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=		--destdir "${STAGEDIR}" \
 			--disable-glib
 
 DOCSDIR=		${PREFIX}/share/doc/ocaml/${PORTNAME}
-SA_DIR=			${PREFIX}/${OCAML_SITELIBDIR}
+SA_DIR=			${LOCALBASE}/${OCAML_SITELIBDIR}
 
 OPTIONS_DEFINE=		DOCS
 
@@ -61,7 +61,7 @@ do-build:
 	cd ${WRKSRC}; ocaml setup.ml -build
 
 do-install:
-	${MKDIR} ${STAGEDIR}${SA_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}
 	cd ${WRKSRC}; ocaml setup.ml -install
 
 .include <bsd.port.mk>
diff --git a/devel/tcllibc/Makefile b/devel/tcllibc/Makefile
index 1a4e331dcac5..22a720578b0d 100644
--- a/devel/tcllibc/Makefile
+++ b/devel/tcllibc/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	c
 COMMENT=	Compiled implementations of some of the modules of Tcllib
 
 BUILD_DEPENDS=	critcl:devel/critcl
-RUN_DEPENDS=	${PREFIX}/lib/tcllib/pkgIndex.tcl:${MASTERDIR}	# PREFIX, not LOCALBASE
+RUN_DEPENDS=	${LOCALBASE}/lib/tcllib/pkgIndex.tcl:${MASTERDIR}	# PREFIX, not LOCALBASE
 
 MASTERDIR=	${.CURDIR:H}/tcllib
 TMPPLIST=	${WRKDIR}/PLIST
diff --git a/editors/libreoffice-i18n/Makefile b/editors/libreoffice-i18n/Makefile
index 9511deffeb63..77bd8f9f4fe9 100644
--- a/editors/libreoffice-i18n/Makefile
+++ b/editors/libreoffice-i18n/Makefile
@@ -38,7 +38,7 @@ OPTIONS_MULTI_LANG=	${LO_LANG_ALL:tu}
 OPTIONS_DEFAULT=	${LO_LANG_ALL:tu}
 
 .for lang in ${LO_LANG_ALL}
-${lang}_DETECT?=	${PREFIX}/lib/${PORTNAME}/readmes/README_${lang:S/_/-/}
+${lang}_DETECT?=	${LOCALBASE}/lib/${PORTNAME}/readmes/README_${lang:S/_/-/}
 ${lang}_NAME?=		${lang}
 ${lang:tu}_PORT?=	editors/${PORTNAME}-${lang}
 ${lang:tu}_DESC=	${${lang}_NAME} localization data
diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index e2d90dac5068..605326a8c5b5 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-7.66-linux20130827
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Alien Arena (native version)
 
-RUN_DEPENDS=	${DATADIR}/data1/default.cfg:games/alienarena-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/data1/default.cfg:games/alienarena-data
 
 USES=		compiler:c++11-lib dos2unix gmake
 USE_CXXSTD=	c++11
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 9f3e17835f1a..abeeaf5c88a3 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Free 3D real-time customizable strategy game
 LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3 \
 		libvorbis.so:audio/libvorbis
 BUILD_DEPENDS=	jam:devel/jam
-RUN_DEPENDS=	${DATADIR}/servers.ini:games/glest-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/servers.ini:games/glest-data
 
 USES=		dos2unix openal:al,alut pkgconfig zip lua:51
 USE_AUTOTOOLS=	automake:env autoconf:env
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index 0a0e8353e843..e2ec9dc48b55 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libminiupnpc.so:net/miniupnpc
 BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:irc/libircclient \
 		${LOCALBASE}/include/miniupnpc/miniupnpc.h:net/miniupnpc
-RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:games/megaglest-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:games/megaglest-data
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MegaGlest
diff --git a/games/naev/Makefile b/games/naev/Makefile
index d76938b80f34..41cde72822c5 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libvorbisfile.so:audio/libvorbis \
 		libzip.so:archivers/libzip \
 		libcsparse.so:math/suitesparse
-RUN_DEPENDS=	${DATADIR}/ndata-${PORTVERSION}.zip:games/naev-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/ndata-${PORTVERSION}.zip:games/naev-data
 
 USES=		autoreconf:build compiler:features gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/games/openarena/Makefile b/games/openarena/Makefile
index e5c84918ab02..f29953656e6d 100644
--- a/games/openarena/Makefile
+++ b/games/openarena/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Quake3 total conversion based on the ioquake3 engine
 
 LICENSE?=	GPLv2
 
-RUN_DEPENDS=	${DATADIR}/${Q3BASE}/pak0.pk3:games/openarena-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/${Q3BASE}/pak0.pk3:games/openarena-data
 
 MASTERDIR=	${.CURDIR}/../ioquake3
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index 248475e98ec7..fc86c43a3242 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rogue-like game
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
-RUN_DEPENDS=	${DATADIR}/config/scourge.cfg:games/scourge-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/config/scourge.cfg:games/scourge-data
 
 USES=		autoreconf gettext gmake
 USE_GL=		gl
diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
index 051aba5c1321..d5fb0e099136 100644
--- a/games/trigger-rally/Makefile
+++ b/games/trigger-rally/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Rally car racing game
 
 BUILD_DEPENDS=	jam:devel/jam
 LIB_DEPENDS=	libphysfs.so:devel/physfs
-RUN_DEPENDS=	${DATADIR}/trigger.config.defs:games/trigger-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/trigger.config.defs:games/trigger-data
 
 USES=		openal:al,alut tar:bzip2
 USE_SDL=	sdl image
diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile
index a3dab36c33af..5acdf4ba7ae1 100644
--- a/games/vegastrike/Makefile
+++ b/games/vegastrike/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Open source 3D space simulator
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${DATADIR}/vegastrike.ico:games/vegastrike-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/vegastrike.ico:games/vegastrike-data
 LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
 		libexpat.so:textproc/expat2 \
 		libvorbis.so:audio/libvorbis \
diff --git a/games/warsow/Makefile b/games/warsow/Makefile
index 3e788305caea..6ba2d0261dc3 100644
--- a/games/warsow/Makefile
+++ b/games/warsow/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Futuristic, fast-paced first person shooter
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
-RUN_DEPENDS=	${DATADIR}/basewsw/data1_15.pk3:games/warsow-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/basewsw/data1_15.pk3:games/warsow-data
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile
index 0c2cc1f911be..f61bfc5c01e8 100644
--- a/graphics/jdraw/Makefile
+++ b/graphics/jdraw/Makefile
@@ -35,7 +35,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MPLASTIC3D}
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
-RUN_DEPENDS+=	${JAVAJARDIR}/looks.jar:devel/looks
+RUN_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/looks
 .endif
 JAVA_VERSION=	1.6+
 
diff --git a/japanese/cmigemo/Makefile b/japanese/cmigemo/Makefile
index dedd95cd4ad3..46bb534f652b 100644
--- a/japanese/cmigemo/Makefile
+++ b/japanese/cmigemo/Makefile
@@ -17,7 +17,7 @@ COMMENT=	C implementation of Migemo Japanese incremental search tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE_MIT.txt
 
-RUN_DEPENDS=	${DATADIR}/cp932/migemo-dict:japanese/cmigemo-dict
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/cp932/migemo-dict:japanese/cmigemo-dict
 
 USE_LDCONFIG=	yes
 
diff --git a/japanese/font-ricty/Makefile b/japanese/font-ricty/Makefile
index 1af4b87fc190..679724ac7860 100644
--- a/japanese/font-ricty/Makefile
+++ b/japanese/font-ricty/Makefile
@@ -47,7 +47,7 @@ SUB_LIST+=	DISCORD="" RICTY=\#
 .endif
 
 .if ${PORT_OPTIONS:MDISCORD}
-RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Regular.ttf:japanese/font-ricty-discord
+RUN_DEPENDS+=	${LOCALBASE}/${DATADIR_REL}/RictyDiscord-Regular.ttf:japanese/font-ricty-discord
 .endif
 
 do-extract:
diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile
index 8bae46044485..a0769d017e5d 100644
--- a/japanese/vftool/Makefile
+++ b/japanese/vftool/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual font kit (n2a,a2n,a2bk,p2pn)
 
-BUILD_DEPENDS=	${AFMDIR}/GothicBBB-Medium-H:japanese/japaneseAFM
+BUILD_DEPENDS=	${LOCALBASE}/share/fonts/afm/GothicBBB-Medium-H:japanese/japaneseAFM
 
 ALL_TARGET=	n2a a2n a2bk p2pn
 SCRIPTS_ENV=	MV=${MV} SED=${SED} AFMDIR=${AFMDIR} JFMDIR=${JFMDIR}
diff --git a/japanese/xgate/Makefile b/japanese/xgate/Makefile
index b76a85f28e4a..b3e80da39944 100644
--- a/japanese/xgate/Makefile
+++ b/japanese/xgate/Makefile
@@ -46,7 +46,7 @@ RESTRICTED=	Commercial license
 
 .include <bsd.port.options.mk>
 
-APP_HOME!=	${MAKE} -C ${PORTSDIR}/www/tomcat6 -VAPP_HOME
+APP_HOME!=	${MAKE} -C ${PORTSDIR}/www/tomcat6 -VAPP_HOME PREFIX=${LOCALBASE}
 
 CNFLSTS=	account/admin.ndt	\
 		account/license.dat	\
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 71a2c487e6f0..b8ed172b2d42 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Package implementing the client side of the HTTP standard
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
-BUILD_DEPENDS+=	${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
-RUN_DEPENDS+=	${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+BUILD_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/java/junit/Makefile b/java/junit/Makefile
index d330d3469de6..50a67a780d65 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY=
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Regression testing utility for use with the Java(TM) Language
 
-RUN_DEPENDS=	${JAVAJARDIR}/hamcrest.jar:java/hamcrest
+RUN_DEPENDS=	${JAVALIBDIR}/hamcrest.jar:java/hamcrest
 
 USE_JAVA=	yes
 NO_BUILD=	yes
diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile
index 0ad8ac464f1b..6a7bf27ef2ff 100644
--- a/korean/ko.TeX/Makefile
+++ b/korean/ko.TeX/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	hlatex-[0-9]*
 NO_WRKSUBDIR=	yes
 
 TEXMF=		${PREFIX}/share/texmf-local
-BASE_MAP=	${TEXMF}/fonts/map/dvips/kotex/base/kotex-base.map
+BASE_MAP=	${LOCALBASE}/share/texmf-local/fonts/map/dvips/kotex/base/kotex-base.map
 KOTEX_BIBTEX=	${TEXMF}/bibtex/bst/kotex
 KOTEX_DOC=	${TEXMF}/doc/latex/kotex
 KOTEX_LATEX=	${TEXMF}/tex/latex/kotex
diff --git a/lang/clang37/Makefile b/lang/clang37/Makefile
index 8ee3252a5cca..788ada95ae1c 100644
--- a/lang/clang37/Makefile
+++ b/lang/clang37/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	${PREFIX}/bin/clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	37
 
diff --git a/lang/js_of_ocaml/Makefile b/lang/js_of_ocaml/Makefile
index f350e61a2632..3f72a4455d52 100644
--- a/lang/js_of_ocaml/Makefile
+++ b/lang/js_of_ocaml/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	ocaml-lwt>=2.3.0:devel/ocaml-lwt \
 		${SA_DIR}/deriving-ocsigen/deriving.a:devel/ocaml-deriving-ocsigen \
 		${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner
 
-SA_DIR=		${PREFIX}/${OCAML_SITELIBDIR}
+SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 USES=			gmake
 USE_OCAML=		yes
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 5a862d6ccc31..aa5c5cec31b4 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fast, compliant implementation of the Python language
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libffi.so:devel/libffi
-TEST_DEPENDS=	${PREFIX}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \
-		${PREFIX}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \
-		${PREFIX}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter
+TEST_DEPENDS=	${LOCALBASE}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.${PYPY_CFFI_VER}.so:databases/pypy-gdbm \
+		${LOCALBASE}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \
+		${LOCALBASE}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter
 
 ONLY_FOR_ARCHS=	i386 amd64 armv6 powerpc64
 ONLY_FOR_ARCHS_REASON=	PyPy JIT only supported on these architectures
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index 897aa592e83b..0413a7e67204 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -41,7 +41,7 @@ GH_ACCOUNT=	mozilla
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLINEDIT}
-JLINEJAR=	${JAVAJARDIR}/jline.jar
+JLINEJAR=	${JAVALIBDIR}/jline.jar
 .else
 JLINEJAR=""
 .endif
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index 488ef7d8bd6e..c8e078208d44 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java parser for e-mail message streams
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 071dcb865eea..a7aba1b0c597 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -25,7 +25,7 @@ TEST_DEPENDS=	bash:shells/bash \
 		gsed:sysutils/coreutils \
 		gsha256sum:sysutils/coreutils \
 		gpg:security/gnupg \
-		${PREFIX}/bin/gdb:devel/gdb
+		${LOCALBASE}/bin/gdb:devel/gdb
 
 BROKEN_powerpc64=	Does not build
 
@@ -41,7 +41,7 @@ TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic count insert smime atomicity \
 		message-property" \
 		V=1 \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
-		BSD_GDB=${PREFIX}/bin/gdb
+		BSD_GDB=${LOCALBASE}/bin/gdb
 
 TEST_TARGET=	test
 
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index dcaeadfbd7d8..436cb09ae68b 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Decoders to display extra character sets in SquirrelMail
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:mail/squirrelmail
+RUN_DEPENDS=	${SQUIRRELDIR:S,^${PREFIX}/,${LOCALBASE}/,}/index.php:mail/squirrelmail
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index 5772287622d4..1624a30f2510 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Using the QmailAdmin cgi interface from SquirrelMail
 
-RUN_DEPENDS=	${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:mail/qmailadmin
+RUN_DEPENDS=	${LOCALBASE}/www/cgi-bin.default/qmailadmin/qmailadmin:mail/qmailadmin
 
 USE_GENERIC_PKGMESSAGE=	yes
 
diff --git a/mail/squirrelmail-tmda-plugin/Makefile b/mail/squirrelmail-tmda-plugin/Makefile
index f79adc3c910a..e26836fdddd5 100644
--- a/mail/squirrelmail-tmda-plugin/Makefile
+++ b/mail/squirrelmail-tmda-plugin/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adds TMDA support to SquirrelMail
 
 RUN_DEPENDS=	tmda-filter:mail/tmda \
-		${SQUIRRELDIR}/index.php:mail/squirrelmail
+		${SQUIRRELDIR:S,^${PREFIX}/,${LOCALBASE}/,}/index.php:mail/squirrelmail
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index 8fb89e36e8f8..596592030e1b 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -33,7 +33,7 @@ PKGNAMEPREFIX?=	squirrelmail-
 PKGNAMESUFFIX?=	-plugin
 DIST_SUBDIR?=	squirrelmail
 
-RUN_DEPENDS+=	${SQUIRRELDIR}/index.php:mail/squirrelmail
+RUN_DEPENDS+=	${LOCALBASE}/${SQUIRRELDIR_REL}/index.php:mail/squirrelmail
 
 .ifdef USE_SM_COMPAT
 RUN_DEPENDS+=	squirrelmail-compatibility-plugin>0:mail/squirrelmail-compatibility-plugin
diff --git a/math/jlatexmath/Makefile b/math/jlatexmath/Makefile
index 6a2bee5c8443..de9d668c59ca 100644
--- a/math/jlatexmath/Makefile
+++ b/math/jlatexmath/Makefile
@@ -28,7 +28,7 @@ FOP_DESC=		textproc/fop plugin (required for math/scilab)
 FOP_BUILD_DEPENDS=	fop:textproc/fop \
 			${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 FOP_RUN_DEPENDS:=	${FOP_BUILD_DEPENDS} \
-			${JAVASHAREDIR}/batik/batik.jar:graphics/batik \
+			${JAVALIBDIR}/../batik/batik.jar:graphics/batik \
 			${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
 			${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
 			${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
diff --git a/net/tn5250j/Makefile b/net/tn5250j/Makefile
index 0b1d2842800a..36dbb99b439d 100644
--- a/net/tn5250j/Makefile
+++ b/net/tn5250j/Makefile
@@ -11,16 +11,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	saper@saper.info
 COMMENT=	5250 terminal emulator for the AS/400 written in Java
 
-BUILD_DEPENDS=	${JAVAJARDIR}/mail.jar:java/javamail \
+BUILD_DEPENDS=	${JAVALIBDIR}/mail.jar:java/javamail \
 		${JYTHON_JAR}:lang/jython \
-		${JAVAJARDIR}/jt400.jar:sysutils/jtopen \
-		${JAVAJARDIR}/itext.jar:devel/itext \
-		${JAVAJARDIR}/log4j.jar:devel/log4j
-RUN_DEPENDS=	${JAVAJARDIR}/mail.jar:java/javamail \
+		${JAVALIBDIR}/jt400.jar:sysutils/jtopen \
+		${JAVALIBDIR}/itext.jar:devel/itext \
+		${JAVALIBDIR}/log4j.jar:devel/log4j
+RUN_DEPENDS=	${JAVALIBDIR}/mail.jar:java/javamail \
 		${JYTHON_JAR}:lang/jython \
-		${JAVAJARDIR}/jt400.jar:sysutils/jtopen \
-		${JAVAJARDIR}/itext.jar:devel/itext \
-		${JAVAJARDIR}/log4j.jar:devel/log4j
+		${JAVALIBDIR}/jt400.jar:sysutils/jtopen \
+		${JAVALIBDIR}/itext.jar:devel/itext \
+		${JAVALIBDIR}/log4j.jar:devel/log4j
 
 USES=		dos2unix zip
 USE_ANT=	yes
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index d479dfe3d9ac..27fd26a7f07c 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Java tool for working with PDF documents
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:java/bouncycastle	\
+RUN_DEPENDS=	${JAVALIBDIR}/bcmail.jar:java/bouncycastle	\
 		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 JAR_NAMES=	pdfbox fontbox jempbox preflight xmpbox
diff --git a/sysutils/usermatic/Makefile b/sysutils/usermatic/Makefile
index eb76d2d66c41..40f5f43a6c9a 100644
--- a/sysutils/usermatic/Makefile
+++ b/sysutils/usermatic/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://btw23.de/johannes/usermatic/\
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Scripts to automate the maintenance of accounts
 
-RUN_DEPENDS=	${PREFIX}/sbin/userneu.pl:sysutils/userneu
+RUN_DEPENDS=	${LOCALBASE}/sbin/userneu.pl:sysutils/userneu
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 596b33ed3542..74daed87b5f7 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 INSTDIR=	${PREFIX}/share/sgml/linuxdoc
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
+ISOCAT=		${LOCALBASE}/share/sgml/iso8879/catalog
 
 do-install:
 	${MKDIR} ${STAGEDIR}${INSTDIR}
diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile
index 2ad6c963980c..60682251ea9f 100644
--- a/www/httpasyncclient/Makefile
+++ b/www/httpasyncclient/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Java components implementing an asynchronous HTTP client
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${JAVAJARDIR}/httpclient.jar:www/httpclient
+RUN_DEPENDS=	${JAVALIBDIR}/httpclient.jar:www/httpclient
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index 1c19502f19bb..abfcb6c4407f 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -16,9 +16,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 USES+=	cpe
 CPE_PRODUCT=	commons-httpclient
 CPE_VENDOR=	apache
-RUN_DEPENDS=	${JAVAJARDIR}/httpcore.jar:www/httpcore \
-		${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging \
-		${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec
+RUN_DEPENDS=	${JAVALIBDIR}/httpcore.jar:www/httpcore \
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 USE_JAVA=	yes
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 6349f88f3703..8333516888e5 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -14,31 +14,31 @@ LICENSE=	APACHE20
 # These are JAR-files installed by other ports. The list should keep
 # growing until all Java applications install just their own JARs -- not
 # the 3rd-party ones:
-RUN_DEPENDS=	${JAVAJARDIR}/activation.jar:java/jaf	\
-		${JAVAJARDIR}/avalon-framework.jar:devel/avalon-framework	\
-		${JAVAJARDIR}/commons-codec.jar:java/jakarta-commons-codec	\
+RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:java/jaf	\
+		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework	\
+		${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec	\
 		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections	\
 		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient	\
 		${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
 		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang	\
-		${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging	\
-		${JAVAJARDIR}/commons-net.jar:net/jakarta-commons-net	\
-		${JAVAJARDIR}/httpclient.jar:www/httpclient	\
-		${JAVAJARDIR}/httpcore.jar:www/httpcore	\
-		${JAVAJARDIR}/httpmime.jar:www/httpclient	\
-		${JAVAJARDIR}/jakarta-oro.jar:java/jakarta-oro	\
-		${JAVAJARDIR}/jdom.jar:java/jdom	\
-		${JAVAJARDIR}/junit.jar:java/junit	\
-		${JAVAJARDIR}/mail.jar:java/javamail	\
-		${JAVAJARDIR}/serializer.jar:textproc/xalan-j	\
-		${JAVAJARDIR}/slf4j-api.jar:devel/slf4j	\
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging	\
+		${JAVALIBDIR}/commons-net.jar:net/jakarta-commons-net	\
+		${JAVALIBDIR}/httpclient.jar:www/httpclient	\
+		${JAVALIBDIR}/httpcore.jar:www/httpcore	\
+		${JAVALIBDIR}/httpmime.jar:www/httpclient	\
+		${JAVALIBDIR}/jakarta-oro.jar:java/jakarta-oro	\
+		${JAVALIBDIR}/jdom.jar:java/jdom	\
+		${JAVALIBDIR}/junit.jar:java/junit	\
+		${JAVALIBDIR}/mail.jar:java/javamail	\
+		${JAVALIBDIR}/serializer.jar:textproc/xalan-j	\
+		${JAVALIBDIR}/slf4j-api.jar:devel/slf4j	\
 		${LOCALBASE}/share/slf4j/slf4j-nop.jar:devel/slf4j	\
-		${JAVAJARDIR}/xalan.jar:textproc/xalan-j	\
-		${JAVAJARDIR}/xercesImpl.jar:textproc/xerces-j	\
-		${JAVAJARDIR}/xml-apis.jar:textproc/xerces-j	\
-		${JAVAJARDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons	\
-		${JAVAJARDIR}/xstream.jar:textproc/xstream	\
-		${JAVASHAREDIR}/rhino/rhino.jar:lang/rhino
+		${JAVALIBDIR}/xalan.jar:textproc/xalan-j	\
+		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j	\
+		${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j	\
+		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons	\
+		${JAVALIBDIR}/xstream.jar:textproc/xstream	\
+		${JAVALIBDIR}/../rhino/rhino.jar:lang/rhino
 
 USES=		tar:tgz
 USE_JAVA=	yes
diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
index e54a9eef46c0..a13fb68d9c70 100644
--- a/www/madsonic/Makefile
+++ b/www/madsonic/Makefile
@@ -39,7 +39,7 @@ APE_DESC=	Depend on mac for Monkey's Audio transcoding #'
 OPTIONS_DEFAULT=	FFMPEG JETTY
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:www/servlet-api \
+RUN_DEPENDS+=	${JAVALIBDIR}/servlet-api.jar:www/servlet-api \
 	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
 TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
diff --git a/www/nuvolaplayer-all-services/Makefile b/www/nuvolaplayer-all-services/Makefile
index a0ec797e5558..af1624e96852 100644
--- a/www/nuvolaplayer-all-services/Makefile
+++ b/www/nuvolaplayer-all-services/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFAULT=${OPTIONS_DEFINE}
 
 . for o in ${OPTIONS_DEFINE}
 ${o}_DESC=	${NV_${o}_DESC} support
-${o}_RUN_DEPENDS=${_DATADIR}/web_apps/${NV_${o}_NAME:S/-/_/g}/metadata.json:www/${PORTNAME}-${NV_${o}_NAME}
+${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}/,}/web_apps/${NV_${o}_NAME:S/-/_/g}/metadata.json:www/${PORTNAME}-${NV_${o}_NAME}
 . endfor
 .else
 NV_ID=		${${.CURDIR:T:S/${PORTNAME}-//}_ID}
diff --git a/www/subsonic/Makefile b/www/subsonic/Makefile
index a3e32a2a0fbc..82ff053091d7 100644
--- a/www/subsonic/Makefile
+++ b/www/subsonic/Makefile
@@ -38,7 +38,7 @@ APE_DESC=	Depend on mac for Monkey's Audio transcoding #'
 OPTIONS_DEFAULT=	FFMPEG JETTY
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:www/servlet-api \
+RUN_DEPENDS+=	${JAVALIBDIR}/servlet-api.jar:www/servlet-api \
 	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
 TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat8
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index d49dc239a199..85ec82fc0c17 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org drivers meta-port
 
-VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
-INPUTDIR=	${PREFIX}/lib/xorg/modules/input
+VIDEODIR=	${LOCALBASE}/lib/xorg/modules/drivers
+INPUTDIR=	${LOCALBASE}/lib/xorg/modules/input
 
 USES=		metaport