We've built up 5 versions of Sun's JDK's in devel/jdk now. 1.3 and 1.4 are ripe
to
depreciate now. Neither get security updates released by Sun and 1.3 is past its
end of life period. The only down side I see is that 1.3 runs on arm, macppc and
sparc.
Here's a diff to depreciate 1.3 and 1.4 which has been through a bulk build and
package install testing. All 1.3 and 1.4 MODJAVA_VER ports will need a bump due
to the RUNDEPENDS changing. Comments, okays?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 20 Mar 2008 01:54:56 -0000 1.21
+++ Makefile 12 Jun 2008 01:35:09 -0000
@@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.21 2008/03/20 01:54:56 kurt Exp $
-SUBDIR+= 1.3
-SUBDIR+= 1.4
SUBDIR+= 1.5
SUBDIR+= 1.6
SUBDIR+= 1.7
Index: java.port.mk
===================================================================
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.15
diff -u -r1.15 java.port.mk
--- java.port.mk 5 May 2008 02:53:15 -0000 1.15
+++ java.port.mk 12 Jun 2008 01:35:09 -0000
@@ -33,68 +33,18 @@
# default JAVA_HOME or JAVACMD vars for a package.
#
-.if ${MACHINE_ARCH} == "amd64" && (${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER}
== "1.4+")
-# this is a special case for amd64. since amd64 doesn't have 1.3 or 1.4,
-# but 1.5 can run any 1.3+ or 1.4+ port, so special case them to run
-# on 1.5+ for amd64. Also add in jamvm and kaffe since they likely can
-# run these too.
- ONLY_FOR_ARCHS?= amd64
+.if ${MODJAVA_VER} == "1.3" || ${MODJAVA_VER} == "1.4"
+ BROKEN=MODJAVA_VER=${MODJAVA_VER} only ports are not supported
+.elif ${MODJAVA_VER} == "1.3+" || ${MODJAVA_VER} == "1.4+"
+ ONLY_FOR_ARCHS?= i386 amd64
. if ${NO_BUILD:L} != "yes"
JAVA_HOME= ${LOCALBASE}/jdk-1.5.0
BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5
. 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.5.0.*|jre->=1.5.0.*|kaffe-*|jamvm-*:devel/jdk/1.5
. else
- MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|kaffe-*:devel/jdk/1.5
-. endif
-.elif ${MODJAVA_VER:S/+//} == "1.3"
- ONLY_FOR_ARCHS?= arm i386 powerpc sparc
-. if ${NO_BUILD:L} != "yes"
-. if ${MACHINE_ARCH} == "i386"
- JAVA_HOME= ${LOCALBASE}/jdk-1.5.0
- BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5
-. else
- JAVA_HOME= ${LOCALBASE}/jdk-1.3.1
- BUILD_DEPENDS+= :jdk-1.3.1:devel/jdk/1.3
-. endif
-. endif
-. if ${MODJAVA_JRERUN:L} == "yes"
-. if ${MODJAVA_VER} == "1.3+"
- _MODJAVA_RUNDEP=
jdk-1.3.1*|jre-1.3.1*|jdk->=1.4.2p9|jre->=1.4.2p9|kaffe-*|jamvm-*
-. else
- _MODJAVA_RUNDEP= jdk-1.3.1|jre-1.3.1
-. endif
-. else
-. if ${MODJAVA_VER} == "1.3+"
- _MODJAVA_RUNDEP= jdk-1.3.1*|jdk->=1.4.2p9|kaffe-*
-. else
- _MODJAVA_RUNDEP= jdk-1.3.1
-. endif
-. endif
-. if ${MACHINE_ARCH} == "i386" && ${MODJAVA_VER} == "1.3+"
- MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}:devel/jdk/1.5
-. else
- MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}:devel/jdk/1.3
-. endif
-.elif ${MODJAVA_VER:S/+//} == "1.4"
- ONLY_FOR_ARCHS?= i386
-. if ${NO_BUILD:L} != "yes"
- JAVA_HOME= ${LOCALBASE}/jdk-1.5.0
- BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5
-. endif
-. if ${MODJAVA_JRERUN:L} == "yes"
-. if ${MODJAVA_VER} == "1.4+"
- MODJAVA_RUN_DEPENDS=
:jdk->=1.4.2p9|jre->=1.4.2p9|kaffe-*|jamvm-*:devel/jdk/1.5
-. else
- MODJAVA_RUN_DEPENDS=
:jdk->=1.4.2p9,<1.5|jre->=1.4.2p9,<1.5|kaffe-*|jamvm-*:devel/jdk/1.4
-. endif
-. else
-. if ${MODJAVA_VER} == "1.4+"
- MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9|kaffe-*:devel/jdk/1.5
-. else
- MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9,<1.5|kaffe-*:devel/jdk/1.4
-. endif
+ MODJAVA_RUN_DEPENDS= :jdk->=1.5.0.*|kaffe-*:devel/jdk/1.5
. endif
.elif ${MODJAVA_VER:S/+//} == "1.5"
ONLY_FOR_ARCHS?= i386 amd64
