diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-11-08 09:02:51 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-11-08 09:02:51 +0000 |
| commit | a4b366df6a9c6adc61947efdc82cdef5bd17e5ae (patch) | |
| tree | 64e924e8edbb3574c980bea76ec32b8928c68027 /Mk/bsd.java.mk | |
| parent | 016d97495940ea9809638b8083c96d47ff6b17a8 (diff) | |
| download | ports-a4b366df6a9c6adc61947efdc82cdef5bd17e5ae.tar.gz ports-a4b366df6a9c6adc61947efdc82cdef5bd17e5ae.zip | |
* Add bsd.database.mk [1]
- move out from bsd.port.mk USE_MYSQL and USE_PGSQL.
- add support for Berkley DB and SQLite (via USE_BDB and USE_SQLITE
knobs).
* Espace '+' in make search [2]
* Add "makepatch" target to simplify creation of patches during porting [3]
* Replace deprecated MACHINE_ARCH with ARCH [4]
* Remove support of OpenLDAP 2.1 [5]
* Add bsd.tcl.mk [6]
It introduces USE_TCL/USE_TCL_BUILD knobs to support various
version of tcl (8.0 -> 8.4)
* Fix cosmetic bugs in security-check target [7]
* Add support for INDEX-7 and above (up to INDEX-9 actually) [8]
* Add "package-recursive" to bsd.port.subdir.mk [9]
* Remove check for FreeBSD version < 460101 [10]
* New category: net-im [11]
* Add .desktop file facilities
It introduces DESKTOPDIR and DESKTOP_ENTRIES knobs [12]
* Add SHA256 support to "*checksum" targets [13]
* Fix USE_PYTHON with OPTIONS [14]
* Force NO_LINT to MAKE_ENV to avoid library breaks [15]
* Fix typo: s/RC_ORDER/USE_RCORDER/g [16]
* Add support for PostgreSQL 8.1 [17]
* Add bsd.apache.mk
USE_APACHE knob enhancements [18]
PR: ports/85695 [1], ports/85669 [2], ports/85488 [3],
ports/84489 [4], ports/83835 [5], ports/83718 [6],
ports/83716 [7], ports/83710 [8], ports/82753 [9],
ports/82138 [10], ports/81206 [11], ports/79509 [12],
ports/79123 [13], ports/74866 [14], ports/85490 [15],
ports/83514 [16], ports/88466 [17]
Submitted by: vsevolod [1] [6], Ricardo Alves dos Reis
<ricardo_bsd@yahoo.com.br> [2], markm [3] [15], obrien [4],
krion [5] [8] , Petr Rehor <prehor@gmail.com> [7],
clement [8] [18], jhs@berklix.org [9], edwin [10] [13],
pav [11], jylefort [12], mnag [14], leeym [16], girgen [17]
Notes
Notes:
svn path=/head/; revision=147554
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 25997a76eef1..114a8a6047f4 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -216,17 +216,12 @@ _JAVA_OS_native= Native _JAVA_OS_linux= Linux # Enforce preferred Java ports according to OS -. if ${OSVERSION} >= 400000 -. if ${ARCH} == "amd64" +. if ${ARCH} == "amd64" _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 -. else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 -. endif . else -_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_1 +_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 . endif - # List all JDK ports __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 \ JAVA_PORT_NATIVE_BSDJAVA_JDK_1_4 \ |