diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2009-05-22 04:11:20 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2009-05-22 04:11:20 +0000 |
| commit | b4d07ddf3f6108b6a9e1726c8270c19e988d05e9 (patch) | |
| tree | 9348a063a5523efd393e4a5417968ca6f9e61fb7 /Mk/bsd.java.mk | |
| parent | 4ba30aaef28a893fc7ae6fbb1e6430f984211430 (diff) | |
Notes
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index df9ef05dd346..40e696c398ec 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -165,10 +165,12 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" __JAVA_VERSION_LIST= 1.3 1.4 1.5 1.6 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} 1.1+ 1.2+ _JAVA_OS_LIST= native linux -_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown +_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown openjdk # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor +_JAVA_PORT_NATIVE_OPENJDK_JDK_1_6_INFO= PORT=java/openjdk6 HOME=${LOCALBASE}/openjdk6 \ + VERSION=1.6.0 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO= PORT=java/diablo-jdk16 HOME=${LOCALBASE}/diablo-jdk1.6.0 \ VERSION=1.6.0 OS=native VENDOR=freebsd _JAVA_PORT_NATIVE_FREEBSD_JDK_1_5_INFO= PORT=java/diablo-jdk15 HOME=${LOCALBASE}/diablo-jdk1.5.0 \ @@ -195,6 +197,7 @@ _JAVA_PORT_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE # Verbose description for each VENDOR _JAVA_VENDOR_freebsd= "FreeBSD Foundation" _JAVA_VENDOR_bsdjava= "BSD Java Porting Team" +_JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team" _JAVA_VENDOR_blackdown= Blackdown _JAVA_VENDOR_sun= Sun @@ -212,6 +215,7 @@ _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 # List all JDK ports __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \ JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ |