mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

. Add support for JAVA_VERSION of 1.7.

Browse Source 
. Note such support in the manual pages.
. Correctly determine the Java version of the OpenJDK ports when bsd.java.mk
  isn't present.
. Bump version to 2.3.4.
This commit is contained in:
Greg Lewis 2010-01-17 22:41:10 +00:00
parent c4906071e2
commit a2e9b71248
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=248038
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/javavmwrapper/Makefile
View File

@ -8,7 +8,7 @@
#
PORTNAME= javavmwrapper
PORTVERSION= 2.3.3
PORTVERSION= 2.3.4
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none

8
java/javavmwrapper/src/javavm.1
View File

@ -122,9 +122,13 @@ Currently allowed versions are
.Ql 1.3+ ,
.Ql 1.4 ,
.Ql 1.4+ ,
.Ql 1.5
.Ql 1.5 ,
.Ql 1.5+ ,
.Ql 1.6 ,
.Ql 1.6+ ,
.Ql 1.7
and
.Ql 1.5+ .
.Ql 1.7+ .
.It Ev JAVAVM_OPTS
The contents of this environment variable will be passed to the invoked
Java VM as options.

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

@ -532,22 +532,25 @@ setJavaHome() {
for version in ${JAVA_VERSION}; do
case "${version}" in
1.1+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.1 1.2 1.3 1.4 1.5 1.6"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.1 1.2 1.3 1.4 1.5 1.6 1.7"
;;
1.2+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.2 1.3 1.4 1.5 1.6"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.2 1.3 1.4 1.5 1.6 1.7"
;;
1.3+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.3 1.4 1.5 1.6"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.3 1.4 1.5 1.6 1.7"
;;
1.4+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.4 1.5 1.6"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.4 1.5 1.6 1.7"
;;
1.5+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.5 1.6"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.5 1.6 1.7"
;;
1.6+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
;;
1.6+)
_JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7"
;;
*)
_JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
@ -565,7 +568,8 @@ setJavaHome() {
# Respect JAVA_VERSION
if [ -n "${JAVA_VERSION}" ]; then
_JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \
sed -e 's|[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]|\1.\2|'`
sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\1.\2|' \
-e 's|^[^0-9]*\([0-9]\)$|1.\1|'`
for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do
if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then
_JAVAVM_VERSION=

8
java/javavmwrapper/src/manvm.1
View File

@ -110,9 +110,13 @@ Currently allowed versions are
.Ql 1.3+ ,
.Ql 1.4 ,
.Ql 1.4+ ,
.Ql 1.5
.Ql 1.5 ,
.Ql 1.5+ ,
.Ql 1.6 ,
.Ql 1.6+ ,
.Ql 1.7
and
.Ql 1.5+ .
.Ql 1.7+ .
.It Ev JAVAVM_OPTS
The contents of this environment variable will be passed to the invoked
.Nm man