ports/116725: bsd.java.mk: remove support for Java 1.1 and 1.2
Herve Quiroz
hq at FreeBSD.org
Sat Sep 29 01:50:02 UTC 2007
>Number: 116725
>Category: ports
>Synopsis: bsd.java.mk: remove support for Java 1.1 and 1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 29 01:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 6.2-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Mon May 14 12:44:50 CEST 2007 root at arabica.esil.univ-mrs.fr:/usr/obj/usr/src/sys/ARABICA i386
>Description:
The attached patch removes support for Java 1.1 and 1.2 from bsd.java.mk. It
also modify affected ports. Thus, those that define JAVA_VERSION=1.1+ or
JAVA_VERSION=1.2+ are set to 1.3+.
Although it is defining JAVA_VERSION=1.1, java/collections is untouched as the
port is scheduled for removal anyway.
This patch is submitted here so that it may be tested and reviewed before we
attempt a test build on the cluster.
>How-To-Repeat:
>Fix:
Index: archivers/jzip.org/Makefile
===================================================================
RCS file: /home/ncvs/ports/archivers/jzip.org/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- archivers/jzip.org/Makefile 19 May 2007 19:57:42 -0000 1.5
+++ archivers/jzip.org/Makefile 29 Sep 2007 00:58:48 -0000
@@ -22,7 +22,7 @@
PLIST_FILES= %%JAVAJARDIR%%/jzip.org.jar bin/${PORTNAME}
USE_ZIP= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION}.src
SUB_FILES= ${PORTNAME}.sh
Index: benchmarks/scimark2/Makefile
===================================================================
RCS file: /home/ncvs/ports/benchmarks/scimark2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- benchmarks/scimark2/Makefile 19 May 2007 20:00:21 -0000 1.4
+++ benchmarks/scimark2/Makefile 29 Sep 2007 00:58:48 -0000
@@ -20,7 +20,7 @@
USE_ZIP= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_JIKES= NO
NEED_JAVAC= yes
JAVAC_OPTS?= -O
Index: comms/rxtx/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/rxtx/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- comms/rxtx/Makefile 28 Jun 2007 17:20:33 -0000 1.14
+++ comms/rxtx/Makefile 29 Sep 2007 00:58:48 -0000
@@ -19,7 +19,7 @@
USE_ZIP= yes
USE_GMAKE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
GNU_CONFIGURE= yes
Index: databases/erserver/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/erserver/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- databases/erserver/Makefile 19 May 2007 20:01:02 -0000 1.9
+++ databases/erserver/Makefile 29 Sep 2007 00:58:48 -0000
@@ -25,7 +25,7 @@
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_PERL5= yes
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME} JAVA=${JAVA}
CONFIGURE_ARGS= --with-pgincludes=${PGINC}
Index: databases/jdbc-oracle8i/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/jdbc-oracle8i/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- databases/jdbc-oracle8i/Makefile 19 May 2007 20:01:05 -0000 1.9
+++ databases/jdbc-oracle8i/Makefile 29 Sep 2007 00:58:48 -0000
@@ -25,7 +25,7 @@
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.3+ # Should be "1.2 1.3" but tested OK with 1.4
NO_BUILD= yes
NO_WRKSUBDIR= yes
Index: databases/mysql-connector-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/mysql-connector-java/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- databases/mysql-connector-java/Makefile 27 Jul 2007 13:29:42 -0000 1.44
+++ databases/mysql-connector-java/Makefile 29 Sep 2007 00:58:48 -0000
@@ -31,7 +31,7 @@
.else
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
BUILDDIR= ${WRKDIR}/${DISTNAME}
.endif
Index: devel/apache-ant/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/apache-ant/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- devel/apache-ant/Makefile 19 May 2007 20:02:02 -0000 1.47
+++ devel/apache-ant/Makefile 29 Sep 2007 00:58:48 -0000
@@ -26,7 +26,7 @@
MANPAGE_VERSION= 20030908
USE_BZIP2= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= YES
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Index: devel/excalibur-configuration/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/excalibur-configuration/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/excalibur-configuration/Makefile 19 May 2007 20:02:27 -0000 1.3
+++ devel/excalibur-configuration/Makefile 29 Sep 2007 00:58:48 -0000
@@ -18,7 +18,7 @@
RUN_DEPENDS= ${JAVALIBDIR}/avalon-framework.jar:${PORTSDIR}/devel/avalon-framework
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
Index: devel/glib-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glib-java/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- devel/glib-java/Makefile 24 May 2007 22:12:05 -0000 1.14
+++ devel/glib-java/Makefile 29 Sep 2007 00:58:48 -0000
@@ -20,7 +20,7 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GCC= 3.4+
USE_GNOME= gnomehack glib20
Index: devel/jakarta-commons-daemon/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/jakarta-commons-daemon/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/jakarta-commons-daemon/Makefile 29 Jul 2007 01:15:26 -0000 1.2
+++ devel/jakarta-commons-daemon/Makefile 29 Sep 2007 00:58:48 -0000
@@ -17,7 +17,7 @@
COMMENT= Wrapper code to start/stop a Java application as a daemon.
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
JAVA_BUILD= jdk
NEED_JAVAC= yes
Index: devel/jakarta-commons-jxpath/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/jakarta-commons-jxpath/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/jakarta-commons-jxpath/Makefile 19 May 2007 20:02:55 -0000 1.4
+++ devel/jakarta-commons-jxpath/Makefile 29 Sep 2007 00:58:48 -0000
@@ -17,7 +17,7 @@
COMMENT= Utilities for manipulating Java Beans using the XPath syntax
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
.include <bsd.port.pre.mk>
Index: devel/jakarta-commons-modeler/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/jakarta-commons-modeler/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/jakarta-commons-modeler/Makefile 19 May 2007 20:02:55 -0000 1.3
+++ devel/jakarta-commons-modeler/Makefile 29 Sep 2007 00:58:48 -0000
@@ -17,7 +17,7 @@
COMMENT= Mechanisms to create Model MBeans compatible with JMX specification
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
.include <bsd.port.pre.mk>
Index: devel/java-util-concurrent/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/java-util-concurrent/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/java-util-concurrent/Makefile 19 May 2007 20:02:55 -0000 1.2
+++ devel/java-util-concurrent/Makefile 29 Sep 2007 00:58:48 -0000
@@ -17,7 +17,7 @@
COMMENT= Utility classes for concurrent Java programming
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= dist
Index: devel/jep/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/jep/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/jep/Makefile 29 Jun 2007 16:29:13 -0000 1.9
+++ devel/jep/Makefile 29 Sep 2007 00:58:48 -0000
@@ -20,7 +20,7 @@
MAKE_ENV= JAVA_HOME=${JAVA_HOME}
CONFIGURE_ARGS= --prefix=${PREFIX} --exec-prefix=${PREFIX}
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_PYTHON= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
Index: devel/libgconf-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libgconf-java/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- devel/libgconf-java/Makefile 28 Jun 2007 16:20:51 -0000 1.16
+++ devel/libgconf-java/Makefile 29 Sep 2007 00:58:48 -0000
@@ -24,7 +24,7 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GCC= 3.4+
USE_GNOME= gnomehack gconf2
Index: devel/libglade-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libglade-java/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- devel/libglade-java/Makefile 10 Jul 2007 05:53:11 -0000 1.17
+++ devel/libglade-java/Makefile 29 Sep 2007 00:58:48 -0000
@@ -28,7 +28,7 @@
GNU_CONFIGURE= yes
USE_JAVA= yes
USE_GCC= 3.4+
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GNOME= gnomehack libglade2
CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR}
Index: devel/p5-Java/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/p5-Java/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- devel/p5-Java/Makefile 19 May 2007 20:03:25 -0000 1.3
+++ devel/p5-Java/Makefile 29 Sep 2007 00:58:48 -0000
@@ -19,7 +19,7 @@
USE_RC_SUBR= javaserver.sh
PERL_CONFIGURE= YES
USE_JAVA= yes
-JAVA_VERSION= 1.1+
+JAVA_VERSION= 1.3+
MAN3= Java.3 JavaArray.3
Index: devel/subversion/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/Makefile,v
retrieving revision 1.114
diff -u -r1.114 Makefile
--- devel/subversion/Makefile 8 Sep 2007 00:59:20 -0000 1.114
+++ devel/subversion/Makefile 29 Sep 2007 00:58:48 -0000
@@ -130,7 +130,7 @@
.if defined(WITH_JAVA)
CATEGORIES+= java
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
JAVA_BUILD= yes
JAVA_RUN= yes
Index: dns/crossip/Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/crossip/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- dns/crossip/Makefile 19 May 2007 20:03:57 -0000 1.4
+++ dns/crossip/Makefile 29 Sep 2007 00:58:48 -0000
@@ -16,7 +16,7 @@
COMMENT= Java DNS update client for the ThatIP protocol
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ZIP= yes
NO_BUILD= yes
Index: dns/dnsjava/Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/dnsjava/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- dns/dnsjava/Makefile 19 May 2007 20:03:58 -0000 1.5
+++ dns/dnsjava/Makefile 29 Sep 2007 00:58:48 -0000
@@ -16,7 +16,7 @@
COMMENT= Implementation of DNS in Java
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= jar
Index: editors/jext/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/jext/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- editors/jext/Makefile 19 May 2007 20:04:08 -0000 1.24
+++ editors/jext/Makefile 29 Sep 2007 00:58:48 -0000
@@ -16,7 +16,7 @@
COMMENT= Powerful 100% pure Java text editor
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_WRKSUBDIR= yes
USE_XLIB= yes
NO_BUILD= yes
Index: graphics/cairo-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/cairo-java/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- graphics/cairo-java/Makefile 28 Jun 2007 14:07:35 -0000 1.12
+++ graphics/cairo-java/Makefile 29 Sep 2007 00:58:48 -0000
@@ -23,7 +23,7 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GCC= 3.4+
USE_GNOME= gnomehack gnometarget
Index: java/bsh/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/bsh/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- java/bsh/Makefile 19 May 2007 20:12:32 -0000 1.18
+++ java/bsh/Makefile 29 Sep 2007 00:58:48 -0000
@@ -19,7 +19,7 @@
PLIST_FILES= %%JAVAJARDIR%%/bsh.jar bin/bsh
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
SUB_FILES= bsh.sh
Index: java/cryptix-jce/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/cryptix-jce/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- java/cryptix-jce/Makefile 19 May 2007 20:12:33 -0000 1.14
+++ java/cryptix-jce/Makefile 29 Sep 2007 00:58:48 -0000
@@ -16,7 +16,7 @@
COMMENT= JCE (Java Cryptography Extension) by Cryptix
USE_JAVA= yes
-JAVA_VERSION= 1.1+
+JAVA_VERSION= 1.3+
USE_ZIP= yes
NO_BUILD= yes
Index: java/gj/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/gj/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- java/gj/Makefile 19 May 2007 20:12:45 -0000 1.4
+++ java/gj/Makefile 29 Sep 2007 00:58:48 -0000
@@ -27,7 +27,7 @@
JAVA_VERSION= 1.1
.else
GJDIST= 1.2
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
.endif
JDKSUBDIR= jdk${GJDIST}
Index: java/jakarta-bcel/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-bcel/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- java/jakarta-bcel/Makefile 19 May 2007 20:12:47 -0000 1.6
+++ java/jakarta-bcel/Makefile 29 Sep 2007 00:58:48 -0000
@@ -17,7 +17,7 @@
NO_BUILD= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
PLIST_FILES= %%JAVAJARDIR%%/bcel.jar
Index: java/jakarta-commons-beanutils/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-commons-beanutils/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- java/jakarta-commons-beanutils/Makefile 19 May 2007 20:12:48 -0000 1.11
+++ java/jakarta-commons-beanutils/Makefile 29 Sep 2007 00:58:48 -0000
@@ -24,7 +24,7 @@
${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= dist
Index: java/jakarta-commons-cli/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-commons-cli/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- java/jakarta-commons-cli/Makefile 19 May 2007 20:12:48 -0000 1.12
+++ java/jakarta-commons-cli/Makefile 29 Sep 2007 00:58:48 -0000
@@ -21,7 +21,7 @@
BUILD_DEPENDS= ${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: java/jakarta-commons-codec/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-commons-codec/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- java/jakarta-commons-codec/Makefile 19 May 2007 20:12:48 -0000 1.3
+++ java/jakarta-commons-codec/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
COMMENT= An implementations of common encoders and decoders
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: java/jakarta-commons-collections/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-commons-collections/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- java/jakarta-commons-collections/Makefile 19 May 2007 20:12:49 -0000 1.11
+++ java/jakarta-commons-collections/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
COMMENT= Classes that extend/augment the Java Collections Framework
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= jar
Index: java/jakarta-commons-lang/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-commons-lang/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- java/jakarta-commons-lang/Makefile 19 May 2007 20:12:51 -0000 1.14
+++ java/jakarta-commons-lang/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
COMMENT= Jakarta library with helper utilities for the java.lang API
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
USE_JIKES= no
Index: java/jakarta-commons-logging/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-commons-logging/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- java/jakarta-commons-logging/Makefile 19 May 2007 20:12:52 -0000 1.12
+++ java/jakarta-commons-logging/Makefile 29 Sep 2007 00:58:49 -0000
@@ -17,7 +17,7 @@
COMMENT= Generic logging wrapper library
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
.include <bsd.port.pre.mk>
Index: java/jakarta-oro/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-oro/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- java/jakarta-oro/Makefile 19 May 2007 20:12:53 -0000 1.13
+++ java/jakarta-oro/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
PLIST= ${WRKDIR}/PLIST
Index: java/jakarta-regexp/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jakarta-regexp/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- java/jakarta-regexp/Makefile 19 May 2007 20:12:53 -0000 1.16
+++ java/jakarta-regexp/Makefile 29 Sep 2007 00:58:49 -0000
@@ -17,7 +17,7 @@
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
PLIST= ${WRKDIR}/PLIST
Index: java/jasmin/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jasmin/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- java/jasmin/Makefile 19 May 2007 20:12:54 -0000 1.7
+++ java/jasmin/Makefile 29 Sep 2007 00:58:49 -0000
@@ -20,7 +20,7 @@
USE_ANT= yes
ALL_TARGET= jasmin
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html)
Index: java/jboss2/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jboss2/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- java/jboss2/Makefile 19 May 2007 20:12:57 -0000 1.23
+++ java/jboss2/Makefile 29 Sep 2007 00:58:49 -0000
@@ -17,7 +17,7 @@
COMMENT= JBoss 2.x, an open-source J2EE application server
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ZIP= YES
NO_BUILD= YES
Index: java/jcommon/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jcommon/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- java/jcommon/Makefile 29 Jun 2007 16:29:13 -0000 1.11
+++ java/jcommon/Makefile 29 Sep 2007 00:58:49 -0000
@@ -17,7 +17,7 @@
COMMENT= A collection of useful classes used by JFreeChart and JFreeReport
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
.if !defined(WITHOUT_COMPILE)
USE_ANT= yes
Index: java/jdbcpool/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdbcpool/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- java/jdbcpool/Makefile 19 May 2007 20:13:01 -0000 1.7
+++ java/jdbcpool/Makefile 29 Sep 2007 00:58:49 -0000
@@ -15,7 +15,7 @@
COMMENT= JDBC connection pool
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
PORTDOCS= CHANGES LICENSE README
Index: java/jdom/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdom/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- java/jdom/Makefile 19 May 2007 20:13:03 -0000 1.16
+++ java/jdom/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
RUN_DEPENDS= ${JAVALIBDIR}/jaxen-jdom.jar:${PORTSDIR}/java/jaxen
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= package
Index: java/jfreechart/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jfreechart/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- java/jfreechart/Makefile 29 Jun 2007 16:29:13 -0000 1.13
+++ java/jfreechart/Makefile 29 Sep 2007 00:58:49 -0000
@@ -19,7 +19,7 @@
RUN_DEPENDS= ${JAVALIBDIR}/jcommon.jar:${PORTSDIR}/java/jcommon
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
.if !defined(WITHOUT_COMPILE)
USE_ANT= yes
Index: java/jmf/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jmf/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- java/jmf/Makefile 19 May 2007 20:13:05 -0000 1.5
+++ java/jmf/Makefile 29 Sep 2007 00:58:49 -0000
@@ -17,7 +17,7 @@
COMMENT= Java Media Framework
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ZIP= YES
NO_BUILD= YES
Index: java/jmp/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jmp/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- java/jmp/Makefile 19 May 2007 20:13:05 -0000 1.40
+++ java/jmp/Makefile 29 Sep 2007 00:58:49 -0000
@@ -25,7 +25,7 @@
USE_GETTEXT= yes
USE_GMAKE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
JAVA_BUILD= jdk
NEED_JAVAC= yes
Index: java/jode/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jode/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- java/jode/Makefile 19 May 2007 20:13:05 -0000 1.6
+++ java/jode/Makefile 29 Sep 2007 00:58:49 -0000
@@ -20,7 +20,7 @@
VENDOR_VERSION= 1.1.2-pre1
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NEED_JAVAC= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
Index: java/jomp/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jomp/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- java/jomp/Makefile 21 May 2007 17:17:49 -0000 1.3
+++ java/jomp/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
COMMENT= Prototype OpenMP implementation for Java
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
NO_WRKSUBDIR= yes
Index: java/jump/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jump/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- java/jump/Makefile 19 May 2007 20:13:07 -0000 1.19
+++ java/jump/Makefile 29 Sep 2007 00:58:49 -0000
@@ -16,7 +16,7 @@
COMMENT= Java library for arbitrary precision computations
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
.if defined(NOPORTDOCS)
Index: java/xdoclet/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/xdoclet/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- java/xdoclet/Makefile 19 May 2007 20:13:16 -0000 1.9
+++ java/xdoclet/Makefile 29 Sep 2007 00:58:49 -0000
@@ -21,7 +21,7 @@
RUN_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: lang/kawa/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/kawa/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- lang/kawa/Makefile 19 May 2007 20:13:42 -0000 1.23
+++ lang/kawa/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-kawa-frontend --program-prefix=''
Index: lang/starlogo/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/starlogo/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- lang/starlogo/Makefile 19 May 2007 20:13:56 -0000 1.12
+++ lang/starlogo/Makefile 29 Sep 2007 00:58:49 -0000
@@ -16,7 +16,7 @@
COMMENT= Specialized version of the Logo programming language written in Java
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ZIP= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Index: math/jakarta-commons-math/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/jakarta-commons-math/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- math/jakarta-commons-math/Makefile 19 May 2007 20:15:04 -0000 1.3
+++ math/jakarta-commons-math/Makefile 29 Sep 2007 00:58:49 -0000
@@ -23,7 +23,7 @@
${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= jar
Index: net/apache-soap/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/apache-soap/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- net/apache-soap/Makefile 19 May 2007 20:18:12 -0000 1.4
+++ net/apache-soap/Makefile 29 Sep 2007 00:58:49 -0000
@@ -19,7 +19,7 @@
RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
WRKSRC= ${WRKDIR}/soap-2_3_1
NO_BUILD= yes
Index: net/spread-j/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/spread-j/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- net/spread-j/Makefile 19 May 2007 20:19:03 -0000 1.8
+++ net/spread-j/Makefile 29 Sep 2007 00:58:49 -0000
@@ -19,7 +19,7 @@
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant
USE_JAVA= YES
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
PKGMESSAGE= ${WRKSRC}/../license.txt
ANT?= ${LOCALBASE}/bin/ant
Index: net-mgmt/airport/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/airport/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- net-mgmt/airport/Makefile 19 May 2007 20:19:44 -0000 1.23
+++ net-mgmt/airport/Makefile 29 Sep 2007 00:58:49 -0000
@@ -25,7 +25,7 @@
USE_ZIP= YES
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_WRKSUBDIR= YES
NO_BUILD= yes
Index: security/iaikpkcs11wrapper/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/iaikpkcs11wrapper/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- security/iaikpkcs11wrapper/Makefile 18 Sep 2007 12:36:58 -0000 1.3
+++ security/iaikpkcs11wrapper/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
USE_ZIP= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GMAKE= yes
ALL_TARGET= release
Index: textproc/ant-xinclude-task/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/ant-xinclude-task/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- textproc/ant-xinclude-task/Makefile 19 May 2007 20:23:47 -0000 1.13
+++ textproc/ant-xinclude-task/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
BUILD_DEPENDS= ${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder
USE_JAVA= yes
-JAVA_VERSION= 1.1+
+JAVA_VERSION= 1.3+
USE_ANT= yes
ALL_TARGET= jar
Index: textproc/denature/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/denature/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- textproc/denature/Makefile 19 May 2007 20:23:49 -0000 1.4
+++ textproc/denature/Makefile 29 Sep 2007 00:58:49 -0000
@@ -24,7 +24,7 @@
USE_PERL5= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
POD2MAN?= pod2man
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: textproc/dom4j/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/dom4j/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- textproc/dom4j/Makefile 19 May 2007 20:23:51 -0000 1.3
+++ textproc/dom4j/Makefile 29 Sep 2007 00:58:49 -0000
@@ -16,7 +16,7 @@
COMMENT= Open Source XML framework for Java
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
Index: textproc/fop/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/fop/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- textproc/fop/Makefile 19 May 2007 20:23:53 -0000 1.16
+++ textproc/fop/Makefile 29 Sep 2007 00:58:49 -0000
@@ -25,7 +25,7 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
post-extract:
Index: textproc/galax/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/galax/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- textproc/galax/Makefile 19 May 2007 20:23:54 -0000 1.12
+++ textproc/galax/Makefile 29 Sep 2007 00:58:49 -0000
@@ -19,7 +19,7 @@
WRKSRC= ${WRKDIR}/galax
USE_JAVA= yes
-JAVA_VERSION= 1.2 1.3 1.4
+JAVA_VERSION= 1.3 1.4
USE_GMAKE= yes
ALL_TARGET= world
MAKE_ARGS= JAVAHOME=${JAVA_HOME} JAVAINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" \
Index: textproc/jakarta-commons-digester/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/jakarta-commons-digester/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- textproc/jakarta-commons-digester/Makefile 19 May 2007 20:24:00 -0000 1.4
+++ textproc/jakarta-commons-digester/Makefile 29 Sep 2007 00:58:49 -0000
@@ -21,7 +21,7 @@
RUN_DEPENDS= ${JAR_DEPENDS}
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
MAKE_ARGS= -Dcommons-beanutils.api=${COMMONS_BEANUTILS_API} \
Index: textproc/saxon/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/saxon/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- textproc/saxon/Makefile 19 May 2007 20:24:10 -0000 1.12
+++ textproc/saxon/Makefile 29 Sep 2007 00:58:49 -0000
@@ -20,7 +20,7 @@
USE_ZIP= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: textproc/smartdoc/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/smartdoc/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- textproc/smartdoc/Makefile 19 May 2007 20:24:12 -0000 1.13
+++ textproc/smartdoc/Makefile 29 Sep 2007 00:58:49 -0000
@@ -24,7 +24,7 @@
NO_BUILD= yes
USE_ZIP= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_EXTRACT= jre
JAVA_RUN= jre
EXTRACT_CMD= ${JAVA}
Index: textproc/xalan-j/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xalan-j/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- textproc/xalan-j/Makefile 19 May 2007 20:24:17 -0000 1.22
+++ textproc/xalan-j/Makefile 29 Sep 2007 00:58:49 -0000
@@ -19,7 +19,7 @@
RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
USE_ANT= yes
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
Index: textproc/xincluder/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xincluder/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- textproc/xincluder/Makefile 19 May 2007 20:24:17 -0000 1.10
+++ textproc/xincluder/Makefile 29 Sep 2007 00:58:49 -0000
@@ -20,7 +20,7 @@
java:${PORTSDIR}/java/javavmwrapper
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
Index: textproc/xom/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xom/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- textproc/xom/Makefile 19 May 2007 20:24:19 -0000 1.6
+++ textproc/xom/Makefile 29 Sep 2007 00:58:49 -0000
@@ -19,7 +19,7 @@
${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/XOM
Index: textproc/xp/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xp/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- textproc/xp/Makefile 19 May 2007 20:24:20 -0000 1.8
+++ textproc/xp/Makefile 29 Sep 2007 00:58:49 -0000
@@ -16,7 +16,7 @@
COMMENT= An XML parser written in Java
USE_JAVA= yes
-JAVA_VERSION= 1.1+
+JAVA_VERSION= 1.3+
NO_WORKSUBDIR= yes
NO_BUILD= yes
Index: textproc/xt/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xt/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- textproc/xt/Makefile 19 May 2007 20:24:20 -0000 1.23
+++ textproc/xt/Makefile 29 Sep 2007 00:58:49 -0000
@@ -21,7 +21,7 @@
${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper
USE_JAVA= YES
-JAVA_VERSION= 1.1+
+JAVA_VERSION= 1.3+
NO_BUILD= YES
.if !defined(NOPORTDOCS)
Index: www/jakarta-tomcat4/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/jakarta-tomcat4/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- www/jakarta-tomcat4/Makefile 19 May 2007 20:25:04 -0000 1.60
+++ www/jakarta-tomcat4/Makefile 29 Sep 2007 00:58:49 -0000
@@ -18,7 +18,7 @@
DEPRECATED= www/jakarta-tomcat5 is recommended instead for new installations
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= YES
LATEST_LINK= ${APP_SHORTNAME}
Index: www/resin2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/resin2/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- www/resin2/Makefile 19 May 2007 20:25:25 -0000 1.16
+++ www/resin2/Makefile 29 Sep 2007 00:58:49 -0000
@@ -15,7 +15,7 @@
COMMENT= Resin, a Java-based Application Server, 2.x branch
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
HAS_CONFIGURE= yes
USE_PYTHON= yes
USE_OPENSSL= yes
Index: www/resin3/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/resin3/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- www/resin3/Makefile 5 Sep 2007 14:50:54 -0000 1.33
+++ www/resin3/Makefile 29 Sep 2007 00:58:49 -0000
@@ -14,7 +14,7 @@
COMMENT= Resin, a Java-based Application Server, 3.x branch
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
HAS_CONFIGURE= yes
USE_PYTHON= yes
USE_OPENSSL= yes
Index: www/tomcat41/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/tomcat41/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- www/tomcat41/Makefile 25 Jul 2007 02:48:10 -0000 1.70
+++ www/tomcat41/Makefile 29 Sep 2007 00:58:49 -0000
@@ -16,7 +16,7 @@
COMMENT= Open-source Java web server by Apache, stable 4.1.x branch
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
NO_BUILD= YES
LATEST_LINK= ${APP_SHORTNAME}
Index: x11/libgnome-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/libgnome-java/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- x11/libgnome-java/Makefile 8 Jul 2007 21:32:44 -0000 1.18
+++ x11/libgnome-java/Makefile 29 Sep 2007 00:58:49 -0000
@@ -25,7 +25,7 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GCC= 3.4+
USE_GNOME= gnomehack libgnomeui
Index: x11-toolkits/libgtk-java/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/libgtk-java/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- x11-toolkits/libgtk-java/Makefile 28 Jun 2007 15:26:46 -0000 1.24
+++ x11-toolkits/libgtk-java/Makefile 29 Sep 2007 00:58:49 -0000
@@ -23,7 +23,7 @@
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_JAVA= yes
-JAVA_VERSION= 1.2+
+JAVA_VERSION= 1.3+
JAVA_OS= native
USE_GCC= 3.4+
USE_GNOME= gnomehack gtk20
Index: Mk/bsd.java.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.java.mk,v
retrieving revision 1.80
diff -u -r1.80 bsd.java.mk
--- Mk/bsd.java.mk 5 Aug 2007 21:19:47 -0000 1.80
+++ Mk/bsd.java.mk 29 Sep 2007 00:58:49 -0000
@@ -25,7 +25,7 @@
#
# 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.1[+] 1.2[+] 1.3[+] 1.4[+])
+# versions. (allowed values: 1.3[+] 1.4[+] 1.5[+] 1.6[+])
#
# JAVA_OS List of space-separated suitable JDK port operating systems
# for the port. (allowed values: native linux)
@@ -70,13 +70,13 @@
# '/usr/local/jdk1.3.1')
#
# JAVAC Path to the Java compiler to use. (e.g.
-# '/usr/local/jdk1.1.8/bin/javac' or '/usr/local/bin/jikes')
+# '/usr/local/jdk1.5.0/bin/javac' or '/usr/local/bin/jikes')
#
# JAR Path to the JAR tool to use. (e.g.
-# '/usr/local/jdk1.2.2/bin/jar' or '/usr/local/bin/fastjar')
+# '/usr/local/jdk1.5.0/bin/jar' or '/usr/local/bin/fastjar')
#
# APPLETVIEWER Path to the appletviewer utility. (e.g.
-# '/usr/local/linux-jdk1.2.2/bin/appletviewer')
+# '/usr/local/linux-jdk1.3.1/bin/appletviewer')
#
# JAVA Path to the java executable. Use this for executing Java
# programs. (e.g. '/usr/local/jdk1.3.1/bin/java')
@@ -87,13 +87,11 @@
#
# JAVAP Path to the javap program.
#
-# JAVA_KEYTOOL Path to the keytool utility program. This settings is
-# availble only if the JDK is Java 1.2 or higher.
+# JAVA_KEYTOOL Path to the keytool utility program.
#
# JAVA_N2A Path to the native2ascii tool.
#
-# JAVA_POLICYTOOL Path to the policytool program. This variable is available
-# only if the JDK is Java 1.2 or higher.
+# JAVA_POLICYTOOL Path to the policytool program.
#
# JAVA_SERIALVER Path to the serialver utility program.
#
@@ -101,12 +99,10 @@
#
# RMIREGISTRY Path to the RMI registry program, rmiregistry.
#
-# RMID Path to the RMI daemon program. This settings is only
-# available if the JDK is Java 1.2 or higher.
+# RMID Path to the RMI daemon program.
#
# JAVA_CLASSES Path to the archive that contains the JDK class files. On
-# JDK 1.2 or later, this is ${JAVA_HOME}/jre/lib/rt.jar.
-# Earlier JDK's use ${JAVA_HOME}/lib/classes.zip.
+# most JDKs, this is ${JAVA_HOME}/jre/lib/rt.jar.
#
# JAVASHAREDIR The base directory for all shared Java resources.
#
@@ -166,7 +162,7 @@
. endif
# The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST= 1.1 1.2 1.3 1.4 1.5 1.6
+__JAVA_VERSION_LIST= 1.3 1.4 1.5 1.6
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
_JAVA_OS_LIST= native linux
_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown
@@ -175,10 +171,6 @@
# port location, corresponding JAVA_HOME, JDK version, OS, vendor
_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_1_INFO= PORT=java/jdk11 HOME=${LOCALBASE}/jdk1.1.8 \
- VERSION=1.1.8 OS=native VENDOR=bsdjava
-_JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2_INFO= PORT=java/jdk12 HOME=${LOCALBASE}/jdk1.2.2 \
- VERSION=1.2.2 OS=native VENDOR=bsdjava
_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_4_INFO= PORT=java/jdk14 HOME=${LOCALBASE}/jdk1.4.2 \
@@ -187,12 +179,8 @@
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_2_INFO= PORT=java/linux-blackdown-jdk12 HOME=${LOCALBASE}/linux-blackdown-jdk1.2.2 \
- VERSION=1.2.2 OS=linux VENDOR=blackdown
_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_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \
- VERSION=1.2.2 OS=linux VENDOR=sun
_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 \
@@ -226,15 +214,11 @@
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
JAVA_PORT_NATIVE_BSDJAVA_JDK_1_3 \
- JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
- JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
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_SUN_JDK_1_2 \
- JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \
- JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2
+ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4
_JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \
${_JAVA_PREFERRED_PORTS} \
${__JAVA_PORTS_ALL}
@@ -308,7 +292,7 @@
. undef _JAVA_PORTS_INSTALLED
. undef _JAVA_PORTS_POSSIBLE
. if defined(JAVA_VERSION)
-_JAVA_VERSION= ${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4 1.5 1.6/:S/1.2+/1.2 1.3 1.4 1.5 1.6/:S/1.3+/1.3 1.4 1.5 1.6/:S/1.4+/1.4 1.5 1.6/:S/1.5+/1.5 1.6/:S/1.6+/1.6/}
+_JAVA_VERSION= ${JAVA_VERSION: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/}
. else
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
. endif
@@ -490,20 +474,12 @@
JAVA_SERIALVER?=${JAVA_HOME}/bin/serialver
RMIC?= ${JAVA_HOME}/bin/rmic
RMIREGISTRY?= ${JAVA_HOME}/bin/rmiregistry
-
-# Some executables only exists in JDK 1.2 and up
-. if ${_JAVA_PORT} != "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
JAVA_KEYTOOL?= ${JAVA_HOME}/bin/keytool
JAVA_POLICYTOOL?= ${JAVA_HOME}/bin/policytool
RMID?= ${JAVA_HOME}/bin/rmid
-. endif
# Set the location of the ZIP or JAR file with all standard Java classes.
-. if ${_JAVA_PORT} == "JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1"
-JAVA_CLASSES= ${JAVA_HOME}/lib/classes.zip
-. else
JAVA_CLASSES= ${JAVA_HOME}/jre/lib/rt.jar
-. endif
#-------------------------------------------------------------------------------
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list