aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2015-01-24 23:07:39 +0800
committerantoine <antoine@FreeBSD.org>2015-01-24 23:07:39 +0800
commitefdf659d4a6e4fd3ac42c75ee835fc22037e29ab (patch)
treebf67c1bb6ae5b2f8e4074d102338a30cdf8b4cd8 /java
parent9aacbad58fc52aedc2b94701fba20c62fef1e7bd (diff)
downloadfreebsd-ports-gnome-efdf659d4a6e4fd3ac42c75ee835fc22037e29ab.tar.gz
freebsd-ports-gnome-efdf659d4a6e4fd3ac42c75ee835fc22037e29ab.tar.zst
freebsd-ports-gnome-efdf659d4a6e4fd3ac42c75ee835fc22037e29ab.zip
Switch some dependencies from a directory name or a file generated by pkg-install
to a package name, as the former can't be attributed to a package
Diffstat (limited to 'java')
-rw-r--r--java/bootstrap-openjdk/Makefile2
-rw-r--r--java/eclipse-datatools/Makefile4
-rw-r--r--java/eclipse-hibernatetools/Makefile4
-rw-r--r--java/eclipse-ocl/Makefile2
-rw-r--r--java/eclipse-quantum/Makefile2
-rw-r--r--java/eclipse-sqlexplorer/Makefile2
-rw-r--r--java/eclipse-uml/Makefile2
-rw-r--r--java/eclipse-vep/Makefile4
-rw-r--r--java/eclipse-webtools/Makefile6
-rw-r--r--java/openjdk6/Makefile6
-rw-r--r--java/openjdk7/Makefile4
-rw-r--r--java/openjdk8/Makefile4
12 files changed, 21 insertions, 21 deletions
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 41252037ee54..0873f21b7359 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -13,7 +13,7 @@ COMMENT= Oracle's Java 6 virtual machine release under the GPL v2
LICENSE= GPLv2
-RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+RUN_DEPENDS= java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
ONLY_FOR_ARCHS= amd64 i386
diff --git a/java/eclipse-datatools/Makefile b/java/eclipse-datatools/Makefile
index a3bf8cc4dace..1f206f56a95b 100644
--- a/java/eclipse-datatools/Makefile
+++ b/java/eclipse-datatools/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= ljboiler@gmail.com
COMMENT= Data Tools Platform for the Eclipse IDE
RUN_DEPENDS= ${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf \
- ${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+ eclipse-emf>0:${PORTSDIR}/java/eclipse-emf \
+ eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
LICENSE= EPL
diff --git a/java/eclipse-hibernatetools/Makefile b/java/eclipse-hibernatetools/Makefile
index 2708d348a2f8..1c1808a51abf 100644
--- a/java/eclipse-hibernatetools/Makefile
+++ b/java/eclipse-hibernatetools/Makefile
@@ -19,8 +19,8 @@ LICENSE_COMB= multi
## XXX - Notify the maintainer if the dependencies on either
## java/eclipse-gef of java/eclipse-webtools change
RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef \
- ${LOCALBASE}/share/eclipse/dropins/webtools:${PORTSDIR}/java/eclipse-webtools
+ eclipse-gef>0:${PORTSDIR}/java/eclipse-gef \
+ eclipse-webtools>0:${PORTSDIR}/java/eclipse-webtools
USES= zip
NO_BUILD= yes
diff --git a/java/eclipse-ocl/Makefile b/java/eclipse-ocl/Makefile
index 33dc7b23266f..f4fba2058599 100644
--- a/java/eclipse-ocl/Makefile
+++ b/java/eclipse-ocl/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= vj562001@yahoo.de
COMMENT= Implementation of the OCL OMG standard for EMF-based models
RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf
+ eclipse-emf>0:${PORTSDIR}/java/eclipse-emf
USES= zip
NO_BUILD= yes
diff --git a/java/eclipse-quantum/Makefile b/java/eclipse-quantum/Makefile
index 054fde683241..208b466af69d 100644
--- a/java/eclipse-quantum/Makefile
+++ b/java/eclipse-quantum/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Database access and SQL editor for the Eclipse IDE
RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+ eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
USES= zip
NO_WRKSUBDIR= yes
diff --git a/java/eclipse-sqlexplorer/Makefile b/java/eclipse-sqlexplorer/Makefile
index 304b460523ac..5a606ca147c9 100644
--- a/java/eclipse-sqlexplorer/Makefile
+++ b/java/eclipse-sqlexplorer/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Visual database query tool for Eclipse
RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+ eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
USES= zip
NO_BUILD= yes
diff --git a/java/eclipse-uml/Makefile b/java/eclipse-uml/Makefile
index cea7e6fabcad..388c452cf75c 100644
--- a/java/eclipse-uml/Makefile
+++ b/java/eclipse-uml/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Framework creating UML diagrams in Eclipse
RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf
+ eclipse-emf>0:${PORTSDIR}/java/eclipse-emf
USES= zip
NO_BUILD= yes
diff --git a/java/eclipse-vep/Makefile b/java/eclipse-vep/Makefile
index 628494eaf74f..f7c175002f04 100644
--- a/java/eclipse-vep/Makefile
+++ b/java/eclipse-vep/Makefile
@@ -16,8 +16,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Framework for creating GUI builders for Eclipse
RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf \
- ${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+ eclipse-emf>0:${PORTSDIR}/java/eclipse-emf \
+ eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
USES= zip
NO_BUILD= yes
diff --git a/java/eclipse-webtools/Makefile b/java/eclipse-webtools/Makefile
index 68d6d404475b..1a022e3a81ee 100644
--- a/java/eclipse-webtools/Makefile
+++ b/java/eclipse-webtools/Makefile
@@ -17,9 +17,9 @@ COMMENT= Webtools for eclipse
LICENSE= EPL
RUN_DEPENDS= ${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
- ${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf \
- ${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef \
- ${LOCALBASE}/share/eclipse/dropins/datatools:${PORTSDIR}/java/eclipse-datatools
+ eclipse-emf>0:${PORTSDIR}/java/eclipse-emf \
+ eclipse-gef>0:${PORTSDIR}/java/eclipse-gef \
+ eclipse-datatools>0:${PORTSDIR}/java/eclipse-datatools
WRKSRC= ${WRKDIR}/eclipse
USES= zip
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 4050e14adc9f..f79185b9fd0c 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
- ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+ dejavu>0:${PORTSDIR}/x11-fonts/dejavu
OPENJDK_BUILDDATE= 20_jan_2015
@@ -79,7 +79,7 @@ CATEGORIES+= ipv6
.endif
.if ${PORT_OPTIONS:MTZUPDATE}
-RUN_DEPENDS+= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+RUN_DEPENDS+= java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
.endif
# avoid ARCH in MAKEFLAGS, breaks build
@@ -157,7 +157,7 @@ EXTRA_PATCHES+= ${FILESDIR}/alsa-disable.patch
.if ${PORT_OPTIONS:MTEST}
DISTFILES+= ${JTREGFILE}:jtreg
EXTRACT_ONLY+= ${JTREGFILE}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+BUILD_DEPENDS+= dejavu>0:${PORTSDIR}/x11-fonts/dejavu
USES+= display:test
.else
EXTRA_PATCHES+= ${FILESDIR}/test_gamma-disable.patch
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index e0bf206c0e32..682d91df9902 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -57,7 +57,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper \
- ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+ dejavu>0:${PORTSDIR}/x11-fonts/dejavu
DOS2UNIX_FILES= jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
@@ -106,7 +106,7 @@ BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
DEBUG_MAKE_ENV= ALT_OBJCOPY=${NONEXISTENT}
POLICY_MAKE_ENV= UNLIMITED_CRYPTO=1
-TZUPDATE_RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
.include <bsd.port.options.mk>
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 2bfa0c571614..86ee4bf87a48 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib \
libfreetype.so:${PORTSDIR}/print/freetype2 \
libgif.so:${PORTSDIR}/graphics/giflib
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
- ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+ dejavu>0:${PORTSDIR}/x11-fonts/dejavu
USES= compiler:features dos2unix gmake iconv pkgconfig shebangfix
USE_AUTOTOOLS= autoconf
@@ -105,7 +105,7 @@ POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data
POLICY_CONFIGURE_ENABLE=unlimited-crypto
-TZUPDATE_RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}