. Add support for the new diablo-jdk13 port. This will be the default

  JDK 1.3 port for any 1.3 dependencies.

Approved by:	znerd

1 files changed, 33 insertions, 11 deletions

diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index 19e6b8959275..f80974ed1ab6 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -48,6 +48,7 @@ _JAVA_HOME_FREEBSD_1_1=			${LOCALBASE}/jdk1.1.8
 _JAVA_HOME_FREEBSD_1_2=			${LOCALBASE}/jdk1.2.2
 _JAVA_HOME_FREEBSD_1_3=			${LOCALBASE}/jdk1.3.1
 _JAVA_HOME_FREEBSD_1_4=			${LOCALBASE}/jdk1.4.1
+_JAVA_HOME_DIABLO_FREEBSD_1_3=		${LOCALBASE}/diablo-jdk1.3.1
 _JAVA_HOME_BLACKDOWN_LINUX_1_2=	${LOCALBASE}/linux-blackdown-jdk1.2.2
 _JAVA_HOME_BLACKDOWN_LINUX_1_3=	${LOCALBASE}/linux-blackdown-jdk1.3.1
 _JAVA_HOME_BLACKDOWN_LINUX_1_4=	${LOCALBASE}/linux-blackdown-jdk1.4.1
@@ -62,6 +63,7 @@ _JAVA_PORT_FREEBSD_1_1=			java/jdk11
 _JAVA_PORT_FREEBSD_1_2=			java/jdk12
 _JAVA_PORT_FREEBSD_1_3=			java/jdk13
 _JAVA_PORT_FREEBSD_1_4=			java/jdk14
+_JAVA_PORT_DIABLO_FREEBSD_1_3=		java/diablo-jdk13
 _JAVA_PORT_BLACKDOWN_LINUX_1_2=	java/linux-blackdown-jdk12
 _JAVA_PORT_BLACKDOWN_LINUX_1_3=	java/linux-blackdown-jdk13
 _JAVA_PORT_BLACKDOWN_LINUX_1_4=	java/linux-blackdown-jdk14
@@ -88,6 +90,7 @@ _DEPEND_JIKES=	${_JIKES_PATH}:${PORTSDIR}/java/jikes
 .		undef HAVE_JAVA_FREEBSD_1_2
 .		undef HAVE_JAVA_FREEBSD_1_3
 .		undef HAVE_JAVA_FREEBSD_1_4
+.		undef HAVE_JAVA_DIABLO_FREEBSD_1_3
 .		undef HAVE_JAVA_BLACKDOWN_LINUX_1_2
 .		undef HAVE_JAVA_BLACKDOWN_LINUX_1_3
 .		undef HAVE_JAVA_BLACKDOWN_LINUX_1_4
@@ -109,6 +112,9 @@ HAVE_JAVA_FREEBSD_1_3=	YES
 .		if exists(${_JAVA_HOME_FREEBSD_1_4}/${_JDK_FILE})
 HAVE_JAVA_FREEBSD_1_4=	YES
 .		endif
+.		if exists(${_JAVA_HOME_DIABLO_FREEBSD_1_3}/${_JDK_FILE})
+HAVE_JAVA_DIABLO_FREEBSD_1_3=	YES
+.		endif
 .		if exists(${_JAVA_HOME_BLACKDOWN_LINUX_1_2}/${_JDK_FILE})
 HAVE_JAVA_BLACKDOWN_LINUX_1_2=	YES
 .		endif
@@ -153,6 +159,8 @@ JAVA_PORT=	${_JAVA_PORT_FREEBSD_1_2}
 JAVA_PORT=	${_JAVA_PORT_FREEBSD_1_3}
 .			elif ${_JAVA_HOME} == ${_JAVA_HOME_FREEBSD_1_4}
 JAVA_PORT=	${_JAVA_PORT_FREEBSD_1_4}
+.			elif ${_JAVA_HOME} == ${_JAVA_HOME_DIABLO_FREEBSD_1_3}
+JAVA_PORT=	${_JAVA_PORT_DIABLO_FREEBSD_1_3}
 .			elif ${_JAVA_HOME} == ${_JAVA_HOME_BLACKDOWN_LINUX_1_2}
 JAVA_PORT=	${_JAVA_PORT_BLACKDOWN_LINUX_1_2}
 .			elif ${_JAVA_HOME} == ${_JAVA_HOME_BLACKDOWN_LINUX_1_3}
@@ -204,7 +212,8 @@ JAVA_HOME=	${_JAVA_HOME}
 .		if (${USE_JAVA} == "1.1+")
 .			if defined(HAVE_JAVA_FREEBSD_1_4)
 USE_JAVA=	1.4
-.			elif defined(HAVE_JAVA_FREEBSD_1_3) || \
+.			elif defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) || \
+			   defined(HAVE_JAVA_FREEBSD_1_3) || \
 			   defined(HAVE_JAVA_SUN_LINUX_1_3) || \
 			   defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \
 			   defined(HAVE_JAVA_IBM_LINUX_1_3)
