mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

. Update internal fallback logic, including:

Browse Source 
. Remove support for diablo* and j* ports.
  . Add support for linux-oracle* ports.
  . Remove support for Java version 1.5.
  . Add support for Java version 1.8.
  . Add support for Oracle as a vendor.
. Bump PORTVERSION.
. Remove CONFLICTS for ports that no longer exist.
This commit is contained in:
Greg Lewis 2014-04-12 19:43:17 +00:00
parent 406ae1d7e2
commit b947f3bb26
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=351127
2 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/javavmwrapper/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= javavmwrapper
PORTVERSION= 2.4
PORTREVISION= 3
PORTVERSION= 2.5
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none
@ -11,8 +10,6 @@ DISTFILES= # none
MAINTAINER= glewis@FreeBSD.org
COMMENT= Wrapper script for various Java Virtual Machines
CONFLICTS= kaffe-1.* kaffe-devel-1.*
NO_BUILD= yes
NO_WRKSUBDIR= yes

52
java/javavmwrapper/src/javavmwrapper.sh
View File

@ -193,7 +193,7 @@ sortConfiguration () {
JAVAVM=
continue
;;
diablo-jdk*)
linux-sun-jdk*|linux-oracle-jdk*)
case "${_VM}" in
open*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
@ -206,35 +206,9 @@ sortConfiguration () {
;;
esac
;;
diablo-jre*|jdk*)
linux-sun-jre*|linux-oracle-jre*)
case "${_VM}" in
open*|diablo*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue
;;
*)
_JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
JAVAVM=
continue
;;
esac
;;
jre*|linux-sun-jdk*)
case "${_VM}" in
open*|diablo*|j*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue
;;
*)
_JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
JAVAVM=
continue
;;
esac
;;
linux-sun-jre*)
case "${_VM}" in
open*|diablo*|j*|linux-sun*)
open*|linux-sun*|linux-oracle*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue
;;
@ -526,17 +500,14 @@ setJavaHome() {
_JAVAVM_VERSION=
for version in ${JAVA_VERSION}; do
case "${version}" in
1.5)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
;;
1.5+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
;;
1.6+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8"
;;
1.7+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8"
;;
1.8+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8"
;;
*)
_JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
@ -570,7 +541,7 @@ setJavaHome() {
if [ -n "${JAVA_OS}" ]; then
_JAVAVM_OS=
case "${_JAVAVM_VM}" in
diablo*|j*|openjdk*)
openjdk*)
_JAVAVM_OS=native
;;
linux*)
@ -594,9 +565,12 @@ setJavaHome() {
openjdk*)
_JAVAVM_VENDOR=openjdk
;;
linux*)
linux-sun*)
_JAVAVM_VENDOR=sun
;;
linux-oracle*)
_JAVAVM_VENDOR=oracle
;;
esac
for _JAVAVM_REQUESTED_VENDOR in ${JAVA_VENDOR}; do
if [ "${_JAVAVM_VENDOR}" = "${_JAVAVM_REQUESTED_VENDOR}" ]; then