diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2007-03-06 06:21:46 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2007-03-06 06:21:46 +0000 |
| commit | fbcb891de43772c1492ca91807fe9cb01bd3ee29 (patch) | |
| tree | 9c936cb8147055ab92d464167a799f5604c2f9b9 /Mk/bsd.java.mk | |
| parent | c8f499efddb38a5ce3c56c48484c56e5bc458c99 (diff) | |
| download | ports-fbcb891de43772c1492ca91807fe9cb01bd3ee29.tar.gz ports-fbcb891de43772c1492ca91807fe9cb01bd3ee29.zip | |
* Refine some comments about Linux emulation [1]
* Fix 'make search' with non-default ${PORTSDIR} [2]
* Fix typo in USE_LDCONFIG32 message [3]
* Allow USE_PHP after inclusion of bsd.port.pre.mk [4]
* Document NO_LDCONFIG_MTREE [5]
* Update/enhance description of INSTALLS_SHLIB and USE_LDCONFIG [6]
* Remove obsolete code in bsd.port.mk dealing with 4.X and other,
even older, releases [7]
* Remove references to obsolete ports from bsd.java.mk [8]
PR: 105883 [1], 105917 [2], 106195 [3], 106557 [4], 108738 [5],
108739 [6], 108782 [7], 103357 [8]
Submitted by: bsam [1], shaun [2], edwin [3], ale [4], gerald [5] [6],
linimon [7], kris [7], gabor [4]
Notes
Notes:
svn path=/head/; revision=186638
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 567813915ad6..0bd2a1652422 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -31,7 +31,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # for the port. (allowed values: native linux) # # JAVA_VENDOR List of space-separated suitable JDK port vendors for the -# port. (allowed values: freebsd bsdjava sun ibm blackdown) +# port. (allowed values: freebsd bsdjava sun blackdown) # # JAVA_BUILD When set, it means that the selected JDK port should be # added to build dependencies for the port. @@ -169,7 +169,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" __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 +_JAVA_VENDOR_LIST= freebsd bsdjava sun blackdown # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor @@ -191,10 +191,6 @@ _JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3_INFO= PORT=java/linux-blackdown-jdk13 HOME=${ 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_IBM_JDK_1_3_INFO= PORT=java/linux-ibm-jdk13 HOME=${LOCALBASE}/linux-ibm-jdk1.3.1 \ - VERSION=1.3.1 OS=linux VENDOR=ibm -_JAVA_PORT_LINUX_IBM_JDK_1_4_INFO= PORT=java/linux-ibm-jdk14 HOME=${LOCALBASE}/linux-ibm-jdk1.4.2 \ - VERSION=1.4.1 OS=linux VENDOR=ibm _JAVA_PORT_LINUX_SUN_JDK_1_2_INFO= PORT=java/linux-sun-jdk12 HOME=${LOCALBASE}/linux-sun-jdk1.2.2 \ VERSION=1.2.2 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_3_INFO= PORT=java/linux-sun-jdk13 HOME=${LOCALBASE}/linux-sun-jdk1.3.1 \ @@ -208,7 +204,6 @@ _JAVA_PORT_LINUX_SUN_JDK_1_5_INFO= PORT=java/linux-sun-jdk15 HOME=${LOCALBASE _JAVA_VENDOR_freebsd= "FreeBSD Foundation" _JAVA_VENDOR_bsdjava= "BSD Java Porting Team" _JAVA_VENDOR_blackdown= Blackdown -_JAVA_VENDOR_ibm= IBM _JAVA_VENDOR_sun= Sun # Verbose description for each OS @@ -236,9 +231,7 @@ __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 \ JAVA_PORT_LINUX_SUN_JDK_1_2 \ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_4 \ JAVA_PORT_LINUX_BLACKDOWN_JDK_1_3 \ - JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2 \ - JAVA_PORT_LINUX_IBM_JDK_1_4 \ - JAVA_PORT_LINUX_IBM_JDK_1_3 + JAVA_PORT_LINUX_BLACKDOWN_JDK_1_2 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${_JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} |