@@ -224,7 +233,8 @@ USE_JAVA=	1.4
 .		elif (${USE_JAVA} == "1.2+")
 .			if defined(HAVE_JAVA_FREEBSD_1_4)
 USE_JAVA=	1.4
-.			elif defined(HAVE_JAVA_FREEBSD_1_3) || \
+.			elif defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) || \
+			   defined(HAVE_JAVA_FREEBSD_1_3) || \
 			   defined(HAVE_JAVA_SUN_LINUX_1_3) || \
 			   defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \
 			   defined(HAVE_JAVA_IBM_LINUX_1_3)
@@ -240,7 +250,8 @@ USE_JAVA=	1.4
 .		elif (${USE_JAVA} == "1.3+")
 .			if defined(HAVE_JAVA_FREEBSD_1_4)
 USE_JAVA=	1.4
-.			elif defined(HAVE_JAVA_FREEBSD_1_3) || \
+.			elif defined(HAVE_JAVA_DIABLO_FREEBSD_1_3) || \
+			   defined(HAVE_JAVA_FREEBSD_1_3) || \
 			   defined(HAVE_JAVA_SUN_LINUX_1_3) || \
 			   defined(HAVE_JAVA_IBM_LINUX_1_3) || \
 			   defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \
@@ -311,10 +322,11 @@ JAVA_PORT=		${_JAVA_PORT_FREEBSD_1_2}
 # If the port needs Java 1.3, then there are 4 choices. They are, in order or
 # preference:
 #
-#    (1) JDK 1.3.1 for FreeBSD
-#    (2) Sun JDK 1.3.1 for Linux
-#    (3) IBM JDK 1.3.1 for Linux
-#    (4) Blackdown JDK 1.3.1 for Linux
+#    (1) Diablo JDK 1.3.1 for FreeBSD
+#    (2) JDK 1.3.1 for FreeBSD
+#    (3) Sun JDK 1.3.1 for Linux
+#    (4) IBM JDK 1.3.1 for Linux
+#    (5) Blackdown JDK 1.3.1 for Linux
 #
 # If the FreeBSD JDK 1.3.1 is installed or if none of the 1.3.1 JDK's is
 # installed, then the FreeBSD JDK 1.3.1 is used as a dependency for the port.
@@ -326,7 +338,8 @@ JAVA_PORT=		${_JAVA_PORT_FREEBSD_1_2}
 .			if defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) \
 			&& !defined(HAVE_JAVA_IBM_LINUX_1_3) \
 			&& !defined(HAVE_JAVA_SUN_LINUX_1_3) \
-			&& !defined(HAVE_JAVA_FREEBSD_1_3)
+			&& !defined(HAVE_JAVA_FREEBSD_1_3) \
+			&& !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3)
 JAVA_VENDOR=	Blackdown
 JAVA_VER=		1.3.1
 JAVA_OS=		Linux
@@ -334,25 +347,34 @@ JAVA_HOME=		${_JAVA_HOME_BLACKDOWN_LINUX_1_3}
 JAVA_PORT=		${_JAVA_PORT_BLACKDOWN_LINUX_1_3}
 .			elif defined(HAVE_JAVA_IBM_LINUX_1_3) \
 			&& !defined(HAVE_JAVA_SUN_LINUX_1_3) \
-			&& !defined(HAVE_JAVA_FREEBSD_1_3)
+			&& !defined(HAVE_JAVA_FREEBSD_1_3) \
+			&& !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3)
 JAVA_VENDOR=	IBM
 JAVA_VER=		1.3.1
 JAVA_OS=		Linux
 JAVA_HOME=		${_JAVA_HOME_IBM_LINUX_1_3}
 JAVA_PORT=		${_JAVA_PORT_IBM_LINUX_1_3}
 .			elif defined(HAVE_JAVA_SUN_LINUX_1_3) \
-			&& !defined(HAVE_JAVA_FREEBSD_1_3)
+			&& !defined(HAVE_JAVA_FREEBSD_1_3) \
+			&& !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3)
 JAVA_VENDOR=	Sun
 JAVA_VER=		1.3.1
 JAVA_OS=		Linux
 JAVA_HOME=		${_JAVA_HOME_SUN_LINUX_1_3}
 JAVA_PORT=		${_JAVA_PORT_SUN_LINUX_1_3}
-.			else
+.			elif defined(HAVE_JAVA_FREEBSD_1_3) \
+			&& !defined(HAVE_JAVA_DIABLO_FREEBSD_1_3)
 JAVA_VENDOR=	FreeBSD
 JAVA_VER=		1.3.1
 JAVA_OS=		FreeBSD
 JAVA_HOME=		${_JAVA_HOME_FREEBSD_1_3}
 JAVA_PORT=		${_JAVA_PORT_FREEBSD_1_3}
+.			else
+JAVA_VENDOR=	FreeBSD Foundation
+JAVA_VER=		1.3.1
+JAVA_OS=		FreeBSD
+JAVA_HOME=		${_JAVA_HOME_DIABLO_FREEBSD_1_3}
+JAVA_PORT=		${_JAVA_PORT_DIABLO_FREEBSD_1_3}
 .			endif
 
 # If the port needs Java 1.4, then there are 4 choices. They are, in order or