Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Sep 2004 08:16:43 GMT
From:      Kang Liu <liukang@bjut.edu.cn>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/71926: [patch]Add linux-sun-jdk15 into bsd.java.mk
Message-ID:  <200409200816.i8K8GhV1045137@www.freebsd.org>
Resent-Message-ID: <200409200820.i8K8KRjm083755@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71926
>Category:       ports
>Synopsis:       [patch]Add linux-sun-jdk15 into bsd.java.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 20 08:20:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kang Liu
>Release:        4.10
>Organization:
Beijing University of Technology
>Environment:
4.10-RELEASE-p2
>Description:
Add linux-sun-jdk15 into bsd.java.mk
>How-To-Repeat:

>Fix:
Index: bsd.java.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.java.mk,v
retrieving revision 1.56
diff -u -r1.56 bsd.java.mk
--- bsd.java.mk	9 Sep 2004 20:31:48 -0000	1.56
+++ bsd.java.mk	20 Sep 2004 07:00:32 -0000
@@ -156,7 +156,7 @@
 			JAVAJARDIR="${JAVAJARDIR:S,^${PREFIX}/,,}"
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	1.1 1.2 1.3 1.4
+__JAVA_VERSION_LIST=	1.1 1.2 1.3 1.4 1.5
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
 _JAVA_VENDOR_LIST=		freebsd bsdjava sun blackdown ibm
@@ -189,6 +189,8 @@
 											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 \
 											VERSION=1.4.2	OS=linux	VENDOR=sun
+_JAVA_PORT_LINUX_SUN_JDK_1_5_INFO=			PORT=java/linux-sun-jdk15		HOME=${LOCALBASE}/linux-sun-jdk1.5.0 \
+											VERSION=1.5.0	OS=linux	VENDOR=sun
 
 # Verbose description for each VENDOR
 _JAVA_VENDOR_freebsd=		"FreeBSD Foundation"
@@ -217,7 +219,8 @@
 					JAVA_PORT_NATIVE_FREEBSD_JDK_1_3 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_2 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 \
-					JAVA_PORT_LINUX_SUN_JDK_1_4	\
+					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 \
@@ -325,7 +328,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/:S/1.2+/1.2 1.3 1.4/:S/1.3+/1.3 1.4/:S/1.4+/1.4/}
+_JAVA_VERSION=	${JAVA_VERSION:S/1.1+/1.1 1.2 1.3 1.4/:S/1.2+/1.2 1.3 1.4/:S/1.3+/1.3 1.4/:S/1.4+/1.4 1.5/:S/1.5+/1.5/}
 .		else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .		endif

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200409200816.i8K8GhV1045137>