svn commit: r431402 - in head: databases/jasperreports devel/charva devel/eric6 devel/gitblit devel/ocaml-lwt devel/tcllibc editors/libreoffice-i18n games/alienarena games/glest games/megaglest gam...
Mathieu Arnold
mat at FreeBSD.org
Fri Jan 13 16:55:01 UTC 2017
Author: mat
Date: Fri Jan 13 16:54:55 2017
New Revision: 431402
URL: https://svnweb.freebsd.org/changeset/ports/431402
Log:
Fix ports using PREFIX in their depends instead of LOCALBASE.
With hat: portmgr
Sponsored by: Absolight
Modified:
head/databases/jasperreports/Makefile (contents, props changed)
head/devel/charva/Makefile (contents, props changed)
head/devel/eric6/Makefile.inc (contents, props changed)
head/devel/gitblit/Makefile (contents, props changed)
head/devel/ocaml-lwt/Makefile (contents, props changed)
head/devel/tcllibc/Makefile (contents, props changed)
head/editors/libreoffice-i18n/Makefile (contents, props changed)
head/games/alienarena/Makefile (contents, props changed)
head/games/glest/Makefile (contents, props changed)
head/games/megaglest/Makefile (contents, props changed)
head/games/naev/Makefile (contents, props changed)
head/games/openarena/Makefile (contents, props changed)
head/games/scourge/Makefile (contents, props changed)
head/games/trigger-rally/Makefile (contents, props changed)
head/games/vegastrike/Makefile (contents, props changed)
head/games/warsow/Makefile (contents, props changed)
head/graphics/jdraw/Makefile (contents, props changed)
head/japanese/cmigemo/Makefile (contents, props changed)
head/japanese/font-ricty/Makefile (contents, props changed)
head/japanese/vftool/Makefile (contents, props changed)
head/japanese/xgate/Makefile (contents, props changed)
head/java/jakarta-commons-httpclient/Makefile (contents, props changed)
head/java/junit/Makefile (contents, props changed)
head/korean/ko.TeX/Makefile (contents, props changed)
head/lang/clang37/Makefile (contents, props changed)
head/lang/js_of_ocaml/Makefile (contents, props changed)
head/lang/pypy/Makefile (contents, props changed)
head/lang/rhino/Makefile (contents, props changed)
head/mail/mime4j/Makefile (contents, props changed)
head/mail/notmuch/Makefile (contents, props changed)
head/mail/squirrelmail-decode/Makefile (contents, props changed)
head/mail/squirrelmail-qmailadmin_login-plugin/Makefile (contents, props changed)
head/mail/squirrelmail-tmda-plugin/Makefile (contents, props changed)
head/mail/squirrelmail/bsd.squirrelmail.mk (contents, props changed)
head/math/jlatexmath/Makefile (contents, props changed)
head/net/tn5250j/Makefile (contents, props changed)
head/print/pdfbox/Makefile (contents, props changed)
head/sysutils/usermatic/Makefile (contents, props changed)
head/textproc/linuxdoc/Makefile (contents, props changed)
head/www/httpasyncclient/Makefile (contents, props changed)
head/www/httpclient/Makefile (contents, props changed)
head/www/jmeter/Makefile (contents, props changed)
head/www/madsonic/Makefile (contents, props changed)
head/www/nuvolaplayer-all-services/Makefile (contents, props changed)
head/www/subsonic/Makefile (contents, props changed)
head/x11-drivers/xorg-drivers/Makefile (contents, props changed)
Modified: head/databases/jasperreports/Makefile
==============================================================================
--- head/databases/jasperreports/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/databases/jasperreports/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -15,7 +15,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/itext.jar:dev
${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
Modified: head/devel/charva/Makefile
==============================================================================
--- head/devel/charva/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/devel/charva/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -12,7 +12,7 @@ MAINTAINER= ale at 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
Modified: head/devel/eric6/Makefile.inc
==============================================================================
--- head/devel/eric6/Makefile.inc Fri Jan 13 16:49:59 2017 (r431401)
+++ head/devel/eric6/Makefile.inc Fri Jan 13 16:54:55 2017 (r431402)
@@ -16,7 +16,7 @@ COMMENT= Full featured Python and Ruby e
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}
Modified: head/devel/gitblit/Makefile
==============================================================================
--- head/devel/gitblit/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/devel/gitblit/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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:
Modified: head/devel/ocaml-lwt/Makefile
==============================================================================
--- head/devel/ocaml-lwt/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/devel/ocaml-lwt/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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>
Modified: head/devel/tcllibc/Makefile
==============================================================================
--- head/devel/tcllibc/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/devel/tcllibc/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/editors/libreoffice-i18n/Makefile
==============================================================================
--- head/editors/libreoffice-i18n/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/editors/libreoffice-i18n/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/games/alienarena/Makefile
==============================================================================
--- head/games/alienarena/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/alienarena/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-7.66-linux20130827
MAINTAINER= acm at 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
Modified: head/games/glest/Makefile
==============================================================================
--- head/games/glest/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/glest/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -15,7 +15,7 @@ COMMENT= Free 3D real-time customizable
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
Modified: head/games/megaglest/Makefile
==============================================================================
--- head/games/megaglest/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/megaglest/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/games/naev/Makefile
==============================================================================
--- head/games/naev/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/naev/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/games/openarena/Makefile
==============================================================================
--- head/games/openarena/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/openarena/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -16,7 +16,7 @@ COMMENT= Quake3 total conversion based o
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
Modified: head/games/scourge/Makefile
==============================================================================
--- head/games/scourge/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/scourge/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -13,7 +13,7 @@ MAINTAINER= ports at 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
Modified: head/games/trigger-rally/Makefile
==============================================================================
--- head/games/trigger-rally/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/trigger-rally/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/games/vegastrike/Makefile
==============================================================================
--- head/games/vegastrike/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/vegastrike/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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 \
Modified: head/games/warsow/Makefile
==============================================================================
--- head/games/warsow/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/games/warsow/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -15,7 +15,7 @@ COMMENT= Futuristic, fast-paced first pe
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
Modified: head/graphics/jdraw/Makefile
==============================================================================
--- head/graphics/jdraw/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/graphics/jdraw/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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+
Modified: head/japanese/cmigemo/Makefile
==============================================================================
--- head/japanese/cmigemo/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/japanese/cmigemo/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -17,7 +17,7 @@ COMMENT= C implementation of Migemo Japa
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
Modified: head/japanese/font-ricty/Makefile
==============================================================================
--- head/japanese/font-ricty/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/japanese/font-ricty/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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:
Modified: head/japanese/vftool/Makefile
==============================================================================
--- head/japanese/vftool/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/japanese/vftool/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports at 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}
Modified: head/japanese/xgate/Makefile
==============================================================================
--- head/japanese/xgate/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/japanese/xgate/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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 \
Modified: head/java/jakarta-commons-httpclient/Makefile
==============================================================================
--- head/java/jakarta-commons-httpclient/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/java/jakarta-commons-httpclient/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -14,10 +14,10 @@ COMMENT= Package implementing the client
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
Modified: head/java/junit/Makefile
==============================================================================
--- head/java/junit/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/java/junit/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -11,7 +11,7 @@ EXTRACT_ONLY=
MAINTAINER= danilo at 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
Modified: head/korean/ko.TeX/Makefile
==============================================================================
--- head/korean/ko.TeX/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/korean/ko.TeX/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/lang/clang37/Makefile
==============================================================================
--- head/lang/clang37/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/lang/clang37/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= ${LLVM_SUFFIX}
MAINTAINER= brooks at 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
Modified: head/lang/js_of_ocaml/Makefile
==============================================================================
--- head/lang/js_of_ocaml/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/lang/js_of_ocaml/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -16,7 +16,7 @@ RUN_DEPENDS= ocaml-lwt>=2.3.0:devel/ocam
${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
Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/lang/pypy/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -12,9 +12,9 @@ COMMENT= Fast, compliant implementation
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
Modified: head/lang/rhino/Makefile
==============================================================================
--- head/lang/rhino/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/lang/rhino/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/mail/mime4j/Makefile
==============================================================================
--- head/mail/mime4j/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/mail/mime4j/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -12,7 +12,7 @@ COMMENT= Java parser for e-mail message
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
Modified: head/mail/notmuch/Makefile
==============================================================================
--- head/mail/notmuch/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/mail/notmuch/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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 cou
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
Modified: head/mail/squirrelmail-decode/Makefile
==============================================================================
--- head/mail/squirrelmail-decode/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/mail/squirrelmail-decode/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -13,7 +13,7 @@ COMMENT= Decoders to display extra chara
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
Modified: head/mail/squirrelmail-qmailadmin_login-plugin/Makefile
==============================================================================
--- head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/mail/squirrelmail-qmailadmin_login-plugin/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.4
MAINTAINER= ports at 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
Modified: head/mail/squirrelmail-tmda-plugin/Makefile
==============================================================================
--- head/mail/squirrelmail-tmda-plugin/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/mail/squirrelmail-tmda-plugin/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -13,7 +13,7 @@ MAINTAINER= ports at 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
Modified: head/mail/squirrelmail/bsd.squirrelmail.mk
==============================================================================
--- head/mail/squirrelmail/bsd.squirrelmail.mk Fri Jan 13 16:49:59 2017 (r431401)
+++ head/mail/squirrelmail/bsd.squirrelmail.mk Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/math/jlatexmath/Makefile
==============================================================================
--- head/math/jlatexmath/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/math/jlatexmath/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -28,7 +28,7 @@ FOP_DESC= textproc/fop plugin (required
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 \
Modified: head/net/tn5250j/Makefile
==============================================================================
--- head/net/tn5250j/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/net/tn5250j/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -11,16 +11,16 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= saper at 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
Modified: head/print/pdfbox/Makefile
==============================================================================
--- head/print/pdfbox/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/print/pdfbox/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -13,7 +13,7 @@ COMMENT= Java tool for working with PDF
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
Modified: head/sysutils/usermatic/Makefile
==============================================================================
--- head/sysutils/usermatic/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/sysutils/usermatic/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -11,7 +11,7 @@ MASTER_SITES= http://btw23.de/johannes/u
MAINTAINER= fehlner at 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
Modified: head/textproc/linuxdoc/Makefile
==============================================================================
--- head/textproc/linuxdoc/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/textproc/linuxdoc/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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}
Modified: head/www/httpasyncclient/Makefile
==============================================================================
--- head/www/httpasyncclient/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/www/httpasyncclient/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -13,7 +13,7 @@ COMMENT= Java components implementing an
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
Modified: head/www/httpclient/Makefile
==============================================================================
--- head/www/httpclient/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/www/httpclient/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/www/jmeter/Makefile
==============================================================================
--- head/www/jmeter/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/www/jmeter/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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
Modified: head/www/madsonic/Makefile
==============================================================================
--- head/www/madsonic/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/www/madsonic/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -39,7 +39,7 @@ APE_DESC= Depend on mac for Monkey's Aud
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
Modified: head/www/nuvolaplayer-all-services/Makefile
==============================================================================
--- head/www/nuvolaplayer-all-services/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/www/nuvolaplayer-all-services/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -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}
Modified: head/www/subsonic/Makefile
==============================================================================
--- head/www/subsonic/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/www/subsonic/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -38,7 +38,7 @@ APE_DESC= Depend on mac for Monkey's Aud
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
Modified: head/x11-drivers/xorg-drivers/Makefile
==============================================================================
--- head/x11-drivers/xorg-drivers/Makefile Fri Jan 13 16:49:59 2017 (r431401)
+++ head/x11-drivers/xorg-drivers/Makefile Fri Jan 13 16:54:55 2017 (r431402)
@@ -8,8 +8,8 @@ CATEGORIES= x11-drivers
MAINTAINER= x11 at 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
More information about the svn-ports-head
mailing list