diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 05:03:02 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 05:03:02 +0000 |
| commit | 06e66777937202f04d646d24d24f524b13d79478 (patch) | |
| tree | 85a44213b1929b12051c17091ea4ad53f819456b /net-p2p | |
| parent | Fix another typo (diff) | |
Now that the Java 1.3 and Java 1.4 ports are deprecated and will expire soon,
remove support for them from bsd.java.mk. As Jikes is not available in Java 1.5
or higher, remove it from bsd.java.mk too (suggested by hq@) and from the ports
which used it (only occurences were USE_JIKES=no). Support for the Blackdown VM
is also removed, as it is not available in Java 1.5 and higher.
Also remove the mapping from Java 1.1-1.4 to Java 1.5+ in bsd.java.mk to detect
old, broken ports; therefore bump the minimal value of JAVA_VERSION to 1.5.
While here, replace static values of JAVA_VERSION in files/*.in by
%%JAVA_VERSION%% .
PR: ports/158969
Submitted by: rene
Tested on: pointyhat-west -exp
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/azureus/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/azureus2/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/frostwire/files/frostwire.sh.in | 2 | ||||
| -rw-r--r-- | net-p2p/limewire/Makefile | 2 | ||||
| -rw-r--r-- | net-p2p/limewire/files/limewire.sh.in | 2 | ||||
| -rw-r--r-- | net-p2p/xnap/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/net-p2p/azureus/Makefile b/net-p2p/azureus/Makefile index 26f4be377622..b9107e6ce57a 100644 --- a/net-p2p/azureus/Makefile +++ b/net-p2p/azureus/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \ ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_ANT= yes diff --git a/net-p2p/azureus2/Makefile b/net-p2p/azureus2/Makefile index 7abf19d47920..5312419475e4 100644 --- a/net-p2p/azureus2/Makefile +++ b/net-p2p/azureus2/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \ RUN_DEPENDS= ${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_ANT= yes diff --git a/net-p2p/frostwire/files/frostwire.sh.in b/net-p2p/frostwire/files/frostwire.sh.in index 3aff2282e2b6..7962e9a23c93 100644 --- a/net-p2p/frostwire/files/frostwire.sh.in +++ b/net-p2p/frostwire/files/frostwire.sh.in @@ -3,6 +3,6 @@ # $FreeBSD$ export J2SE_PREEMPTCLOSE=1 -export JAVA_VERSION="1.3+" +export JAVA_VERSION="%%JAVA_VERSION%%" cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar FrostWire.jar "$@" diff --git a/net-p2p/limewire/Makefile b/net-p2p/limewire/Makefile index 994a8d52f52b..82f9be460151 100644 --- a/net-p2p/limewire/Makefile +++ b/net-p2p/limewire/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/LimeWire diff --git a/net-p2p/limewire/files/limewire.sh.in b/net-p2p/limewire/files/limewire.sh.in index 09b8b01dc6e3..588410c1e595 100644 --- a/net-p2p/limewire/files/limewire.sh.in +++ b/net-p2p/limewire/files/limewire.sh.in @@ -3,6 +3,6 @@ # $FreeBSD$ export J2SE_PREEMPTCLOSE=1 -export JAVA_VERSION="1.3+" +export JAVA_VERSION="%%JAVA_VERSION%%" cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar LimeWire.jar "$@" diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile index a542cad00e08..b864ee43f6d6 100644 --- a/net-p2p/xnap/Makefile +++ b/net-p2p/xnap/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A pure java napster client; also, supports OpenNap & giFT (FastTrack) USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JAVAVM= ${LOCALBASE}/bin/java |