Now that we can boostrap 1.6 with jamvm it is time to remove EOL/unmaintained by upstream java ports; devel/jdk/1.5 and lang/kaffe.
All 1.3+ 1.4+ and 1.5+ ports require a bump due to change in RUN_DEPENDS. A close look at java.port.mk would be appreciated. Thanks. Index: databases/db/v4/Makefile =================================================================== RCS file: /cvs/ports/databases/db/v4/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- databases/db/v4/Makefile 16 Sep 2011 08:48:02 -0000 1.53 +++ databases/db/v4/Makefile 7 Oct 2011 02:32:32 -0000 @@ -14,7 +14,7 @@ PKGNAME-tcl= db-tcl-${VERSION} EPOCH-main= 0 EPOCH-java= 0 EPOCH-tcl= 0 -REVISION-java = 0 +REVISION-java = 1 REVISION-tcl = 0 DBLIBDIR= lib/db4 SHARED_LIBS += db 5.0 # .0.0 Index: databases/jxplorer/Makefile =================================================================== RCS file: /cvs/ports/databases/jxplorer/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- databases/jxplorer/Makefile 16 Sep 2011 08:48:02 -0000 1.10 +++ databases/jxplorer/Makefile 7 Oct 2011 02:32:32 -0000 @@ -5,7 +5,7 @@ COMMENT= standards compliant LDAP browse V= 3.2 DISTNAME= JXv${V}deploy PKGNAME= jxplorer-${V} -REVISION= 6 +REVISION= 7 EXTRACT_SUFX= .zip CATEGORIES= databases net Index: databases/postgresql-jdbc/Makefile =================================================================== RCS file: /cvs/ports/databases/postgresql-jdbc/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- databases/postgresql-jdbc/Makefile 16 Sep 2011 08:48:03 -0000 1.15 +++ databases/postgresql-jdbc/Makefile 7 Oct 2011 02:32:32 -0000 @@ -9,7 +9,7 @@ PKGNAME-main= postgresql-jdbc-${V:S/-/. PKGNAME-docs= postgresql-jdbc-docs-${V:S/-/./} PKG_ARCH-docs= * CATEGORIES= databases -REVISION-main = 0 +REVISION-main = 1 MULTI_PACKAGES= -main -docs Index: devel/apache-ant/Makefile =================================================================== RCS file: /cvs/ports/devel/apache-ant/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- devel/apache-ant/Makefile 16 Sep 2011 09:24:48 -0000 1.26 +++ devel/apache-ant/Makefile 7 Oct 2011 02:32:33 -0000 @@ -3,7 +3,7 @@ COMMENT= build tool for java applications DISTNAME= apache-ant-1.8.2 -REVISION= 1 +REVISION= 2 CATEGORIES= devel HOMEPAGE= http://ant.apache.org/ Index: devel/eclipse/sdk/Makefile =================================================================== RCS file: /cvs/ports/devel/eclipse/sdk/Makefile,v retrieving revision 1.66 diff -u -p -r1.66 Makefile --- devel/eclipse/sdk/Makefile 16 Sep 2011 09:24:49 -0000 1.66 +++ devel/eclipse/sdk/Makefile 7 Oct 2011 02:32:34 -0000 @@ -12,7 +12,7 @@ ECLIPSE_VER= 3.2.2 DISTNAME= eclipse-sourceBuild-srcIncluded-${ECLIPSE_VER} PKGNAME= eclipse-sdk-${ECLIPSE_VER} PKGNAME-main= eclipse-sdk-${ECLIPSE_VER} -REVISION-main= 18 +REVISION-main= 19 PKGNAME-swt= swt-${ECLIPSE_VER} REVISION-swt= 4 PKGNAME-gnome= swt-gnome-${ECLIPSE_VER} Index: devel/ivy/Makefile =================================================================== RCS file: /cvs/ports/devel/ivy/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- devel/ivy/Makefile 16 Sep 2011 09:24:51 -0000 1.18 +++ devel/ivy/Makefile 7 Oct 2011 02:32:35 -0000 @@ -5,7 +5,7 @@ COMMENT= dependency manager for Java VERSION= 1.4.1 DISTNAME= ivy-${VERSION}-bin PKGNAME= ivy-${VERSION} -REVISION = 10 +REVISION = 11 CATEGORIES= devel WRKDIST= ${WRKDIR}/ivy-${VERSION} Index: devel/jakarta-servletapi/Makefile =================================================================== RCS file: /cvs/ports/devel/jakarta-servletapi/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- devel/jakarta-servletapi/Makefile 16 Sep 2011 09:24:51 -0000 1.22 +++ devel/jakarta-servletapi/Makefile 7 Oct 2011 02:32:35 -0000 @@ -4,7 +4,7 @@ COMMENT= implementation of the JSP and J V= 3.2.4 DISTNAME= jakarta-servletapi-${V} -REVISION= 12 +REVISION= 13 CATEGORIES= www devel MASTER_SITES= http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/ EXTRACT_SUFX= .zip Index: devel/jdk/Makefile =================================================================== RCS file: /cvs/ports/devel/jdk/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- devel/jdk/Makefile 1 Feb 2010 17:00:13 -0000 1.23 +++ devel/jdk/Makefile 7 Oct 2011 02:32:35 -0000 @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.23 2010/02/01 17:00:13 espie Exp $ SUBDIR = -SUBDIR += 1.5 SUBDIR += 1.6 SUBDIR += 1.7 Index: devel/jdk/java.port.mk =================================================================== RCS file: /cvs/ports/devel/jdk/java.port.mk,v retrieving revision 1.28 diff -u -p -r1.28 java.port.mk --- devel/jdk/java.port.mk 30 Sep 2011 09:10:18 -0000 1.28 +++ devel/jdk/java.port.mk 7 Oct 2011 02:32:35 -0000 @@ -25,42 +25,26 @@ MODJAVA_JRERUN?=no # # NOTE: All source built java ports must properly set # javac -source and -target build arguments. Depending -# on the architecture a 1.3 or 1.4 level port may be built -# by a 1.5 jdk. The JAVA_HOME variable points to the +# on the architecture a 1.3, 1.4 or 1.5 level port may be +# built by a 1.6 jdk. The JAVA_HOME variable points to the # build jdk not the default RUN_DEPEND jdk, so it # should not be used to set a default jdk to run with. # The javaPathHelper port should be used to set the # default JAVA_HOME or JAVACMD vars for a package. # -.if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" +.if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4" || ${MODJAVA_VER} == "1.5" BROKEN=MODJAVA_VER=${MODJAVA_VER} only ports are not supported -.elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" +.elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+" || ${MODJAVA_VER} == "1.5+" ONLY_FOR_ARCHS?= i386 amd64 . if ${NO_BUILD:L} != "yes" - JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 - BUILD_DEPENDS+= jdk->=1.5.0,<1.6:devel/jdk/1.5 + JAVA_HOME= ${LOCALBASE}/jdk-1.6.0 + BUILD_DEPENDS+= jdk->=1.6.0,<1.7:devel/jdk/1.6 . endif . if ${MODJAVA_JRERUN:L} == "yes" - MODJAVA_RUN_DEPENDS= jdk->=1.5.0|jre->=1.5.0|kaffe-*|jamvm-*:devel/jdk/1.5 + MODJAVA_RUN_DEPENDS= jdk->=1.6.0|jre->=1.6.0|jamvm-*:devel/jdk/1.6 . else - MODJAVA_RUN_DEPENDS= jdk->=1.5.0|kaffe-*:devel/jdk/1.5 -. endif -.elif ${MODJAVA_VER:S/+//} == "1.5" - ONLY_FOR_ARCHS?= i386 amd64 -. if ${NO_BUILD:L} != "yes" - JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 - BUILD_DEPENDS+= jdk->=1.5.0,<1.6:devel/jdk/1.5 -. endif -. if ${MODJAVA_JRERUN:L} == "yes" - _MODJAVA_RUNDEP= jdk->=1.5.0,<1.6|jre->=1.5.0,<1.6 -. else - _MODJAVA_RUNDEP= jdk->=1.5.0,<1.6 -. endif -. if ${MODJAVA_VER} == "1.5+" - MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP:S/,<1.6//g}:devel/jdk/1.5 -. else - MODJAVA_RUN_DEPENDS= ${_MODJAVA_RUNDEP}:devel/jdk/1.5 + MODJAVA_RUN_DEPENDS= jdk->=1.6.0:devel/jdk/1.6 . endif .elif ${MODJAVA_VER:S/+//} == "1.6" ONLY_FOR_ARCHS?= i386 amd64 Index: devel/maven/Makefile =================================================================== RCS file: /cvs/ports/devel/maven/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- devel/maven/Makefile 16 Sep 2011 09:24:52 -0000 1.14 +++ devel/maven/Makefile 7 Oct 2011 02:32:35 -0000 @@ -4,7 +4,7 @@ COMMENT= software project management and DISTNAME= apache-maven-2.2.1 PKGNAME= ${DISTNAME:S/apache-//} -REVISION= 1 +REVISION= 2 CATEGORIES= devel HOMEPAGE= http://maven.apache.org/ Index: editors/libreoffice/Makefile =================================================================== RCS file: /cvs/ports/editors/libreoffice/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- editors/libreoffice/Makefile 20 Sep 2011 08:32:16 -0000 1.46 +++ editors/libreoffice/Makefile 7 Oct 2011 02:32:41 -0000 @@ -14,6 +14,7 @@ PKGNAME= libreoffice-${VERSION} PKGNAME-main= libreoffice-${VERSION} PKGNAME-kde= libreoffice-kde-${VERSION} PKGNAME-java= libreoffice-java-${VERSION} +REVISION-java= 1 CATEGORIES= editors productivity EPOCH= 0 Index: editors/openoffice3/Makefile =================================================================== RCS file: /cvs/ports/editors/openoffice3/Makefile,v retrieving revision 1.76 diff -u -p -r1.76 Makefile --- editors/openoffice3/Makefile 30 Aug 2011 17:16:36 -0000 1.76 +++ editors/openoffice3/Makefile 7 Oct 2011 02:32:41 -0000 @@ -18,7 +18,7 @@ PKGNAME-kde= openoffice-kde-${VERSION} PKGNAME-java= openoffice-java-${VERSION} REVISION-main= 0 REVISION-kde= 0 -REVISION-java= 0 +REVISION-java= 1 CATEGORIES= editors productivity REVISION-main= 0 Index: geo/jeoip/Makefile =================================================================== RCS file: /cvs/ports/geo/jeoip/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- geo/jeoip/Makefile 16 Sep 2011 09:48:10 -0000 1.18 +++ geo/jeoip/Makefile 7 Oct 2011 02:32:43 -0000 @@ -2,7 +2,7 @@ COMMENT= Java interface to GeoIP database DISTNAME= jeoip-0.5 -REVISION= 9 +REVISION= 10 CATEGORIES= geo net PKG_ARCH= * Index: lang/Makefile =================================================================== RCS file: /cvs/ports/lang/Makefile,v retrieving revision 1.125 diff -u -p -r1.125 Makefile --- lang/Makefile 6 Oct 2011 12:43:53 -0000 1.125 +++ lang/Makefile 7 Oct 2011 02:32:45 -0000 @@ -43,7 +43,6 @@ SUBDIR += jikes SUBDIR += jimtcl SUBDIR += jruby - SUBDIR += kaffe SUBDIR += librep SUBDIR += llvm-gcc4 SUBDIR += lua Index: textproc/xerces/Makefile =================================================================== RCS file: /cvs/ports/textproc/xerces/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- textproc/xerces/Makefile 16 Sep 2011 11:41:42 -0000 1.35 +++ textproc/xerces/Makefile 7 Oct 2011 02:33:00 -0000 @@ -5,7 +5,7 @@ COMMENT= xml parser for Java V= 2.9.1 DISTNAME= Xerces-J-bin.${V} PKGNAME= xerces-${V} -REVISION = 7 +REVISION = 8 CATEGORIES= textproc HOMEPAGE= http://xml.apache.org/xerces2-j/index.html Index: www/tomcat/v5/Makefile =================================================================== RCS file: /cvs/ports/www/tomcat/v5/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- www/tomcat/v5/Makefile 16 Sep 2011 12:00:09 -0000 1.20 +++ www/tomcat/v5/Makefile 7 Oct 2011 02:33:04 -0000 @@ -10,7 +10,7 @@ PKGNAME= tomcat-${V} PKGNAME-main= tomcat-${V} PKGNAME-admin= tomcat-admin-${V} PKGNAME-examples=tomcat-examples-${V} -REVISION-main= 2 +REVISION-main= 3 REVISION-examples=0 CATEGORIES= www Index: www/tomcat/v6/Makefile =================================================================== RCS file: /cvs/ports/www/tomcat/v6/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- www/tomcat/v6/Makefile 16 Sep 2011 12:00:09 -0000 1.15 +++ www/tomcat/v6/Makefile 7 Oct 2011 02:33:04 -0000 @@ -8,7 +8,7 @@ DISTNAME= apache-tomcat-${V} PKGNAME= tomcat-${V} PKGNAME-main= tomcat-${V} PKGNAME-examples=tomcat-examples-${V} -REVISION-main = 0 +REVISION-main = 1 CATEGORIES= www DISTFILES= ${DISTNAME}.tar.gz \