diff options
270 files changed, 284 insertions, 396 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index ee091f1fd079..cfe9788a88c2 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -688,7 +688,7 @@ MOZ_OPTIONS+= --disable-debug \ .if defined(WITH_JAVA) && defined(_WITH_JAVA) USE_JAVA= yes -JAVA_VERSION+= 1.4+ +JAVA_VERSION+= 1.5+ JAVA_OS+= native CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" MOZ_OPTIONS+= --enable-javaxpcom diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index c548cc9e64bd..a76b9bc29c40 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -25,15 +25,13 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of -# versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+] -# 1.7[+]) +# versions. (allowed values: 1.5[+] 1.6[+] 1.7[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) # # JAVA_VENDOR List of space-separated suitable JDK port vendors for the -# port. (allowed values: freebsd bsdjava sun blackdown -# openjdk) +# port. (allowed values: freebsd bsdjava sun openjdk) # # JAVA_BUILD When set, it means that the selected JDK port should be # added to build dependencies for the port. @@ -41,9 +39,6 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # JAVA_RUN This variable works exactly the same as JAVA_BUILD but # regarding run dependencies. # -# USE_JIKES Whether the port should or should not use jikes(1) to build. -# See Stage 6 header for further detail. -# # USE_ANT Should be defined when the port uses Apache Ant. Ant is thus # considered to be the sub-make command. When no 'do-build' # target is defined by the port, a default one will be set @@ -69,19 +64,19 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # (e.g. 'FreeBSD Foundation') # # JAVA_HOME Path to the installation directory of the JDK. (e.g. -# '/usr/local/jdk1.3.1') +# '/usr/local/jdk1.5.0') # # JAVAC Path to the Java compiler to use. (e.g. -# '/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes') +# '/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/javac') # # JAR Path to the JAR tool to use. (e.g. # '/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar') # # APPLETVIEWER Path to the appletviewer utility. (e.g. -# '/usr/local/linux-jdk1.3.1/bin/appletviewer') +# '/usr/local/linux-jdk1.5.0/bin/appletviewer') # # JAVA Path to the java executable. Use this for executing Java -# programs. (e.g. '/usr/local/jdk1.3.1/bin/java') +# programs. (e.g. '/usr/local/jdk1.5.0/bin/java') # # JAVADOC Path to the javadoc utility program. # @@ -113,13 +108,10 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # JAVALIBDIR The directory where JAR files installed by other ports # are located. # -# HAVE_JIKES Defined and set to "yes" whenever the port will effectively -# use Jikes. See stage 6 header for further detail. -# #------------------------------------------------------------------------------- # Porter's hints # -# To retrieve the Major version number from JAVA_PORT_VERSION (e.g. "1.3"): +# To retrieve the Major version number from JAVA_PORT_VERSION (e.g. "1.5"): # -> ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} # #------------------------------------------------------------------------------- @@ -164,10 +156,10 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 1.3 1.4 1.5 1.6 1.7 -_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} 1.1+ 1.2+ +__JAVA_VERSION_LIST= 1.5 1.6 1.7 +_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux -_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown openjdk +_JAVA_VENDOR_LIST= freebsd bsdjava sun openjdk # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor @@ -179,18 +171,10 @@ _JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO= PORT=java/diablo-jdk16 HOME=${LOCALBA VERSION=1.6.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \ VERSION=1.5.0 OS=native VENDOR=freebsd -_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3_INFO= PORT=java/jdk13 HOME=${LOCALBASE}/jdk1.3.1 \ - VERSION=1.3.1 OS=native VENDOR=bsdjava _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5_INFO= PORT=java/jdk15 HOME=${LOCALBASE}/jdk1.5.0 \ VERSION=1.5.0 OS=native VENDOR=bsdjava _JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6_INFO= PORT=java/jdk16 HOME=${LOCALBASE}/jdk1.6.0 \ VERSION=1.6.0 OS=native VENDOR=bsdjava -_JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4_INFO= PORT=java/linux-blackdown-jdk14 HOME=${LOCALBASE}/linux-blackdown-jdk1.4.2 \ - VERSION=1.4.2 OS=linux VENDOR=blackdown -_JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \ - VERSION=1.3.1 OS=linux VENDOR=sun -_JAVA_PORT_LINUX_SUN_JDK_1_4_INFO= PORT=java/linux-sun-jdk14 HOME=${LOCALBASE}/linux-sun-jdk1.4.2 \ - VERSION=1.4.2 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_5_INFO= PORT=java/linux-sun-jdk15 HOME=${LOCALBASE}/linux-sun-jdk1.5.0 \ VERSION=1.5.0 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \ @@ -200,7 +184,6 @@ _JAVA_PORT_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE _JAVA_VENDOR_freebsd= "FreeBSD Foundation" _JAVA_VENDOR_bsdjava= "BSD Java Porting Team" _JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team" -_JAVA_VENDOR_blackdown= Blackdown _JAVA_VENDOR_sun= Sun # Verbose description for each OS @@ -208,7 +191,7 @@ _JAVA_OS_native= Native _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if (${OSVERSION} >= 600000 && ${OSVERSION} < 800000) +. if ${OSVERSION} < 800000 _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 . else _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 @@ -221,12 +204,8 @@ __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ - JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \ JAVA_PORT_LINUX_SUN_JDK_1_6 \ - JAVA_PORT_LINUX_SUN_JDK_1_5 \ - JAVA_PORT_LINUX_SUN_JDK_1_4 \ - JAVA_PORT_LINUX_SUN_JDK_1_3 \ - JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 + JAVA_PORT_LINUX_SUN_JDK_1_5 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${_JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} @@ -235,11 +214,6 @@ _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ # relative path within the JAVA_HOME directory. _JDK_FILE=bin/javac -# Set the path to Jikes and define the Jikes dependency -_JIKES_PATH= ${LOCALBASE}/bin/jikes -DEPEND_JIKES= ${_JIKES_PATH}:${PORTSDIR}/java/jikes - - #------------------------------------------------------------------------------- # Stage 2: Determine which JDK ports are suitable and which JDK ports are # suitable @@ -296,7 +270,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.3+/:S/1.2+/1.3+/:S/1.3+/1.3 1.4+/:S/1.4+/1.4 1.5+/:S/1.5+/1.5 1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.5+/1.5 1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif @@ -391,41 +365,6 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/} # Stage 4: Add any dependencies if necessary # -# Jikes support: If USE_JIKES is set to YES, then use Jikes. If USE_JIKES is -# set to NO, then don't use it. If it is set to a different value, then fail -# with an error message. Otherwise USE_JIKES is not set, in which case it is -# checked if Jikes is already installed. If it is, then it will be used, -# otherwise it will not be used. -# -# As a result, HAVE_JIKES is defined and set to "yes" when Jikes is used by the -# port according to the above policy. - -. undef HAVE_JIKES - -# Enforce USE_JIKES=NO if not defined and using Java 1.5+ -# XXX: This is a temporary fix to be removed when Jikes supports Java 1.5 -. if (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5") || \ - (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.6") || \ - (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.7") -USE_JIKES?= NO -. endif -# First test if USE_JIKES has a valid value -. if defined(USE_JIKES) && !(${USE_JIKES:U} == "YES") && !(${USE_JIKES:U} == "NO") -check-makevars:: - @${ECHO_CMD} "${PKGNAME}: Makefile error: \"${USE_JIKES}\" is not a valid value for USE_JIKES. It should be YES or NO, or it should be undefined."; - @${FALSE} -. endif -# Then test if jikes is needed or available: -> HAVE_JIKES=yes -. if (exists(${_JIKES_PATH}) && (!defined(USE_JIKES) || (${USE_JIKES:U} == "YES"))) \ - || (defined(USE_JIKES) && (${USE_JIKES:U} == "YES")) -HAVE_JIKES= yes -. endif - -# Add jikes port to the dependencies if needed -. if !defined(NO_BUILD) && defined(HAVE_JIKES) -BUILD_DEPENDS+= ${DEPEND_JIKES} -. endif - # Ant Support: USE_ANT --> JAVA_BUILD=jdk . if defined(USE_ANT) JAVA_BUILD= jdk @@ -452,9 +391,6 @@ RUN_DEPENDS+= ${DEPEND_JAVA} . if defined(USE_ANT) ANT?= ${LOCALBASE}/bin/ant MAKE_ENV+= JAVA_HOME=${JAVA_HOME} -. if defined(HAVE_JIKES) -MAKE_ARGS+= -Dbuild.compiler=jikes -. endif BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant ALL_TARGET?= . if !target(do-build) @@ -469,22 +405,15 @@ do-build: # # At this stage both JAVA_HOME and JAVA_PORT are definitely given a value. # -# Define the location of the Java compiler. If HAVE_JIKES is defined, then -# use Jikes. +# Define the location of the Java compiler. -# Only define JAVAC if a JDK is needed or USE_JIKES=yes +# Only define JAVAC if a JDK is needed . undef JAVAC # Then test if a JAVAC has to be set (JAVA_BUILD==jdk) . if defined(JAVA_BUILD) . if (${JAVA_BUILD:U} == "JDK") && !defined(JAVAC) -# Use jikes if available and not explicitly forbidden (see Stage 6) -. if defined(HAVE_JIKES) -JAVAC?= ${_JIKES_PATH} -bootclasspath ${JAVA_CLASSES} -# Otherwise use 'javac' -. else JAVAC?= ${JAVA_HOME}/bin/javac -. endif . endif . endif diff --git a/archivers/javatar/Makefile b/archivers/javatar/Makefile index e63a6af0e53b..deb89963c9d5 100644 --- a/archivers/javatar/Makefile +++ b/archivers/javatar/Makefile @@ -18,7 +18,7 @@ COMMENT= A Java tar archive io package RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes diff --git a/archivers/jzip.org/Makefile b/archivers/jzip.org/Makefile index d68becd262a8..b6d66a2af13a 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 1e1c53658c04..a4fae5d850fc 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" "$@" diff --git a/archivers/jzlib/Makefile b/archivers/jzlib/Makefile index c34ded824914..a4afbddc7940 100644 --- a/archivers/jzlib/Makefile +++ b/archivers/jzlib/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A re-implementation of zlib in pure Java USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAR_FILE= ${WRKSRC}/${PORTNAME}.jar diff --git a/astro/openmap/Makefile b/astro/openmap/Makefile index 727bd558c520..bd205748d959 100644 --- a/astro/openmap/Makefile +++ b/astro/openmap/Makefile @@ -16,7 +16,7 @@ COMMENT= Java toolkit for manipulating and displaying geographic data RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ PKGMESSAGE= ${WRKSRC}/LICENSE diff --git a/audio/jid3lib/Makefile b/audio/jid3lib/Makefile index 5fb666f9de3b..5086f32034d7 100644 --- a/audio/jid3lib/Makefile +++ b/audio/jid3lib/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java ID3 Tag Library USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes PLIST_FILES= %%JAVAJARDIR%%/jid3lib.jar diff --git a/audio/jmusic/Makefile b/audio/jmusic/Makefile index a73f458cff04..41722a18e91d 100644 --- a/audio/jmusic/Makefile +++ b/audio/jmusic/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Composition in Java USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/audio/jxm/Makefile b/audio/jxm/Makefile index 4e00db097133..7d59e212a3af 100644 --- a/audio/jxm/Makefile +++ b/audio/jxm/Makefile @@ -19,7 +19,7 @@ COMMENT= XMPCR (USB XM radio) control software RUN_DEPENDS= ${JAVA_HOME}/jre/lib/ext/CommDriver.jar:${PORTSDIR}/comms/java-commapi-freebsd USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native NO_BUILD= yes diff --git a/audio/jxm/files/jxm.sh.in b/audio/jxm/files/jxm.sh.in index 3e6bdd9d75c4..6a88cdc34772 100644 --- a/audio/jxm/files/jxm.sh.in +++ b/audio/jxm/files/jxm.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.4+" JAVA_OS="native" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jxm.jar" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="native" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jxm.jar" "$@" diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile index c383f4aefbe5..33827de66f5b 100644 --- a/audio/musiccontrol/Makefile +++ b/audio/musiccontrol/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \ ${LOCALBASE}/bin/simplemod:${PORTSDIR}/audio/simplemod USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= share/java/classes/MusicControl-${PORTVERSION}.jar bin/musiccontrol diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile index 422446ced22b..ff78d7d54667 100644 --- a/audio/tuxguitar/Makefile +++ b/audio/tuxguitar/Makefile @@ -36,8 +36,8 @@ USE_ANT= yes USE_GECKO= libxul USE_GMAKE= yes USE_LDCONFIG= yes -JAVA_VERSION= 1.4+ -JAVA_VENDOR= freebsd bsdjava sun blackdown +JAVA_VERSION= 1.5+ +JAVA_VENDOR= freebsd bsdjava sun NOCCACHE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar diff --git a/audio/tuxguitar/files/patch-build.properties b/audio/tuxguitar/files/patch-build.properties index 7f319b850bcd..763a91da11d1 100644 --- a/audio/tuxguitar/files/patch-build.properties +++ b/audio/tuxguitar/files/patch-build.properties @@ -1,7 +1,7 @@ --- build.properties.orig 2010-02-26 12:11:41.000000000 +0100 +++ build.properties 2010-02-26 12:13:52.000000000 +0100 @@ -5,15 +5,15 @@ - ant.build.javac.target=1.4 + ant.build.javac.target=1.5 ########## DEFAULT LINUX BUILD PROPERTIES ########## -lib.swt.jni=lib/ diff --git a/benchmarks/scimark2/Makefile b/benchmarks/scimark2/Makefile index 9f12692fc79b..07242dace6ae 100644 --- a/benchmarks/scimark2/Makefile +++ b/benchmarks/scimark2/Makefile @@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR} USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ -USE_JIKES= NO +JAVA_VERSION= 1.5+ NEED_JAVAC= yes JAVAC_OPTS?= -O diff --git a/biology/artemis/Makefile b/biology/artemis/Makefile index 7c6dc732e9fb..43e8ccd0a7ee 100644 --- a/biology/artemis/Makefile +++ b/biology/artemis/Makefile @@ -19,7 +19,7 @@ COMMENT= A DNA sequence viewer and annotation tool WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_SUB= PORTVERSION="${PORTVERSION}" diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile index 11a4adeede49..b175f72f376e 100644 --- a/biology/jalview/Makefile +++ b/biology/jalview/Makefile @@ -16,7 +16,7 @@ MAINTAINER= fernan@iib.unsam.edu.ar COMMENT= A viewer and editor for multiple sequence alignments USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= makejars WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/cad/impact/Makefile b/cad/impact/Makefile index b30e7a82adfc..457f76279105 100644 --- a/cad/impact/Makefile +++ b/cad/impact/Makefile @@ -18,7 +18,7 @@ COMMENT= Dynamic Finite Element Program Suite USE_ZIP= yes WRKSRC= ${WRKDIR}/Impact USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index e078b24e11ab..b19a6c0e4551 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -33,7 +33,7 @@ USE_TCL_RUN= 84+ USE_TCL_THREADS=yes USE_JAVA= yes USE_XORG= xmu -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ #.if defined(MAINTAINER_MODE) # linux-sun-jdk was required for 6.1, but 6.2 is OK with diablo-jdk. #JAVA_OS= linux diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile index 16d6b246ed9a..1d35578d3bf8 100644 --- a/comms/java-commapi-freebsd/Makefile +++ b/comms/java-commapi-freebsd/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi RUN_DEPENDS= ${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ JAVA_OS= native JAVA_BUILD= yes diff --git a/comms/java-commapi/Makefile b/comms/java-commapi/Makefile index 0ff3b6a837b1..843e5c90f079 100644 --- a/comms/java-commapi/Makefile +++ b/comms/java-commapi/Makefile @@ -17,7 +17,7 @@ COMMENT= Sun's Java Communications API USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_CDROM= Sun has a funky license for this software RESTRICTED= no commercial use diff --git a/comms/rxtx/Makefile b/comms/rxtx/Makefile index 9e1f9516c488..eab9ca3c6866 100644 --- a/comms/rxtx/Makefile +++ b/comms/rxtx/Makefile @@ -19,7 +19,7 @@ COMMENT= Native interface to serial ports in Java USE_ZIP= yes USE_GMAKE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native GNU_CONFIGURE= yes diff --git a/databases/frontbase-jdbc/Makefile b/databases/frontbase-jdbc/Makefile index ce76f018980c..d5f11c2f3733 100644 --- a/databases/frontbase-jdbc/Makefile +++ b/databases/frontbase-jdbc/Makefile @@ -17,7 +17,7 @@ MAINTAINER?= ports@FreeBSD.org COMMENT= The Java JDBC implementation for FrontBase USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JARFILE= frontbasejdbc.jar diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile index bd14deca8e5c..d680120e1aae 100644 --- a/databases/hsqldb/Makefile +++ b/databases/hsqldb/Makefile @@ -18,7 +18,7 @@ COMMENT= An embeddable SQL database written in Java LICENSE= BSD USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile index d37e6c9d9747..a9e133e1223e 100644 --- a/databases/isql-viewer/Makefile +++ b/databases/isql-viewer/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper \ ${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes ISQL= iSQL-Viewer diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile index a4379b31b699..2d44b807cf74 100644 --- a/databases/jakarta-commons-dbutils/Makefile +++ b/databases/jakarta-commons-dbutils/Makefile @@ -20,7 +20,7 @@ COMMENT= JDBC helper library BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= dist diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile index cf861adbb8f4..1f0db2b780df 100644 --- a/databases/jdbc-oracle8i/Makefile +++ b/databases/jdbc-oracle8i/Makefile @@ -25,7 +25,7 @@ RESTRICTED= 'Must be downloaded direct from Oracle via www interface' USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ # Should be "1.2 1.3" but tested OK with 1.4 +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/databases/jdbc-oracle9i/Makefile b/databases/jdbc-oracle9i/Makefile index c35e009aae80..532397a8b2c8 100644 --- a/databases/jdbc-oracle9i/Makefile +++ b/databases/jdbc-oracle9i/Makefile @@ -20,7 +20,7 @@ COMMENT= The JDBC drivers for Oracle 9i RESTRICTED= 'Must be downloaded direct from Oracle via www interface' USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile index 07b00a79c7e4..91c42aab3489 100644 --- a/databases/mysql-connector-java/Makefile +++ b/databases/mysql-connector-java/Makefile @@ -23,7 +23,7 @@ CONFLICTS= mysql-connector-java*-5.0.* LICENSE= GPLv2 USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ BUILDDIR= ${WRKDIR}/${DISTNAME} APIDOCSDIR= ${DOCSDIR}/javadoc SRCDIR= ${WRKDIR}/${DISTNAME}/src diff --git a/databases/openbase-jdbc/Makefile b/databases/openbase-jdbc/Makefile index 3413e179e007..5dd87c6be6a8 100644 --- a/databases/openbase-jdbc/Makefile +++ b/databases/openbase-jdbc/Makefile @@ -17,7 +17,7 @@ COMMENT= The Java JDBC implementation for OpenBase USE_JAVA= yes USE_ZIP= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JARFILE= OpenBaseJDBC.jar diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile index 298cd908df2d..f768a56dc318 100644 --- a/databases/postgis-jdbc/Makefile +++ b/databases/postgis-jdbc/Makefile @@ -17,7 +17,7 @@ COMMENT= PostGIS spatial data structures for JDBC RUN_DEPENDS= ${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/postgis_1.4.0.jar diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile index 14231d671536..7c4f96d1d4cb 100644 --- a/deskutils/freemind/Makefile +++ b/deskutils/freemind/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ DATADIR= ${JAVASHAREDIR}/${PORTNAME}-${PORTVERSION} DATAFILES= accessories doc lib license patterns.xml plugins user.properties diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile index 3c0576089f4d..10b1c78718ce 100644 --- a/deskutils/ganttproject/Makefile +++ b/deskutils/ganttproject/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-src/${PORTNAME}-builder USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/devel/antlr/Makefile b/devel/antlr/Makefile index d5b4dac134f4..32836b5184ca 100644 --- a/devel/antlr/Makefile +++ b/devel/antlr/Makefile @@ -19,7 +19,7 @@ CONFLICTS= pccts-[0-9]* USE_GMAKE= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ OPTIONS= PYTHON "Include Python runtime support" off diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 27bd3e752ae9..2696302c3d6d 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -26,7 +26,7 @@ MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz MANPAGE_VERSION= 20030908 USE_BZIP2= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= YES DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/devel/avalon-framework/Makefile b/devel/avalon-framework/Makefile index b8ad2486d227..fffa8db36700 100644 --- a/devel/avalon-framework/Makefile +++ b/devel/avalon-framework/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Apache Avalon core framework for component programming USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/charva/Makefile b/devel/charva/Makefile index c6ba7d23e025..750c6c40d8c1 100644 --- a/devel/charva/Makefile +++ b/devel/charva/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons- USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= clean makeDLL dist diff --git a/devel/doctorj/Makefile b/devel/doctorj/Makefile index 0efb5756b029..c4a80e26b745 100644 --- a/devel/doctorj/Makefile +++ b/devel/doctorj/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A tool for analyzing Java code and documentation USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= jarfile diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile index 8825c505c079..4ad6cabbac13 100644 --- a/devel/flex-sdk/Makefile +++ b/devel/flex-sdk/Makefile @@ -20,7 +20,7 @@ CONFLICTS= ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-3.* USE_ZIP= YES USE_DOS2UNIX= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR} SUB_FILES= ${SCRIPTS:C/\$/.sh/g} NO_BUILD= YES diff --git a/devel/flex-sdk2/Makefile b/devel/flex-sdk2/Makefile index 7aa8f1a6f660..d3d65935e20f 100644 --- a/devel/flex-sdk2/Makefile +++ b/devel/flex-sdk2/Makefile @@ -23,7 +23,7 @@ CONFLICTS= ja-flex-sdk-2.* flex-sdk-3.* flex-sdk-4.* NO_LATEST_LINK= YES USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR} DOWNLOAD_URL= http://labs.adobe.com/technologies/flex/sdk/flex2sdk.html SUB_FILES= asdoc.sh compc.sh fdb.sh mxmlc.sh diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile index 0621806f58d0..639682cb9670 100644 --- a/devel/flex-sdk35/Makefile +++ b/devel/flex-sdk35/Makefile @@ -21,7 +21,7 @@ CONFLICTS= ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-4.* NO_LATEST_LINK= YES USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR} SUB_FILES= ${SCRIPTS:C/\$/.sh/g} NO_BUILD= YES diff --git a/devel/flex_compiler_shell/Makefile b/devel/flex_compiler_shell/Makefile index 6fce53d8cd0f..42dd4e25cfc3 100644 --- a/devel/flex_compiler_shell/Makefile +++ b/devel/flex_compiler_shell/Makefile @@ -23,7 +23,7 @@ CONFLICTS= flex-sdk-3.* USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR} NO_BUILD= YES SUB_FILES= fcsh diff --git a/devel/fujaba/Makefile b/devel/fujaba/Makefile index 04028144b4d2..eff717c6eafb 100644 --- a/devel/fujaba/Makefile +++ b/devel/fujaba/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/Fujaba\ Tool\ Suite\ ${PORTVERSION} diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile index dc741d28b5f5..8ddd86d519cb 100644 --- a/devel/glib-java/Makefile +++ b/devel/glib-java/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack glib20 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} diff --git a/devel/itext/Makefile b/devel/itext/Makefile index df5776ddf838..383dff8c1196 100644 --- a/devel/itext/Makefile +++ b/devel/itext/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \ USE_BZIP2= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= jar jar.rtf jar.rups MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile index 2eec1907618a..d9c761d25c66 100644 --- a/devel/jakarta-commons-configuration/Makefile +++ b/devel/jakarta-commons-configuration/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-common ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .if !defined(NOPORTDOCS) diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile index b4760ba5be9d..6aca74671de1 100644 --- a/devel/jakarta-commons-daemon/Makefile +++ b/devel/jakarta-commons-daemon/Makefile @@ -17,11 +17,10 @@ MAINTAINER= ronald@echteman.nl COMMENT= Wrapper code to start/stop a Java application as a daemon USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ JAVA_OS= native JAVA_BUILD= jdk NEED_JAVAC= yes -USE_JIKES= no USE_ANT= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/jakarta-commons-jxpath/Makefile index c44c515114c7..a00d8381de80 100644 --- a/devel/jakarta-commons-jxpath/Makefile +++ b/devel/jakarta-commons-jxpath/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Utilities for manipulating Java Beans using the XPath syntax USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .include <bsd.port.pre.mk> diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/jakarta-commons-modeler/Makefile index 222096fd26c4..25779bd3764a 100644 --- a/devel/jakarta-commons-modeler/Makefile +++ b/devel/jakarta-commons-modeler/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Mechanisms to create Model MBeans compatible with JMX specification USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .include <bsd.port.pre.mk> diff --git a/devel/java-util-concurrent/Makefile b/devel/java-util-concurrent/Makefile index a74c04c004e0..b5fc2c636eb8 100644 --- a/devel/java-util-concurrent/Makefile +++ b/devel/java-util-concurrent/Makefile @@ -17,7 +17,7 @@ MAINTAINER= hq@FreeBSD.org COMMENT= Utility classes for concurrent Java programming USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= dist diff --git a/devel/javolution/Makefile b/devel/javolution/Makefile index b703b424daf6..1f25b89bbd84 100644 --- a/devel/javolution/Makefile +++ b/devel/javolution/Makefile @@ -16,7 +16,7 @@ COMMENT= A Java solution for real time and embedded systems USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JDKMVERSION= ${JAVA_PORT_VERSION:C/^([0-9]\.[0-9])(.*)$/\1/} USE_ANT= yes ALL_TARGET= ${JDKMVERSION} diff --git a/devel/jep/Makefile b/devel/jep/Makefile index 2cf7715dfb17..39207269d548 100644 --- a/devel/jep/Makefile +++ b/devel/jep/Makefile @@ -18,7 +18,7 @@ CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} MAKE_ENV= JAVA_HOME=${JAVA_HOME} CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_PYTHON= 2.2+ GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile index 4c94862924ad..231d7ef65a32 100644 --- a/devel/jsap/Makefile +++ b/devel/jsap/Makefile @@ -16,7 +16,7 @@ MAINTAINER= hq@FreeBSD.org COMMENT= Java package to parse command-line arguments USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .if !defined(NOPORTDOCS) diff --git a/devel/libgconf-java/Makefile b/devel/libgconf-java/Makefile index 9b9656541b67..0f5804b0eab4 100644 --- a/devel/libgconf-java/Makefile +++ b/devel/libgconf-java/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack gconf2 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} diff --git a/devel/libglade-java/Makefile b/devel/libglade-java/Makefile index 46d9b58be39a..7fd97465bf1a 100644 --- a/devel/libglade-java/Makefile +++ b/devel/libglade-java/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack libglade2 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} diff --git a/devel/looks/Makefile b/devel/looks/Makefile index bf5f5c827b13..3cbd5734b19b 100644 --- a/devel/looks/Makefile +++ b/devel/looks/Makefile @@ -17,7 +17,7 @@ COMMENT= The JGoodies Looks improve the appearance of your Java applications USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/devel/maven2/Makefile b/devel/maven2/Makefile index cfd0c243a8a7..161181134812 100644 --- a/devel/maven2/Makefile +++ b/devel/maven2/Makefile @@ -16,7 +16,7 @@ MAINTAINER= hq@FreeBSD.org COMMENT= Java project management tool, 2.0 branch USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= m2.sh diff --git a/devel/netscape-java40/Makefile b/devel/netscape-java40/Makefile index d71f3525fc09..528b2ba7f1bc 100644 --- a/devel/netscape-java40/Makefile +++ b/devel/netscape-java40/Makefile @@ -17,7 +17,7 @@ MAINTAINER= thierry@FreeBSD.org COMMENT= Classes to allow a Java applet access to Javascript objects USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JARFILES= java40.jar LICENSE.java40.txt diff --git a/devel/obfuscatejs/Makefile b/devel/obfuscatejs/Makefile index 07212aabb332..0577e9754b66 100644 --- a/devel/obfuscatejs/Makefile +++ b/devel/obfuscatejs/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ SUB_FILES= ${PORTNAME} SUB_LIST= OBFUSCATEJSJAR=${DATADIR}/${OBFUSCATEJSJAR} diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index dda635704aec..747c8a6496a0 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -18,7 +18,7 @@ COMMENT= An OCaml-Java library interface USE_OCAML= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ .include <bsd.port.pre.mk> diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile index 3fdf1351cab0..0c1cb94d310a 100644 --- a/devel/p5-Inline-Java/Makefile +++ b/devel/p5-Inline-Java/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= p5-Inline>=0.44:${PORTSDIR}/devel/p5-Inline \ RUN_DEPENDS= ${BUILD_DEPENDS} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native PERL_CONFIGURE= 5.8.1+ diff --git a/devel/p5-Java/Makefile b/devel/p5-Java/Makefile index 40e9751c49e0..474229356658 100644 --- a/devel/p5-Java/Makefile +++ b/devel/p5-Java/Makefile @@ -18,7 +18,7 @@ COMMENT= Perl extension for accessing a JVM remotely or locally USE_RC_SUBR= javaserver.sh PERL_CONFIGURE= YES USE_JAVA= yes -JAVA_VERSION= 1.1+ +JAVA_VERSION= 1.5+ MAN3= Java.3 JavaArray.3 diff --git a/devel/pmd/Makefile b/devel/pmd/Makefile index 1d5eb443819a..c15db6bd2034 100644 --- a/devel/pmd/Makefile +++ b/devel/pmd/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes MAKE_ARGS= -cp ${JAVALIBDIR}/junit.jar diff --git a/devel/portlet-api/Makefile b/devel/portlet-api/Makefile index 76655459ae5a..a36bd7b2ea90 100644 --- a/devel/portlet-api/Makefile +++ b/devel/portlet-api/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Portlet API (JSR-168) USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar diff --git a/devel/py-jcc/Makefile b/devel/py-jcc/Makefile index b3542e0beee2..4f9e156a4c0e 100644 --- a/devel/py-jcc/Makefile +++ b/devel/py-jcc/Makefile @@ -20,7 +20,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= JCC USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_VENDOR= freebsd USE_GCC= 4.2+ diff --git a/devel/simian/Makefile b/devel/simian/Makefile index cb50cb5374b5..f64587877c3e 100644 --- a/devel/simian/Makefile +++ b/devel/simian/Makefile @@ -29,7 +29,7 @@ NO_WRKSUBDIR= yes .if !defined(WITHOUT_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ PLIST_SUB+= JAVA="" SUB_LIST+= JAVA="" .else diff --git a/devel/smc/Makefile b/devel/smc/Makefile index b45cb93e7e94..e371275092c5 100644 --- a/devel/smc/Makefile +++ b/devel/smc/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The State Machine Compiler USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes do-install: diff --git a/devel/statcvs/Makefile b/devel/statcvs/Makefile index d341cd81990f..9638eb4ed77e 100644 --- a/devel/statcvs/Makefile +++ b/devel/statcvs/Makefile @@ -22,7 +22,7 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_ZIP= yes USE_JAVA= yes USE_ANT= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ .if !defined(NOPORTDOCS) ALL_TARGET= jar javadoc diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile index ef873555dd2b..135cc136cfaa 100644 --- a/devel/statsvn/Makefile +++ b/devel/statsvn/Makefile @@ -24,7 +24,7 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_ZIP= yes USE_JAVA= yes USE_ANT= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ .if !defined(NOPORTDOCS) ALL_TARGET= dist javadoc diff --git a/devel/tijmp/Makefile b/devel/tijmp/Makefile index a113c70914e9..7defe30ebb38 100644 --- a/devel/tijmp/Makefile +++ b/devel/tijmp/Makefile @@ -22,7 +22,6 @@ JAVA_VERSION= 1.6+ JAVA_OS= native JAVA_BUILD= jdk NEED_JAVAC= yes -USE_JIKES= no GNU_CONFIGURE= yes diff --git a/devel/tinylaf/Makefile b/devel/tinylaf/Makefile index 8f496c1076b6..7a97dcd90eb0 100644 --- a/devel/tinylaf/Makefile +++ b/devel/tinylaf/Makefile @@ -16,7 +16,7 @@ COMMENT= A pluggable Look and Feel for Java USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JARFILE= ${PORTNAME}.jar tinycp.jar diff --git a/dns/crossip/Makefile b/dns/crossip/Makefile index 2ff001265322..262223e6283b 100644 --- a/dns/crossip/Makefile +++ b/dns/crossip/Makefile @@ -15,7 +15,7 @@ MAINTAINER= dan@algenta.com COMMENT= Java DNS update client for the ThatIP protocol USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_BUILD= yes diff --git a/editors/drjava/Makefile b/editors/drjava/Makefile index 1ebecbd503d1..2daa2a6e0fd4 100644 --- a/editors/drjava/Makefile +++ b/editors/drjava/Makefile @@ -19,7 +19,7 @@ COMMENT= A lightweight IDE for writing Java programs NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ SUB_FILES= ${PORTNAME} SUB_LIST= DRJAVAJAR=${DRJAVAJAR} diff --git a/editors/jedit-devel/files/jedit.sh.in b/editors/jedit-devel/files/jedit.sh.in index 6b2c3e618483..80b01341093d 100644 --- a/editors/jedit-devel/files/jedit.sh.in +++ b/editors/jedit-devel/files/jedit.sh.in @@ -4,4 +4,4 @@ # Java heap size, in megabytes JAVA_HEAP_SIZE=32 -JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@" diff --git a/editors/jedit/files/jedit.sh.in b/editors/jedit/files/jedit.sh.in index 91dc403347d0..80b01341093d 100644 --- a/editors/jedit/files/jedit.sh.in +++ b/editors/jedit/files/jedit.sh.in @@ -4,4 +4,4 @@ # Java heap size, in megabytes JAVA_HEAP_SIZE=32 -JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -mx${JAVA_HEAP_SIZE}m ${JEDIT} -jar "%%DATADIR%%/jedit.jar" "$@" diff --git a/editors/jext/Makefile b/editors/jext/Makefile index 971a9a001f81..ce29d7b5f9d7 100644 --- a/editors/jext/Makefile +++ b/editors/jext/Makefile @@ -15,7 +15,7 @@ MAINTAINER= vd@FreeBSD.org COMMENT= Powerful 100% pure Java text editor USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes USE_XORG= x11 NO_BUILD= yes diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile index fb9bcad9459a..76e01234b456 100644 --- a/editors/omegaT/Makefile +++ b/editors/omegaT/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/editors/omegaT/files/omegaT.sh.in b/editors/omegaT/files/omegaT.sh.in index de7e1d507799..9bd8c462711d 100644 --- a/editors/omegaT/files/omegaT.sh.in +++ b/editors/omegaT/files/omegaT.sh.in @@ -9,4 +9,4 @@ if [ ! -f ${HOME}/.omegat/omegat.prefs ] ; then cp "%%DATADIR%%/omegat.prefs" ${HOME}/.omegat && chmod 644 ${HOME}/.omegat/omegat.prefs fi -JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/OmegaT.jar" "$@" diff --git a/finance/venice/Makefile b/finance/venice/Makefile index 3feabc94a8ca..9710f707d000 100644 --- a/finance/venice/Makefile +++ b/finance/venice/Makefile @@ -17,7 +17,7 @@ COMMENT= Merchant Of Venice, a stock market trading program NO_BUILD= yes USE_JAVA= yes JAVA_RUN= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JARFILE= ${PORTNAME}.jar diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile index bb8b742379b9..7ddce870ae5e 100644 --- a/ftp/jftp/Makefile +++ b/ftp/jftp/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/j-ftp USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes SUB_FILES= jftp.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/cgoban2/Makefile b/games/cgoban2/Makefile index 4947cc6e199a..e5e708f4922c 100644 --- a/games/cgoban2/Makefile +++ b/games/cgoban2/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/cgoban USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= bin/cgoban2 %%DATADIR%%/cgoban.jar share/pixmaps/cgoban2.png diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile index ee376f6bb010..cee8f4230259 100644 --- a/games/dmjava/Makefile +++ b/games/dmjava/Makefile @@ -21,7 +21,7 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes do-install: diff --git a/games/ftjava/Makefile b/games/ftjava/Makefile index 4aeafeff5cb6..274c4336c15e 100644 --- a/games/ftjava/Makefile +++ b/games/ftjava/Makefile @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Full Thrust PBEM Client USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/games/jchessboard/Makefile b/games/jchessboard/Makefile index c94797ae11cd..160c9e8f61c8 100644 --- a/games/jchessboard/Makefile +++ b/games/jchessboard/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Chess game and PGN viewer/editor written in Java USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/jin/Makefile b/games/jin/Makefile index 137feb734a31..a2ee8e2f2205 100644 --- a/games/jin/Makefile +++ b/games/jin/Makefile @@ -17,7 +17,7 @@ COMMENT= A graphical client for chess servers NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ SUB_FILES= ${PORTNAME} SUB_LIST= JINJAR=${JINJAR} diff --git a/games/jtans/Makefile b/games/jtans/Makefile index 2091275d9542..590605654396 100644 --- a/games/jtans/Makefile +++ b/games/jtans/Makefile @@ -24,7 +24,7 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes SUB_FILES= jtans.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/jtans/files/jtans.sh.in b/games/jtans/files/jtans.sh.in index 195a4bf9de64..54b5eb612bf0 100644 --- a/games/jtans/files/jtans.sh.in +++ b/games/jtans/files/jtans.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/jtans_appli-1.0.jar" diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile index df6e4924e444..edcda5b280b4 100644 --- a/games/pcgen/Makefile +++ b/games/pcgen/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= YES WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g} USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= YES DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/games/spicetrade/Makefile b/games/spicetrade/Makefile index 0911704e4f55..66ea9a2ea3f6 100644 --- a/games/spicetrade/Makefile +++ b/games/spicetrade/Makefile @@ -20,7 +20,7 @@ COMMENT= Colourful 14th century Arab spice trading game NO_PACKAGE= Package will be 186MB, set FORCE_PACKAGE if you really want to build it USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} NO_BUILD= yes diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile index 2344d3cb845d..07d80f4f89f7 100644 --- a/graphics/aoi/Makefile +++ b/graphics/aoi/Makefile @@ -18,7 +18,7 @@ COMMENT= An open source Java written 3D modelling and rendering studio RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/ArtOfIllusion${PORTVERSION:S/.//g} diff --git a/graphics/barbecue/Makefile b/graphics/barbecue/Makefile index 64b58cf337a8..14a4d6cc0ed6 100644 --- a/graphics/barbecue/Makefile +++ b/graphics/barbecue/Makefile @@ -17,7 +17,7 @@ COMMENT= A Java barcode generator RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JARFILES= ${PORTNAME}-${PORTVERSION}.jar diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile index 6c998eed5f75..33562d44eb9f 100644 --- a/graphics/batik/Makefile +++ b/graphics/batik/Makefile @@ -19,7 +19,6 @@ COMMENT= SVG Toolkit USE_ZIP= yes USE_JAVA= 1.5+ USE_ANT= yes -USE_JIKES= no ALL_TARGET= jars all-jar # Prevent out of memory error during build MAKE_ENV+= "ANT_OPTS=-Xmx512m" diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile index 096e92e9752b..eedd5d08e77e 100644 --- a/graphics/cairo-java/Makefile +++ b/graphics/cairo-java/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack gnometarget CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} diff --git a/graphics/cosmoplayer/Makefile b/graphics/cosmoplayer/Makefile index af66a9ed8e67..0d30add9763c 100644 --- a/graphics/cosmoplayer/Makefile +++ b/graphics/cosmoplayer/Makefile @@ -21,7 +21,7 @@ COMMENT= Java classes to support VRML RUN_DEPENDS= ${JAVALIBDIR}/java40.jar:${PORTSDIR}/devel/netscape-java40 USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes JARFILES= npcosmop211.jar LICENSE.npcosmop211.txt diff --git a/graphics/jave6/Makefile b/graphics/jave6/Makefile index fe195a8eec1b..3add132519e0 100644 --- a/graphics/jave6/Makefile +++ b/graphics/jave6/Makefile @@ -18,7 +18,7 @@ COMMENT= Java ASCII-Art-Generator USE_JAVA= YES USE_ZIP= YES -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= YES DATADIR= ${JAVASHAREDIR}/${PORTNAME} LNKTARGET= ${PREFIX}/bin/jave6 diff --git a/graphics/jdraw/Makefile b/graphics/jdraw/Makefile index 2cd230b8ec56..ee7fd04ed8e1 100644 --- a/graphics/jdraw/Makefile +++ b/graphics/jdraw/Makefile @@ -37,10 +37,8 @@ do-install: .if defined(WITH_PLASTIC3D) PLASTIC3D= "-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\"" -JAVA_VERSION= 1.5+ RUN_DEPENDS+= ${JAVAJARDIR}/looks.jar:${PORTSDIR}/devel/looks -.else -JAVA_VERSION= 1.4+ .endif +JAVA_VERSION= 1.5+ .include <bsd.port.post.mk> diff --git a/graphics/jdraw/files/jdraw.in b/graphics/jdraw/files/jdraw.in index d2de0aa702cf..fdf78202b420 100644 --- a/graphics/jdraw/files/jdraw.in +++ b/graphics/jdraw/files/jdraw.in @@ -5,11 +5,7 @@ if [ -z "${JAVA_VERSION}" ]; then JAVA_VERSION="%%JAVA_VERSION%%" fi -if [ "${JAVA_VERSION}" \> "1.4" ]; then - LOOK_AND_FEEL="%%PLASTIC3D%%" - else - LOOK_AND_FEEL= -fi +LOOK_AND_FEEL="%%PLASTIC3D%%" exec "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%" ${LOOK_AND_FEEL} -jar "%%JDRAWJAR%%" "$@" diff --git a/graphics/jogl/Makefile b/graphics/jogl/Makefile index a89492168253..a9b6a5ff144a 100644 --- a/graphics/jogl/Makefile +++ b/graphics/jogl/Makefile @@ -46,7 +46,7 @@ USE_ZIP= yes USE_ANT= yes USE_LDCONFIG= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ BUILD_WRKSRC= ${WRKSRC}/jogl/make diff --git a/graphics/jpatch/Makefile b/graphics/jpatch/Makefile index 5b4b415a8ec5..3194f560b622 100644 --- a/graphics/jpatch/Makefile +++ b/graphics/jpatch/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSION} diff --git a/graphics/jpatch/files/jpatch.sh.in b/graphics/jpatch/files/jpatch.sh.in index f06241d0a36a..9f6eda7db431 100644 --- a/graphics/jpatch/files/jpatch.sh.in +++ b/graphics/jpatch/files/jpatch.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.4+" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jpatch.jar" "$@" diff --git a/graphics/jumpgis-postgis/Makefile b/graphics/jumpgis-postgis/Makefile index b2cd5891e5bf..713a63710229 100644 --- a/graphics/jumpgis-postgis/Makefile +++ b/graphics/jumpgis-postgis/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= jumpgis:${PORTSDIR}/graphics/jumpgis TARGET_DIR= ${PREFIX}/jumpgis USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile index 3026d3746797..79f63353a9eb 100644 --- a/graphics/jumpgis/Makefile +++ b/graphics/jumpgis/Makefile @@ -23,7 +23,7 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} TARGET_DIR= ${PREFIX}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_BUILD= yes WANT_GNOME= yes diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile index 56a674be8e0a..fbf0a079ec70 100644 --- a/graphics/libpano12/Makefile +++ b/graphics/libpano12/Makefile @@ -38,7 +38,7 @@ USE_LDCONFIG= yes .if !defined(WITHOUT_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ JAVA_OS= native CONFIGURE_ARGS+= --with-java=${JAVA_HOME} .else diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 1db84c326ada..3e36473e84cd 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -49,7 +49,7 @@ MAN1= \ .if !defined(WITHOUT_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ JAVA_OS= native CONFIGURE_ARGS+= --with-java=${JAVA_HOME} PLIST_SUB= JAVA="" diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile index 3d429b2609c1..41007d82a390 100644 --- a/graphics/mapyrus/Makefile +++ b/graphics/mapyrus/Makefile @@ -18,7 +18,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ZIP= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index d8f0cbdf0602..a4f4e9b6f231 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --without-netcdf .if defined(WITH_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ BUILD_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer RUN_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:${PORTSDIR}/graphics/cosmoplayer CONFIGURE_ARGS+= --with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \ diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile index c31c0cf0c99b..a38a98ed207b 100644 --- a/graphics/tintfu/Makefile +++ b/graphics/tintfu/Makefile @@ -25,7 +25,7 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ PLIST_FILES= %%JAVAJARDIR%%/${DISTNAME}.jar \ bin/tintfu diff --git a/graphics/tintfu/files/tintfu.sh.in b/graphics/tintfu/files/tintfu.sh.in index 4a44d0645a0a..c766004fc83c 100644 --- a/graphics/tintfu/files/tintfu.sh.in +++ b/graphics/tintfu/files/tintfu.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/%%DISTNAME%%.jar" diff --git a/japanese/flex-sdk/Makefile b/japanese/flex-sdk/Makefile index e4352b172bf6..1f37e4baaf98 100644 --- a/japanese/flex-sdk/Makefile +++ b/japanese/flex-sdk/Makefile @@ -22,7 +22,7 @@ RESTRICTED= Need agreement before download CONFLICTS= flex-sdk-2.* flex-sdk-3.* flex-sdk-4.* USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR} DOWNLOAD_URL= http://www.adobe.com/products/flex/sdk/ SUB_FILES= asdoc.sh compc.sh fdb.sh mxmlc.sh diff --git a/java/Makefile b/java/Makefile index c18e0d18994a..045525fba59d 100644 --- a/java/Makefile +++ b/java/Makefile @@ -99,8 +99,6 @@ SUBDIR += jcommon SUBDIR += jdbcpool SUBDIR += jde - SUBDIR += jdk13 - SUBDIR += jdk13-doc SUBDIR += jdk14-doc SUBDIR += jdk15 SUBDIR += jdk15-doc @@ -126,9 +124,6 @@ SUBDIR += junit SUBDIR += kaffe SUBDIR += langspec - SUBDIR += linux-blackdown-jdk14 - SUBDIR += linux-sun-jdk13 - SUBDIR += linux-sun-jdk14 SUBDIR += linux-sun-jdk15 SUBDIR += linux-sun-jdk16 SUBDIR += linux-sun-jre15 diff --git a/java/cacao/Makefile b/java/cacao/Makefile index 005ce77fc31a..076b5b9c41c5 100644 --- a/java/cacao/Makefile +++ b/java/cacao/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath USE_BZIP2= yes USE_AUTOTOOLS= libltdl USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ GNU_CONFIGURE= yes MAN1= cacao.1 CONFIGURE_ARGS+= --with-classpath-prefix=${LOCALBASE} diff --git a/java/castor/Makefile b/java/castor/Makefile index 54f8b0c523cd..28e764d103e8 100644 --- a/java/castor/Makefile +++ b/java/castor/Makefile @@ -17,7 +17,7 @@ COMMENT= Data binding for XML (JAXB) and SQL database (JDO) LICENSE= ASL USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}-anttasks.jar \ diff --git a/java/commonclipse/Makefile b/java/commonclipse/Makefile index 7593259c0616..126297c1e19c 100644 --- a/java/commonclipse/Makefile +++ b/java/commonclipse/Makefile @@ -22,7 +22,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native PLIST_SUB= DISTNAME=${DISTNAME} diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile index a887684a05b4..54555ea36557 100644 --- a/java/cryptix-jce/Makefile +++ b/java/cryptix-jce/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= JCE (Java Cryptography Extension) by Cryptix USE_JAVA= yes -JAVA_VERSION= 1.1+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_BUILD= yes diff --git a/java/eclipse-checkstyle/Makefile b/java/eclipse-checkstyle/Makefile index 93eea54824b7..61b3da35a556 100644 --- a/java/eclipse-checkstyle/Makefile +++ b/java/eclipse-checkstyle/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse NO_WRKSUBDIR= yes NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ZIP= yes do-install: diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile index cf5cf5084c8b..b432a7f37c8e 100644 --- a/java/eclipse-drjava/Makefile +++ b/java/eclipse-drjava/Makefile @@ -23,7 +23,7 @@ NO_WRKSUBDIR= yes USE_JAVA= yes USE_ZIP= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native DATADIR= ${PREFIX}/lib/eclipse/plugins diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile index 1a061267cc46..8799ebc1375e 100644 --- a/java/eclipse-findbugs/Makefile +++ b/java/eclipse-findbugs/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse NO_BUILD= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native PLIST_DIRS= \ diff --git a/java/eclipse-jad/Makefile b/java/eclipse-jad/Makefile index eb66c3791f55..73b6798712c6 100644 --- a/java/eclipse-jad/Makefile +++ b/java/eclipse-jad/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= eclipse:${PORTSDIR}/java/eclipse \ NO_WRKSUBDIR= yes NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ PLIST_FILES= share/eclipse/dropins/${DISTNAME}${EXTRACT_SUFX} diff --git a/java/eclipse-lomboz/Makefile b/java/eclipse-lomboz/Makefile index 86595cee9a5c..7008b54e819b 100644 --- a/java/eclipse-lomboz/Makefile +++ b/java/eclipse-lomboz/Makefile @@ -27,7 +27,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native do-install: diff --git a/java/eclipse-ocl/Makefile b/java/eclipse-ocl/Makefile index 10d2b906638d..1e0688eb798c 100644 --- a/java/eclipse-ocl/Makefile +++ b/java/eclipse-ocl/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native do-install: diff --git a/java/eclipse-propedit/Makefile b/java/eclipse-propedit/Makefile index 0cb51d10297e..36f7910f8673 100644 --- a/java/eclipse-propedit/Makefile +++ b/java/eclipse-propedit/Makefile @@ -24,7 +24,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native do-install: diff --git a/java/eclipse-quantum/Makefile b/java/eclipse-quantum/Makefile index d02252343aad..7f4200a9393d 100644 --- a/java/eclipse-quantum/Makefile +++ b/java/eclipse-quantum/Makefile @@ -24,7 +24,7 @@ NO_WRKSUBDIR= yes NO_BUILD= yes NO_EXTRACT= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ZIP= yes PLIST_SUB+= VERSION=${PORTVERSION} diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile index 83d8e7bbb764..49a53e8608bd 100644 --- a/java/eclipse-shelled/Makefile +++ b/java/eclipse-shelled/Makefile @@ -23,7 +23,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native do-install: diff --git a/java/eclipse-uml/Makefile b/java/eclipse-uml/Makefile index 2790e23910b8..f9d5da7ce7b7 100644 --- a/java/eclipse-uml/Makefile +++ b/java/eclipse-uml/Makefile @@ -24,7 +24,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native do-install: diff --git a/java/eclipse-vep/Makefile b/java/eclipse-vep/Makefile index 3359b77164dd..3261596ac5c5 100644 --- a/java/eclipse-vep/Makefile +++ b/java/eclipse-vep/Makefile @@ -27,7 +27,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native do-install: diff --git a/java/eclipse-viplugin/Makefile b/java/eclipse-viplugin/Makefile index bb25d8bc7cc2..1ceb55fd5041 100644 --- a/java/eclipse-viplugin/Makefile +++ b/java/eclipse-viplugin/Makefile @@ -23,7 +23,7 @@ NO_WRKSUBDIR= yes NO_BUILD= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native PLIST_SUB= RELEASEVERSION=${PORTVERSION} diff --git a/java/infobus/Makefile b/java/infobus/Makefile index 5ab1f5f15742..a7720c268afe 100644 --- a/java/infobus/Makefile +++ b/java/infobus/Makefile @@ -16,7 +16,7 @@ COMMENT= Enables dynamic exchange of data between JavaBeans(TM) USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/java/j2sdkee13/Makefile b/java/j2sdkee13/Makefile index 79180bd66f7d..5acdc7d69e09 100644 --- a/java/j2sdkee13/Makefile +++ b/java/j2sdkee13/Makefile @@ -16,7 +16,7 @@ MAINTAINER= java@FreeBSD.org COMMENT= Java 2 SDK Enterprise Edition USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= YES diff --git a/java/jaf/Makefile b/java/jaf/Makefile index 2afb0629f308..a5fc07e9d630 100644 --- a/java/jaf/Makefile +++ b/java/jaf/Makefile @@ -16,7 +16,7 @@ COMMENT= JavaBeansTM Activation Framework USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes diff --git a/java/jai-imageio/Makefile b/java/jai-imageio/Makefile index e2a1dd45f90d..ac5e5f74e786 100644 --- a/java/jai-imageio/Makefile +++ b/java/jai-imageio/Makefile @@ -16,7 +16,7 @@ MAINTAINER= java@FreeBSD.org COMMENT= Plug-ins for the Java Image I/O Framework USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes NO_BUILD= yes ONLY_FOR_ARCHS= i386 diff --git a/java/jai/Makefile b/java/jai/Makefile index 19a29e0ec1c4..9a6a2413dc0f 100644 --- a/java/jai/Makefile +++ b/java/jai/Makefile @@ -16,7 +16,7 @@ MAINTAINER= java@FreeBSD.org COMMENT= High performance image processing libraries for Java USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g} NO_BUILD= yes diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile index f4ff4ed0a5a9..12db600a8842 100644 --- a/java/jakarta-bcel/Makefile +++ b/java/jakarta-bcel/Makefile @@ -17,7 +17,7 @@ COMMENT= A library for generating Java bytecode NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ PLIST_FILES= %%JAVAJARDIR%%/bcel.jar diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile index 8c663ddd09c0..e3dbcba3d165 100644 --- a/java/jakarta-commons-beanutils/Makefile +++ b/java/jakarta-commons-beanutils/Makefile @@ -23,7 +23,7 @@ JAR_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons- ${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= dist diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile index 7bcfa682e84c..52a9ac5838fc 100644 --- a/java/jakarta-commons-cli/Makefile +++ b/java/jakarta-commons-cli/Makefile @@ -20,7 +20,7 @@ COMMENT= Java library for command line arguments and options LICENSE= ASL USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile index 77df682fe65e..8edf2bc60002 100644 --- a/java/jakarta-commons-codec/Makefile +++ b/java/jakarta-commons-codec/Makefile @@ -20,7 +20,7 @@ LICENSE= ASL LICENSE_FILE= ${WRKSRC}/LICENSE.txt USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= dist diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile index fabdbc84f094..b5870fa5051b 100644 --- a/java/jakarta-commons-dbcp/Makefile +++ b/java/jakarta-commons-dbcp/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-poo ${JAVALIBDIR}/jta.jar:${PORTSDIR}/java/jta USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile index acecfccc07b8..27e4c677dace 100644 --- a/java/jakarta-commons-discovery/Makefile +++ b/java/jakarta-commons-discovery/Makefile @@ -17,7 +17,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= A Java library for locating resources (including classes) USE_JAVA= YES -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= YES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile index e4bb5b6370ff..d23c44150a4c 100644 --- a/java/jakarta-commons-httpclient/Makefile +++ b/java/jakarta-commons-httpclient/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons- RUN_DEPENDS+= ${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile index b78fc62aa50a..3f1e72eba41a 100644 --- a/java/jakarta-commons-lang/Makefile +++ b/java/jakarta-commons-lang/Makefile @@ -19,10 +19,9 @@ COMMENT= Jakarta library with helper utilities for the java.lang API LICENSE= ASL USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes -USE_JIKES= no ALL_TARGET= jar .if !defined(NOPORTDOCS) diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile index 8aa03c4528f8..cdeb07e076b1 100644 --- a/java/jakarta-commons-logging/Makefile +++ b/java/jakarta-commons-logging/Makefile @@ -19,7 +19,7 @@ COMMENT= Generic logging wrapper library WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .include <bsd.port.pre.mk> diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile index 82b6e0d41cfe..837be33ea29d 100644 --- a/java/jakarta-commons-pool/Makefile +++ b/java/jakarta-commons-pool/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= Jakarta Object-pooling API USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= build-jar diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile index 948c1e591fd5..b3fa3d4a5394 100644 --- a/java/jakarta-commons-primitives/Makefile +++ b/java/jakarta-commons-primitives/Makefile @@ -18,7 +18,7 @@ MAINTAINER= hq@FreeBSD.org COMMENT= A library supporting Java primitive types USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile index 54aa64afb8d1..3eb079c816c4 100644 --- a/java/jakarta-oro/Makefile +++ b/java/jakarta-oro/Makefile @@ -17,7 +17,7 @@ COMMENT= Perl/awk/sh regular expressions for Java BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ PLIST= ${WRKDIR}/PLIST diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile index 34b3c1b83489..718176c8c3fa 100644 --- a/java/jakarta-regexp/Makefile +++ b/java/jakarta-regexp/Makefile @@ -17,7 +17,7 @@ COMMENT= Regular expressions for Java BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ PLIST= ${WRKDIR}/PLIST diff --git a/java/jakarta-struts/Makefile b/java/jakarta-struts/Makefile index 730be1036a99..f548f776dc2d 100644 --- a/java/jakarta-struts/Makefile +++ b/java/jakarta-struts/Makefile @@ -17,7 +17,7 @@ MAINTAINER= toha@toha.org.ua COMMENT= Struts framework USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= YES USE_ZIP= YES diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile index 192ea3f7e3d4..7cee7cf756c1 100644 --- a/java/jasmin/Makefile +++ b/java/jasmin/Makefile @@ -18,7 +18,7 @@ USE_ZIP= yes USE_ANT= yes ALL_TARGET= jasmin USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html) diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1 index d10f3ce8b4ab..d2095bc6ec41 100644 --- a/java/javavmwrapper/src/javavm.1 +++ b/java/javavmwrapper/src/javavm.1 @@ -99,7 +99,6 @@ A space delimited list of Java VM vendors. The selected Java VM must have been released by one of the vendors in the list. .Pp Currently allowed vendors are -.Ql blackdown , .Ql bsdjava , .Ql freebsd , .Ql ibm , @@ -114,14 +113,6 @@ to a version, any Java VM with a version greater than or equal to the given version will be used. .Pp Currently allowed versions are -.Ql 1.1 , -.Ql 1.1+ , -.Ql 1.2 , -.Ql 1.2+ , -.Ql 1.3 , -.Ql 1.3+ , -.Ql 1.4 , -.Ql 1.4+ , .Ql 1.5 , .Ql 1.5+ , .Ql 1.6 , @@ -178,16 +169,16 @@ Execute the most up to date and .Dq native Java VM registered with .Nm . -.It Ev JAVA_VERSION=1.4+ Pa %%LOCALBASE%%/bin/javac MyClass.java +.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java Compile MyClass.java with a registered Java VM's javac that is at least -version 1.4. +version 1.5. .It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar Execute MyApp with the most up to date native Java VM that is registered with .Nm . This is necessary if MyApp uses JNI, for instance. -.It Ev JAVA_VERSION="1.2 1.4" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar -Execute MyApp with either a Java VM that is either version 1.2 or version 1.4. +.It Ev JAVA_VERSION="1.5 1.7" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar +Execute MyApp with either a Java VM that is either version 1.5 or version 1.7. .It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java Don't invoke the Java VM, but print out information about what would have been done. diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1 index a288d0dc5286..f6781a1b5d25 100644 --- a/java/javavmwrapper/src/manvm.1 +++ b/java/javavmwrapper/src/manvm.1 @@ -86,7 +86,6 @@ The on-line manual pages to be displayed must come from a Java VM that has been released by one of the vendors in the list. .Pp Currently allowed vendors are -.Ql blackdown , .Ql bsdjava , .Ql freebsd , .Ql ibm , @@ -102,14 +101,6 @@ to a version, the on-line manual pages from any Java VM with a version greater than or equal to the given version will be used. .Pp Currently allowed versions are -.Ql 1.1 , -.Ql 1.1+ , -.Ql 1.2 , -.Ql 1.2+ , -.Ql 1.3 , -.Ql 1.3+ , -.Ql 1.4 , -.Ql 1.4+ , .Ql 1.5 , .Ql 1.5+ , .Ql 1.6 , diff --git a/java/jaxen/Makefile b/java/jaxen/Makefile index b7cc0c25cbc1..88b257083ca1 100644 --- a/java/jaxen/Makefile +++ b/java/jaxen/Makefile @@ -15,7 +15,7 @@ MAINTAINER= hq@FreeBSD.org COMMENT= Java XPath Engine USE_JAVA= YES -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= YES JARFILES= jaxen-core.jar jaxen-dom.jar jaxen-dom4j.jar jaxen-exml.jar jaxen-full.jar jaxen-jdom.jar lib/saxpath.jar diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile index e669bd264862..2cc11e6fd0e7 100644 --- a/java/jboss2/Makefile +++ b/java/jboss2/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= JBoss 2.x, an open-source J2EE application server USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ZIP= YES NO_BUILD= YES diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile index c50557ce6692..4711b5651803 100644 --- a/java/jcalendar/Makefile +++ b/java/jcalendar/Makefile @@ -16,7 +16,7 @@ COMMENT= Java Date Chooser USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes WRKSRC= ${WRKDIR}/src PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile index 3a65dd858a9f..a5a12e60c66e 100644 --- a/java/jcommon/Makefile +++ b/java/jcommon/Makefile @@ -15,7 +15,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= A collection of useful classes used by JFreeChart and JFreeReport USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ .if !defined(WITHOUT_COMPILE) USE_ANT= yes diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile index c41a0195d2e3..34f58a654d9c 100644 --- a/java/jdbcpool/Makefile +++ b/java/jdbcpool/Makefile @@ -15,7 +15,7 @@ MAINTAINER= java@FreeBSD.org COMMENT= JDBC connection pool USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PORTDOCS= CHANGES LICENSE README diff --git a/java/jdom/Makefile b/java/jdom/Makefile index 55483c39eef2..1f20cde46bbc 100644 --- a/java/jdom/Makefile +++ b/java/jdom/Makefile @@ -17,7 +17,7 @@ COMMENT= Java library for accessing and manipulating XML documents RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= package diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile index e5f9f31f825e..a76f1516ddb1 100644 --- a/java/jfreechart/Makefile +++ b/java/jfreechart/Makefile @@ -17,7 +17,7 @@ COMMENT= A free Java class library for generating charts RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ .if !defined(WITHOUT_COMPILE) USE_ANT= yes diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile index e88f1d55646e..d14fd14f7eef 100644 --- a/java/jgraph/Makefile +++ b/java/jgraph/Makefile @@ -22,7 +22,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_ZIP= yes NO_WRKSUBDIR= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_RUN= yes .if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile index 50d9640f4cc1..4e34cbe76082 100644 --- a/java/jgrapht/Makefile +++ b/java/jgrapht/Makefile @@ -16,7 +16,7 @@ COMMENT= Java package for mathematical graph-theory objects and algorithms USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ .if !defined(WITHOUT_COMPILE) USE_ANT= yes diff --git a/java/jgraphx/Makefile b/java/jgraphx/Makefile index 0d5ed7b3a7d1..8abc7f24bc5e 100644 --- a/java/jgraphx/Makefile +++ b/java/jgraphx/Makefile @@ -24,7 +24,7 @@ MANUAL_PACKAGE_BUILD= needs interactive license confirmation USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_RUN= yes .if !defined(WITHOUT_COMPILE) || !defined(NOPORTDOCS) diff --git a/java/jmf/Makefile b/java/jmf/Makefile index 746e48bc238b..71dcedbdfcfe 100644 --- a/java/jmf/Makefile +++ b/java/jmf/Makefile @@ -17,7 +17,7 @@ MAINTAINER= toha@toha.org.ua COMMENT= Java Media Framework USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ZIP= YES NO_BUILD= YES diff --git a/java/jmp/Makefile b/java/jmp/Makefile index 1c7b48b10c12..d3c716b7aabe 100644 --- a/java/jmp/Makefile +++ b/java/jmp/Makefile @@ -26,11 +26,10 @@ USE_BISON= build USE_GETTEXT= yes USE_GMAKE= yes USE_JAVA= yes -JAVA_VERSION= 1.3 1.4 1.5 +JAVA_VERSION= 1.5 JAVA_OS= native JAVA_BUILD= jdk NEED_JAVAC= yes -USE_JIKES= no MAN1= jmp.1 diff --git a/java/jode/Makefile b/java/jode/Makefile index e385f4f97e22..acc020b11f5f 100644 --- a/java/jode/Makefile +++ b/java/jode/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} VENDOR_VERSION= 1.1.2-pre1 USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NEED_JAVAC= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/java/jode/files/patch-bin-jode b/java/jode/files/patch-bin-jode index 3b3f86cfec9b..a5e07eca4f32 100644 --- a/java/jode/files/patch-bin-jode +++ b/java/jode/files/patch-bin-jode @@ -14,5 +14,5 @@ -CP=`echo $CLASSPATH | sed s/:/,/` -CLASSPATH=@datadir@/jode-@VERSION@.jar:@CLASSPATH@ \ -@JAVA@ $CLAZZ --classpath $CP $* -+JAVA_VERSION="1.2+" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \ ++JAVA_VERSION="%%JAVA_VERSION%%" exec @prefix@/bin/java -cp @datadir@/jode-@VERSION@.jar:@datadir@/getopt.jar \ + $CLAZZ $CP "$@" diff --git a/java/jomp/Makefile b/java/jomp/Makefile index bbacf0ab031a..d4abd6e3cddb 100644 --- a/java/jomp/Makefile +++ b/java/jomp/Makefile @@ -18,7 +18,7 @@ MAINTAINER= brueffer@FreeBSD.org COMMENT= Prototype OpenMP implementation for Java USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/java/jta/Makefile b/java/jta/Makefile index 2590b75e40bb..a295203bd61e 100644 --- a/java/jta/Makefile +++ b/java/jta/Makefile @@ -16,7 +16,7 @@ COMMENT= Java Transaction API (JTA) USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_CDROM= See the license diff --git a/java/jump/Makefile b/java/jump/Makefile index 965695a489f1..03cfd94b7e73 100644 --- a/java/jump/Makefile +++ b/java/jump/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java library for arbitrary precision computations USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ANT= yes .if defined(NOPORTDOCS) diff --git a/java/mx4j/Makefile b/java/mx4j/Makefile index 4d9fa32b7f03..583490f68f00 100644 --- a/java/mx4j/Makefile +++ b/java/mx4j/Makefile @@ -15,7 +15,7 @@ MAINTAINER= simon@olofsson.de COMMENT= Open Source implementation of the Java Management Extensions (JMX) USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ .if !defined(NOPORTDOCS) PORTDOCS= * diff --git a/java/poseidon/Makefile b/java/poseidon/Makefile index 0cca1576f2ae..5036420fde1b 100644 --- a/java/poseidon/Makefile +++ b/java/poseidon/Makefile @@ -17,7 +17,7 @@ COMMENT= A popular UML CASE tool USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_VENDOR= ${_JAVA_VENDOR_LIST:Nsun} # the port is broken with Sun JDKs NO_BUILD= yes RESTRICTED= Redistribution is not permitted diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile index c1aed2e69c38..80b01c4d49ba 100644 --- a/java/sqlitejdbc/Makefile +++ b/java/sqlitejdbc/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_GMAKE= yes MAKE_ENV= JAVA_HOME="${JAVA_HOME}" ALL_TARGET= native diff --git a/java/subversion-java/Makefile b/java/subversion-java/Makefile index 485a70a5b2ea..c25a62f60977 100644 --- a/java/subversion-java/Makefile +++ b/java/subversion-java/Makefile @@ -16,7 +16,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion PKGDIR= ${.CURDIR} USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes diff --git a/java/sun-wtk/Makefile b/java/sun-wtk/Makefile index d0b0455763b9..cd8b5d8db320 100644 --- a/java/sun-wtk/Makefile +++ b/java/sun-wtk/Makefile @@ -21,7 +21,7 @@ EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip USE_LINUX= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes DOWNLOAD_URL= https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=j2me_wireless_toolkit-${PORTVERSION:S/./_/}-oth-JPR@CDS-CDS_Developer diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile index 5f490d60c4ad..154a77dd10fb 100644 --- a/java/trove4j/Makefile +++ b/java/trove4j/Makefile @@ -15,7 +15,7 @@ MAINTAINER= hq@FreeBSD.org COMMENT= High performance collections API for Java USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .if !defined(NOPORTDOCS) diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile index d68e508d45f3..cd3fd74afd2f 100644 --- a/java/xdoclet/Makefile +++ b/java/xdoclet/Makefile @@ -20,7 +20,7 @@ COMMENT= Java attribute-oriented code generation engine RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/lang/bsh/Makefile b/lang/bsh/Makefile index 4571b18116e5..5eba29da4093 100644 --- a/lang/bsh/Makefile +++ b/lang/bsh/Makefile @@ -18,7 +18,7 @@ MAINTAINER= simon@olofsson.de COMMENT= A Java scripting language USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes SUB_FILES= ${PORTNAME}.sh diff --git a/lang/clojure/files/clojure-bin.in b/lang/clojure/files/clojure-bin.in index 99af0c916a5e..4d97a737539f 100644 --- a/lang/clojure/files/clojure-bin.in +++ b/lang/clojure/files/clojure-bin.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.5+" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure-1.2.0.jar:%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar:%%JAVAJARDIR%%/swank-clojure-1.2.1.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/jline.jar:%%JAVAJARDIR%%/clojure-1.2.0.jar:%%JAVAJARDIR%%/clojure-contrib-1.2.0.jar:%%JAVAJARDIR%%/swank-clojure-1.2.1.jar:$CLASSPATH" %%CLOJURE_JLINE_RUNNER%% clojure.main "$@" diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 5e2c9a9acdb9..d5abaafbdec7 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -58,7 +58,7 @@ OPTIONS= JAVA "Enable Java applications" on \ .if !defined(WITHOUT_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ # Make sure ${JAVA_HOME}/bin is in the path CONFIGURE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin MAKE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index 5e2c9a9acdb9..d5abaafbdec7 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -58,7 +58,7 @@ OPTIONS= JAVA "Enable Java applications" on \ .if !defined(WITHOUT_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ # Make sure ${JAVA_HOME}/bin is in the path CONFIGURE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin MAKE_ENV+= PATH=${PATH}:${JAVA_HOME}/bin diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile index abb52e947d4c..58e704812868 100644 --- a/lang/jakarta-commons-jelly/Makefile +++ b/lang/jakarta-commons-jelly/Makefile @@ -18,7 +18,7 @@ COMMENT= XML based scripting engine RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile index 326b764cfbc2..5f7e1f867650 100644 --- a/lang/sisc/Makefile +++ b/lang/sisc/Makefile @@ -15,7 +15,7 @@ MAINTAINER= araujo@FreeBSD.org COMMENT= An extensible Java-based Scheme interpreter USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PORTDOCS= COPYING README diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile index c893276821fe..8950c82582cb 100644 --- a/lang/starlogo/Makefile +++ b/lang/starlogo/Makefile @@ -16,7 +16,7 @@ MAINTAINER= java@FreeBSD.org COMMENT= Specialized version of the Logo programming language written in Java USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/lang/starlogo/files/starlogo.sh.in b/lang/starlogo/files/starlogo.sh.in index 344a6c123222..70248e4c8d3b 100644 --- a/lang/starlogo/files/starlogo.sh.in +++ b/lang/starlogo/files/starlogo.sh.in @@ -3,4 +3,4 @@ # $FreeBSD$ cd %%DATADIR%%/sample-projects && \ -JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%DATADIR%%/starlogo.jar" starlogo.Toplevel compiler english "init 100" "$@" diff --git a/mail/james/Makefile b/mail/james/Makefile index b9f3b14cad3b..228cf8f96945 100644 --- a/mail/james/Makefile +++ b/mail/james/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java SMTP and POP3 Mail server and NNTP News server USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= YES USE_RC_SUBR= james.sh diff --git a/mail/jboss-mailservices/Makefile b/mail/jboss-mailservices/Makefile index ae6b1725d355..213c85f6c031 100644 --- a/mail/jboss-mailservices/Makefile +++ b/mail/jboss-mailservices/Makefile @@ -18,7 +18,7 @@ COMMENT= JBoss Mail Services RUN_DEPENDS= ${LOCALBASE}/jboss4/server/default/conf/jboss-service.xml:${PORTSDIR}/java/jboss4 USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= YES USE_ZIP= YES diff --git a/math/geogebra-i18n/Makefile b/math/geogebra-i18n/Makefile index 3020d809da03..5473aa043fe7 100644 --- a/math/geogebra-i18n/Makefile +++ b/math/geogebra-i18n/Makefile @@ -25,7 +25,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ SUB_FILES= ${PORTNAME:S/-i18n$//} FIND_DOCS= -type f \! \( -name *.txt -or -name *.jar \) diff --git a/math/geonext/Makefile b/math/geonext/Makefile index 6517e8509a79..712a1ab75dc1 100644 --- a/math/geonext/Makefile +++ b/math/geonext/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/geonext_install NO_BUILD= yes USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ DATA= cacerts didmat.crt geonext.html geonext.jar license.txt index.html\ geonext-batik.jar help.jar help_fr.jar help_de.jar help_it.jar \ help_uk.jar diff --git a/math/jakarta-commons-math/Makefile b/math/jakarta-commons-math/Makefile index ade8960d8274..09ed226ba8c8 100644 --- a/math/jakarta-commons-math/Makefile +++ b/math/jakarta-commons-math/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons- ${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= jar diff --git a/math/plman/Makefile b/math/plman/Makefile index 5a32ebfb9778..d48453ec2051 100644 --- a/math/plman/Makefile +++ b/math/plman/Makefile @@ -24,7 +24,7 @@ NO_BUILD= yes USE_JAVA= yes USE_ZIP= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} REPLACE_FILES= ${WRKSRC}/bin/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/math/truthtable/Makefile b/math/truthtable/Makefile index 943687f02d18..3feddb419c5d 100644 --- a/math/truthtable/Makefile +++ b/math/truthtable/Makefile @@ -19,7 +19,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= A Truth Tables generator (written in Java) USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/math/vtk-java/Makefile b/math/vtk-java/Makefile index 0d026963b6c4..23d0e30692aa 100644 --- a/math/vtk-java/Makefile +++ b/math/vtk-java/Makefile @@ -18,10 +18,9 @@ WRAP= Java BINARIES= vtkParseJava vtkWrapJava USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native JAVA_BUILD= jdk -#USE_JIKES= no JARFILE= vtk.jar # ${PORTNAME}.jar DESTJARFILE= vtk.jar # ${PORTNAME}.jar diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile index 979d37de836e..9f5cb2dda3f1 100644 --- a/misc/freeguide/Makefile +++ b/misc/freeguide/Makefile @@ -18,8 +18,7 @@ RUN_DEPENDS= tv_cat:${PORTSDIR}/textproc/p5-xmltv LICENSE= GPLv2 USE_JAVA= yes -USE_JIKES= no -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes MANCOMPRESSED= yes MAN1= freeguide.1 diff --git a/misc/pauker/Makefile b/misc/pauker/Makefile index 44e00bafa5eb..3b52deb2857f 100644 --- a/misc/pauker/Makefile +++ b/misc/pauker/Makefile @@ -17,7 +17,7 @@ MAINTAINER= alex@stangl.us COMMENT= Java-based flashcard learning using the Leitner system USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar bin/${PORTNAME} diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile index 334278667f1a..f5a29c21bfcc 100644 --- a/misc/pipe/Makefile +++ b/misc/pipe/Makefile @@ -19,7 +19,7 @@ COMMENT= A tool for creating and analysing Petri nets USE_ZIP= yes NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ PLIST_FILES= bin/pipe SUB_FILES= pipe.sh diff --git a/multimedia/gdialog/Makefile b/multimedia/gdialog/Makefile index 694d23103136..8e5614335b6b 100644 --- a/multimedia/gdialog/Makefile +++ b/multimedia/gdialog/Makefile @@ -19,8 +19,7 @@ RUN_DEPENDS= projectx>=0.90.4.00:${PORTSDIR}/multimedia/projectx USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ -USE_JIKES= no +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile index 6eb7e351eda4..f677fd8b413d 100644 --- a/multimedia/projectx/Makefile +++ b/multimedia/projectx/Makefile @@ -21,8 +21,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ -USE_JIKES= no +JAVA_VERSION= 1.5+ SUB_FILES= project-x.sh DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/net-im/convey/Makefile b/net-im/convey/Makefile index 00541cbbaf57..d42b0a4ad4ba 100644 --- a/net-im/convey/Makefile +++ b/net-im/convey/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ MAKE_ARGS= -quiet diff --git a/net-mgmt/airport/Makefile b/net-mgmt/airport/Makefile index a833a684b8c2..6e6f5cbe8ebb 100644 --- a/net-mgmt/airport/Makefile +++ b/net-mgmt/airport/Makefile @@ -25,7 +25,7 @@ EXTRACT_BEFORE_ARGS= -q -o USE_ZIP= YES USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= YES NO_BUILD= yes 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 diff --git a/net/dimes/Makefile b/net/dimes/Makefile index a378fa87679a..e1220228fbc5 100644 --- a/net/dimes/Makefile +++ b/net/dimes/Makefile @@ -25,7 +25,7 @@ JAVA_VERSION= 1.6+ #java-linux required JAVA_OS= linux #all vendors except forbidden: ibm -JAVA_VENDOR= sun blackdown +JAVA_VENDOR= sun DATADIR= ${JAVASHAREDIR}/dimes post-extract: diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile index 2c0d850541f6..bdf774a559d5 100644 --- a/net/jakarta-commons-net/Makefile +++ b/net/jakarta-commons-net/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ RUN_DEPENDS= ${JAVAJARDIR}/jakarta-oro.jar:${PORTSDIR}/java/jakarta-oro USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile index 90a2684a1ff9..31a2007684a9 100644 --- a/net/java-beepcore/Makefile +++ b/net/java-beepcore/Makefile @@ -19,7 +19,7 @@ COMMENT= An implementation of BEEP core and BEEP mapping for TCP in Java RUN_DEPENDS= ${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes do-install: diff --git a/net/jcifs/Makefile b/net/jcifs/Makefile index 3836eb36718a..d7cd38d85bb2 100644 --- a/net/jcifs/Makefile +++ b/net/jcifs/Makefile @@ -19,7 +19,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} NO_BUILD= yes diff --git a/net/jsch/Makefile b/net/jsch/Makefile index e5966739b78c..8c3821358911 100644 --- a/net/jsch/Makefile +++ b/net/jsch/Makefile @@ -15,7 +15,7 @@ COMMENT= A pure Java implementation of SSH2 USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes PLIST_FILES+= %%JAVAJARDIR%%/${PORTNAME}.jar diff --git a/net/ldapbrowser/Makefile b/net/ldapbrowser/Makefile index 99db38f7e2cd..5c2c1488f2c6 100644 --- a/net/ldapbrowser/Makefile +++ b/net/ldapbrowser/Makefile @@ -19,7 +19,7 @@ COMMENT= Java/Swing-based LDAP Browser/Editor RESTRICTED= No reply from author regarding redistribution licensing USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes NOMAN= defined WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile index b4d2864cbee7..59dba10ba8f8 100644 --- a/net/mpich2/Makefile +++ b/net/mpich2/Makefile @@ -85,7 +85,7 @@ PLIST_SUB+= JAVA="@comment " PLX11= "@comment " .else USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ BUILD_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper PLIST_SUB+= JAVA="" diff --git a/net/seda/Makefile b/net/seda/Makefile index f93dfab26882..1944e76e1fe1 100644 --- a/net/seda/Makefile +++ b/net/seda/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Architecture for Highly Concurrent Server Applications USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= dist diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile index 57fcba707c4b..98548d592561 100644 --- a/net/spread-j/Makefile +++ b/net/spread-j/Makefile @@ -19,7 +19,7 @@ COMMENT= Java client library for the Spread Group Communication System BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant USE_JAVA= YES -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ PKGMESSAGE= ${WRKSRC}/../license.txt ANT?= ${LOCALBASE}/bin/ant diff --git a/palm/jpilot-db/Makefile b/palm/jpilot-db/Makefile index 5618dc8c4012..b04260bb0bcd 100644 --- a/palm/jpilot-db/Makefile +++ b/palm/jpilot-db/Makefile @@ -21,7 +21,7 @@ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= . USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes SUB_FILES= jpilot-db.sh SUB_LIST= PKGNAME=${PKGNAME} diff --git a/palm/jpilot-db/files/jpilot-db.sh.in b/palm/jpilot-db/files/jpilot-db.sh.in index d2b5aaa90aa5..12fe8a8b942e 100644 --- a/palm/jpilot-db/files/jpilot-db.sh.in +++ b/palm/jpilot-db/files/jpilot-db.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.3+" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%PKGNAME%%.jar" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%PKGNAME%%.jar" diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index aaf76af3c0ff..7e31881bc1df 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -2015,8 +2015,7 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf $whole =~ /^JAVA_OS[?:]?=\s*(.*)$/m || $whole =~ /^JAVA_VENDOR[?:]?=\s*(.*)$/m || $whole =~ /^JAVA_RUN[?:]?=\s*(.*)$/m || - $whole =~ /^JAVA_BUILD[?:]?=\s*(.*)$/m || - $whole =~ /^USE_JIKES[?:]?=\s*(.*)$/m)) { + $whole =~ /^JAVA_BUILD[?:]?=\s*(.*)$/m)) { &perror("FATAL", $file, -1, "the port uses Java features, but USE_JAVA ". "is not defined"); } diff --git a/print/acrobatviewer/Makefile b/print/acrobatviewer/Makefile index 7e6e95677d0a..5eb67032f32d 100644 --- a/print/acrobatviewer/Makefile +++ b/print/acrobatviewer/Makefile @@ -19,7 +19,7 @@ COMMENT= Viewer for the PDF files written in Java(TM) #XXX need info-unzip for archive.zip USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ JAVA_EXTRACT= yes NO_BUILD= yes SUB_FILES+= AcrobatViewer diff --git a/science/colt/Makefile b/science/colt/Makefile index c30831cc7932..98eda3920e98 100644 --- a/science/colt/Makefile +++ b/science/colt/Makefile @@ -15,7 +15,7 @@ MAINTAINER= wenheping@gmail.com COMMENT= Java package for scalable scientific and technical computing USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR}/${PORTNAME} .if !defined(WITHOUT_COMPILE) diff --git a/science/devisor/Makefile b/science/devisor/Makefile index 8dc51f47af65..97f1c3efc646 100644 --- a/science/devisor/Makefile +++ b/science/devisor/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Design and Visualization Software Resource for FeatFlow USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes # Sources are available though SUB_FILES= devisorgrid.sh diff --git a/science/devisor/files/devisorgrid.sh.in b/science/devisor/files/devisorgrid.sh.in index 3a9ef170271a..6e8dfab96c3a 100644 --- a/science/devisor/files/devisorgrid.sh.in +++ b/science/devisor/files/devisorgrid.sh.in @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.4+" %%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@" +JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -Ddevisorgrid.home="%%DATADIR%%" -cp "%%DATADIR%%" devisorgrid "$@" diff --git a/science/ovt/Makefile b/science/ovt/Makefile index a5ebc5ecc898..a1e58c90c4dc 100644 --- a/science/ovt/Makefile +++ b/science/ovt/Makefile @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes ONLY_FOR_ARCHS= i386 USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native CONFIGURE_ARGS= --with-jdk=${JAVA_HOME} diff --git a/security/burpsuite/Makefile b/security/burpsuite/Makefile index 2222d4f6d591..58608c1907bc 100644 --- a/security/burpsuite/Makefile +++ b/security/burpsuite/Makefile @@ -16,7 +16,7 @@ COMMENT= Burp Suite is an integrated platform for testing web applications USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/security/dirbuster/Makefile b/security/dirbuster/Makefile index 5f0e4c25d420..9f36fbb2caba 100644 --- a/security/dirbuster/Makefile +++ b/security/dirbuster/Makefile @@ -16,7 +16,7 @@ COMMENT= DirBuster allows file and directory brute forcing on web servers USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME} DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile index e7bf3858ea16..f04d928b9441 100644 --- a/security/iaikpkcs11wrapper/Makefile +++ b/security/iaikpkcs11wrapper/Makefile @@ -18,7 +18,7 @@ COMMENT= A PKCS\#11 Java wrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GMAKE= yes ALL_TARGET= release diff --git a/security/webscarab/Makefile b/security/webscarab/Makefile index a66fc41b7bdb..222c9b0ec2d5 100644 --- a/security/webscarab/Makefile +++ b/security/webscarab/Makefile @@ -17,7 +17,7 @@ COMMENT= Framework for analysing HTTP and HTTPS web application traffic USE_ZIP= YES USE_JAVA= YES -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME}-1304 DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile index 16c7e70c35f1..d251600453b1 100644 --- a/security/xml-security/Makefile +++ b/security/xml-security/Makefile @@ -25,7 +25,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g} USE_ANT= yes MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile index a64bcc63f0d4..419c0bb8007d 100644 --- a/sysutils/sge60/Makefile +++ b/sysutils/sge60/Makefile @@ -99,7 +99,7 @@ PLIST_SUB+= BDB_SPOOL="@comment " .if defined(WITH_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native JAVA_BUILD= jdk JAVA_RUN= jre diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile index f96b189a98dd..240be044c655 100644 --- a/sysutils/sge61/Makefile +++ b/sysutils/sge61/Makefile @@ -104,7 +104,7 @@ PLIST_SUB+= BDB_SPOOL="@comment " .if defined(WITH_JAVA) USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ PLIST_SUB+= DRMAA= CATEGORIES+= java .else diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile index 3257b34f046b..7609b9ba71ae 100644 --- a/textproc/ant-xinclude-task/Makefile +++ b/textproc/ant-xinclude-task/Makefile @@ -18,7 +18,7 @@ COMMENT= XInclude task for Jakarta Ant BUILD_DEPENDS= ${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder USE_JAVA= yes -JAVA_VERSION= 1.1+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= jar diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile index 981d8f67ba41..8b919cdab9f7 100644 --- a/textproc/denature/Makefile +++ b/textproc/denature/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Pa USE_PERL5= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ POD2MAN?= pod2man WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/textproc/dom4j/Makefile b/textproc/dom4j/Makefile index d7445db297b6..6c584ce7d058 100644 --- a/textproc/dom4j/Makefile +++ b/textproc/dom4j/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open Source XML framework for Java USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index 766bbbb37a5d..1b62541601bf 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes # Prevent out of memory error during build diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile index 355e20aaf249..ef9b35035577 100644 --- a/textproc/jakarta-commons-digester/Makefile +++ b/textproc/jakarta-commons-digester/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${JAR_DEPENDS} RUN_DEPENDS= ${JAR_DEPENDS} USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ USE_ANT= yes MAKE_ARGS= -Dcommons-beanutils.api=${COMMONS_BEANUTILS_API} \ diff --git a/textproc/jakarta-poi/Makefile b/textproc/jakarta-poi/Makefile index 82b7e8d03ed2..71798ebbc872 100644 --- a/textproc/jakarta-poi/Makefile +++ b/textproc/jakarta-poi/Makefile @@ -20,8 +20,7 @@ COMMENT= Java API To Access Microsoft Format Files BUILD_DEPENDS= ${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j USE_JAVA= yes -JAVA_VERSION= 1.4+ -USE_JIKES= no +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile index c88ab8837d42..973d28c33cc3 100644 --- a/textproc/jarnal/Makefile +++ b/textproc/jarnal/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ LICENSE= GPLv2 diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile index b50955769fff..5fe72f43b144 100644 --- a/textproc/jaxup/Makefile +++ b/textproc/jaxup/Makefile @@ -26,7 +26,7 @@ USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/textproc/jaxup/files/jaxup-xupdater.sh b/textproc/jaxup/files/jaxup-xupdater.sh index aabc8ca05828..1fd12cf618fe 100644 --- a/textproc/jaxup/files/jaxup-xupdater.sh +++ b/textproc/jaxup/files/jaxup-xupdater.sh @@ -2,4 +2,4 @@ # # $FreeBSD$ -JAVA_VERSION="1.3+" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" %%LOCALBASE%%/bin/java -cp "`"%%LOCALBASE%%/bin/classpath"`:%%DATADIR%%/jaxup-xupdater.jar" "DOMXUpdater" "$@" diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile index 305fb4eaeb27..6423b1c5d2d2 100644 --- a/textproc/jdictionary/Makefile +++ b/textproc/jdictionary/Makefile @@ -18,7 +18,7 @@ COMMENT= Platform independent, plugin based dictionary RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin index 09dfd4a66fa3..f5dc656ac6c0 100644 --- a/textproc/jdictionary/Makefile.plugin +++ b/textproc/jdictionary/Makefile.plugin @@ -15,7 +15,7 @@ RUN_DEPENDS+= jdictionary:${PORTSDIR}/textproc/jdictionary # WARNING: USE_JAVA is set to be able to use JAVASHAREDIR. # Please make sure that JAVA_VERSION here is the same as in Makefile. USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile index 22d8e5c829a8..6eca4ff7bb3d 100644 --- a/textproc/nux/Makefile +++ b/textproc/nux/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom \ OPTIONS= XQUERY_TOOL "Install the XQuery command-line tool" on USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile index 970880482385..eeb84314c31e 100644 --- a/textproc/ppower4/Makefile +++ b/textproc/ppower4/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX \ USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/textproc/py-lucene/Makefile b/textproc/py-lucene/Makefile index 82e9d62784a9..eff93cf73917 100644 --- a/textproc/py-lucene/Makefile +++ b/textproc/py-lucene/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ USE_PYTHON= 2.5+ USE_GCC= 4.2+ USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_GMAKE= yes PATCHSET= -1 LUCENE_VER= 2.4.1 diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile index 9a6403473e41..c06853cfa7e5 100644 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -25,7 +25,7 @@ OPTIONS= JDOM "Install Jdom support" off \ USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/textproc/saxon-devel/files/saxon.sh.in b/textproc/saxon-devel/files/saxon.sh.in index b849bd18e7f4..fe3c728dfffb 100644 --- a/textproc/saxon-devel/files/saxon.sh.in +++ b/textproc/saxon-devel/files/saxon.sh.in @@ -17,4 +17,4 @@ do SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" done -JAVA_VERSION="1.4+" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in index 329e79110535..6dc0121e9c04 100644 --- a/textproc/saxon-he/files/saxon.sh.in +++ b/textproc/saxon-he/files/saxon.sh.in @@ -17,4 +17,4 @@ do SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" done -JAVA_VERSION="1.4+" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile index ba980b5e68b8..af354da01284 100644 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/textproc/trang/Makefile b/textproc/trang/Makefile index 02eb44011fc7..6e64e657b65b 100644 --- a/textproc/trang/Makefile +++ b/textproc/trang/Makefile @@ -16,7 +16,7 @@ COMMENT= Multi-format schema converter based on RELAX NG USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes .if !defined(NOPORTDOCS) diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile index edb39a680cac..11616c516f65 100644 --- a/textproc/xalan-j/Makefile +++ b/textproc/xalan-j/Makefile @@ -22,7 +22,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g} diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile index 6f1392eb7768..bee1daa1be33 100644 --- a/textproc/xerces-j/Makefile +++ b/textproc/xerces-j/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= XML parser for Java USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/xerces-${PORTVERSION:S/./_/g} diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile index ec6a53acead0..c4647f82223a 100644 --- a/textproc/xincluder/Makefile +++ b/textproc/xincluder/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \ java:${PORTSDIR}/java/javavmwrapper USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/textproc/xincluder/files/xincluder.sh.in b/textproc/xincluder/files/xincluder.sh.in index ea0abe794e50..4ed46d6e30e6 100644 --- a/textproc/xincluder/files/xincluder.sh.in +++ b/textproc/xincluder/files/xincluder.sh.in @@ -12,4 +12,4 @@ case "${IAM}" in *) echo "ERROR!" ; false ;; esac -JAVA_VERSION="1.2+" "%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@" +JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "`"%%LOCALBASE%%/bin/classpath"`" "com.elharo.xml.xinclude.${MAIN_CLASS}" "$@" diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile index f53911f7d995..37accd92e0f2 100644 --- a/textproc/xom/Makefile +++ b/textproc/xom/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \ ${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/XOM diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile index 7dc4653d503e..b8e3c8dfcf93 100644 --- a/textproc/xp/Makefile +++ b/textproc/xp/Makefile @@ -16,7 +16,7 @@ MAINTAINER= mike@vee.net COMMENT= An XML parser written in Java USE_JAVA= yes -JAVA_VERSION= 1.1+ +JAVA_VERSION= 1.5+ NO_WORKSUBDIR= yes NO_BUILD= yes diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile index 7002ade6f117..171b8d943c4b 100644 --- a/textproc/xt/Makefile +++ b/textproc/xt/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \ ${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper USE_JAVA= YES -JAVA_VERSION= 1.1+ +JAVA_VERSION= 1.5+ NO_BUILD= YES .if !defined(NOPORTDOCS) diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile index b4c25f487305..9478083d356b 100644 --- a/www/apache-forrest/Makefile +++ b/www/apache-forrest/Makefile @@ -19,7 +19,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= A tool for rapid development of small sites USE_JAVA= yes -JAVA_VERSION= 1.4 1.5 +JAVA_VERSION= 1.5 REPLACE_FILES= ${WRKSRC}/bin/forrest ${WRKSRC}/tools/ant/bin/ant diff --git a/www/axis/Makefile b/www/axis/Makefile index d7a0bd1d933f..6dc17be810ec 100644 --- a/www/axis/Makefile +++ b/www/axis/Makefile @@ -34,7 +34,7 @@ RUN_DEPENDS+= ${LOCALBASE}/tomcat5.5:${PORTSDIR}/www/tomcat55 NO_BUILD= YES USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USER= www GROUP= www diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 77a0e88da18f..8d4cc933250e 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -18,7 +18,7 @@ COMMENT= XML Web Development Framework USE_RC_SUBR= ${PORTNAME}.sh USE_JAVA= yes -JAVA_VERSION= 1.3+ +JAVA_VERSION= 1.5+ USE_PYTHON= 1.6+ MAKE_ENV= JAVA_HOME=${JAVA_HOME} WRKSRC= ${WRKDIR}/${PDISTNAME} diff --git a/www/dojo-shrinksafe/Makefile b/www/dojo-shrinksafe/Makefile index e502d48a5def..63807d6cf087 100644 --- a/www/dojo-shrinksafe/Makefile +++ b/www/dojo-shrinksafe/Makefile @@ -17,7 +17,7 @@ MAINTAINER= glarkin@FreeBSD.org COMMENT= A Javascript code compressor USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= bin/${PKGNAMEPREFIX}${PORTNAME} %%DATADIR%%/shrinksafe.jar \ diff --git a/www/extsm/Makefile b/www/extsm/Makefile index 6227eafd8385..0f75d322b434 100644 --- a/www/extsm/Makefile +++ b/www/extsm/Makefile @@ -18,7 +18,7 @@ COMMENT= Extensible Site Manager (XSM) RUN_DEPENDS= mvn:${PORTSDIR}/devel/maven2 USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes WRKSRC= ${WRKDIR}/xsm diff --git a/www/helma/Makefile b/www/helma/Makefile index d14a0b93d218..3949c85f3241 100644 --- a/www/helma/Makefile +++ b/www/helma/Makefile @@ -21,7 +21,7 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_RC_SUBR= helma USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_ANT= yes ALL_TARGET= clean jar diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile index 78a9d2383ed1..8f27c91a423f 100644 --- a/www/htmlcompressor/Makefile +++ b/www/htmlcompressor/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= bin/htmlcompressor %%DATADIR%%/htmlcompressor.jar diff --git a/www/jetspeed/Makefile b/www/jetspeed/Makefile index 3400d4a91692..23d94ca17019 100644 --- a/www/jetspeed/Makefile +++ b/www/jetspeed/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant \ WRKSRC= ${WRKDIR}/${DISTNAME:C/-war//} USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes diff --git a/www/jetty/Makefile b/www/jetty/Makefile index 5d5b7003f038..1d7d56caedf1 100644 --- a/www/jetty/Makefile +++ b/www/jetty/Makefile @@ -16,7 +16,7 @@ COMMENT= Full-featured web server implemented entirely in java USE_RC_SUBR= ${PORTNAME} USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ USE_PYTHON= 1.6+ PLIST= ${WRKDIR}/pkg-plist PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/www/myfaces/Makefile b/www/myfaces/Makefile index df99da534f8a..d4816cde76a6 100644 --- a/www/myfaces/Makefile +++ b/www/myfaces/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Free open source JavaServer(tm) Faces implementation USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} diff --git a/www/paros/Makefile b/www/paros/Makefile index 96cc6095d3e8..fd17f10f4940 100644 --- a/www/paros/Makefile +++ b/www/paros/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_JAVA= yes JAVA_RUN= yes -JAVA_VERSION= 1.4+1.5 +JAVA_VERSION= 1.5 USE_ZIP= yes NO_BUILD= yes diff --git a/www/resin2/Makefile b/www/resin2/Makefile index 69d05143c8b3..d7960f5f6b41 100644 --- a/www/resin2/Makefile +++ b/www/resin2/Makefile @@ -15,7 +15,7 @@ MAINTAINER= boris@tagnet.ru COMMENT= Resin, a Java-based Application Server, 2.x branch USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ HAS_CONFIGURE= yes USE_PYTHON= yes USE_OPENSSL= yes diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 69f921046891..5292864300d4 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Resin, a Java-based Application Server, 3.x branch USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ HAS_CONFIGURE= yes USE_PYTHON= yes USE_OPENSSL= yes diff --git a/www/rssowl/Makefile b/www/rssowl/Makefile index dc3cf5cb8564..ccb898cef7eb 100644 --- a/www/rssowl/Makefile +++ b/www/rssowl/Makefile @@ -23,7 +23,7 @@ BUILD_WRKSRC= ${WRKSRC}/src ONLY_FOR_ARCHS= i386 amd64 USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ JAVA_OS= native JAVA_RUN= yes diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile index e930e6900b26..94cc39c6449a 100644 --- a/www/tomcat41/Makefile +++ b/www/tomcat41/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open-source Java web server by Apache, stable 4.1.x branch USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ NO_BUILD= YES LATEST_LINK= ${APP_SHORTNAME} diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile index 3455a8ce2879..33d385dd605d 100644 --- a/www/tomcat55/Makefile +++ b/www/tomcat55/Makefile @@ -20,7 +20,7 @@ OPTIONS= CRONOLOG "Use Cronolog for Log Processing" Off \ CRONOLOG_DEVEL "Use Cronlog-Devel for Log Processing" Off USE_JAVA= yes -JAVA_VERSION?= 1.4+ +JAVA_VERSION?= 1.5+ JAVA_VENDOR?= freebsd NO_BUILD= YES diff --git a/www/yuicompressor/Makefile b/www/yuicompressor/Makefile index e242bf761a08..85622e201d5c 100644 --- a/www/yuicompressor/Makefile +++ b/www/yuicompressor/Makefile @@ -15,7 +15,7 @@ COMMENT= The Yahoo! JavaScript and CSS Compressor USE_ZIP= yes USE_JAVA= yes -JAVA_VERSION= 1.4+ +JAVA_VERSION= 1.5+ NO_BUILD= yes PLIST_FILES= bin/yuicompressor %%DATADIR%%/yuicompressor.jar diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile index 40c17a20bdfd..11ac36eeb5d2 100644 --- a/x11-toolkits/libgtk-java/Makefile +++ b/x11-toolkits/libgtk-java/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack gtk20 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} \ diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile index 5576786da278..ba0cebb46594 100644 --- a/x11/libgnome-java/Makefile +++ b/x11/libgnome-java/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.2+ +JAVA_VERSION= 1.5+ JAVA_OS= native USE_GNOME= gnomehack libgnomeui CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} |