From b52944915a792d1df1b4539b6ffef32bb06c623c Mon Sep 17 00:00:00 2001 From: linimon Date: Thu, 21 Jul 2011 05:03:02 +0000 Subject: 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 --- archivers/jzip.org/Makefile | 2 +- archivers/jzip.org/files/jzip.org.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'archivers/jzip.org') diff --git a/archivers/jzip.org/Makefile b/archivers/jzip.org/Makefile index d68becd..b6d66a2 100644 --- a/archivers/jzip.org/Makefile +++ b/archivers/jzip.org/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper PLIST_FILES= %%JAVAJARDIR%%/jzip.org.jar bin/${PORTNAME} USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION}.src SUB_FILES= ${PORTNAME}.sh diff --git a/archivers/jzip.org/files/jzip.org.sh.in b/archivers/jzip.org/files/jzip.org.sh.in index 1e1c536..a4fae5d 100644 --- a/archivers/jzip.org/files/jzip.org.sh.in +++ b/archivers/jzip.org/files/jzip.org.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION=1.2+ "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jzip.org.jar" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jzip.org.jar" "$@" -- cgit v1.1