[Midnightbsd-cvs] mports: bsd.java.mk: We don't have java 1.1 at all.

[laffer1 at midnightbsd.org]

Log Message:
-----------
We don't have java 1.1 at all.

We don't have any of the BSD native ports.  We need to decide if we can do the 1.4 or 1.5 port.  (licensing) So we'll keep those for now.

we need to get rid of blackdown 1.3 for security reasons.

Modified Files:
--------------
    mports/Mk:
        bsd.java.mk (r1.8 -> r1.9)

-------------- next part --------------
Index: bsd.java.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.java.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -LMk/bsd.java.mk -LMk/bsd.java.mk -u -r1.8 -r1.9
--- Mk/bsd.java.mk
+++ Mk/bsd.java.mk
@@ -172,18 +172,10 @@
 # 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_4_INFO=		PORT=java/jdk14					HOME=${LOCALBASE}/jdk1.4.2 \
 											VERSION=1.4.2	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_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_3_INFO=	PORT=java/linux-blackdown-jdk13	HOME=${LOCALBASE}/linux-blackdown-jdk1.3.1 \
-											VERSION=1.3.1	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 \
@@ -218,8 +210,6 @@
 __JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \
-					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 \
@@ -528,19 +518,12 @@
 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
 
 
 #-------------------------------------------------------------------------------