diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 05:03:02 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2011-07-21 05:03:02 +0000 |
| commit | 06e66777937202f04d646d24d24f524b13d79478 (patch) | |
| tree | 85a44213b1929b12051c17091ea4ad53f819456b /devel | |
| parent | Fix another typo (diff) | |
Now that the Java 1.3 and Java 1.4 ports are deprecated and will expire soon,
remove support for them from bsd.java.mk. As Jikes is not available in Java 1.5
or higher, remove it from bsd.java.mk too (suggested by hq@) and from the ports
which used it (only occurences were USE_JIKES=no). Support for the Blackdown VM
is also removed, as it is not available in Java 1.5 and higher.
Also remove the mapping from Java 1.1-1.4 to Java 1.5+ in bsd.java.mk to detect
old, broken ports; therefore bump the minimal value of JAVA_VERSION to 1.5.
While here, replace static values of JAVA_VERSION in files/*.in by
%%JAVA_VERSION%% .
PR: ports/158969
Submitted by: rene
Tested on: pointyhat-west -exp
Diffstat (limited to 'devel')
38 files changed, 37 insertions, 39 deletions
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 |