sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-06 21:30:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

. Cope with legacy versions "1.5" (expands to 1.6) and "1.5+" (expands to

Browse source 
1.6 1.7).
. Remove freebsd and bsdjava as valid vendors.
This commit is contained in:
Greg Lewis 2012-12-11 05:37:54 +00:00
parent e31c370390
commit 167b1fa7bc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=308662
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/javavmwrapper/Makefile
View file

@ -5,7 +5,7 @@
PORTNAME= javavmwrapper PORTNAME= javavmwrapper
PORTVERSION= 2.4 PORTVERSION= 2.4
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= java CATEGORIES= java
MASTER_SITES= # none MASTER_SITES= # none
DISTFILES= # none DISTFILES= # none

11
java/javavmwrapper/src/javavmwrapper.sh
View file

@ -526,8 +526,11 @@ setJavaHome() {
_JAVAVM_VERSION= _JAVAVM_VERSION=
for version in ${JAVA_VERSION}; do for version in ${JAVA_VERSION}; do
case "${version}" in case "${version}" in
1.5)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
;;
1.5+) 1.5+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.5 1.6 1.7" _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
;; ;;
1.6+) 1.6+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7" _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
@ -588,12 +591,6 @@ setJavaHome() {
if [ -n "${JAVA_VENDOR}" ]; then if [ -n "${JAVA_VENDOR}" ]; then
_JAVAVM_VENDOR= _JAVAVM_VENDOR=
case "${_JAVAVM_VM}" in case "${_JAVAVM_VM}" in
diablo*)
_JAVAVM_VENDOR=freebsd
;;
j*)
_JAVAVM_VENDOR=bsdjava
;;
openjdk*) openjdk*)
_JAVAVM_VENDOR=openjdk _JAVAVM_VENDOR=openjdk
;; ;;