Fix ports using PREFIX in their depends instead of LOCALBASE.

With hat:	portmgr
Sponsored by:	Absolight

6 files changed, 27 insertions, 27 deletions

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