ports/127112: [maintainer update] science/ovt - support java 1.6

[Yuri Khotyaintsev]

>Number:         127112
>Category:       ports
>Synopsis:       [maintainer update] science/ovt - support java 1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 05 13:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yuri Khotyaintsev
>Release:        6.3-STABLE
>Organization:
Swedish Institute of Space Physics
>Environment:
FreeBSD xxx.irfu.se 6.3-STABLE FreeBSD 6.3-STABLE #23: Wed Jul  9 12:14:33 CEST 2008     root at xxx.irfu.se:/usr/obj/usr/src/sys/ICE  i386
>Description:
Ovt fails in configure after the default java has been updated to 1.6.
>How-To-Repeat:
cd /usr/ports/science/ovt; make
>Fix:
Save the attached patch as science/ovt/files/patch-configure

Patch attached with submission follows:

--- configure.orig	2004-03-23 22:21:46.000000000 +0100
+++ configure	2008-09-05 14:56:01.000000000 +0200
@@ -2496,8 +2496,8 @@
 echo "${ECHO_T}$ac_cv_jdk_version" >&6
 case "$ac_cv_jdk_version" in
 1.1|1.2*)
-	{ { echo "$as_me:$LINENO: error: Java 1.3.x or 1.4.x is needed" >&5
-echo "$as_me: error: Java 1.3.x or 1.4.x is needed" >&2;}
+	{ { echo "$as_me:$LINENO: error: Java >=1.3.x is needed" >&5
+echo "$as_me: error: Java >=1.3.x is needed" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 1.3*)
@@ -2507,6 +2507,7 @@
 	JAVAHFLAGS=""
 	JAVA_INCLUDES="$ac_cv_java_home/include"
 	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$PLATFORM"
+	JAVA_LIBS_OS=""
 	;;
 1.4*)
 	JDK_VERSION_STRING=$ac_cv_jdk_version
@@ -2515,7 +2516,25 @@
 	JAVAHFLAGS=""
 	JAVA_INCLUDES="$ac_cv_java_home/include"
 	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
-#	AC_MSG_ERROR(jdk 1.4 is not yet supported)
+	JAVA_LIBS_OS=""
+	;;
+1.5*)
+	JDK_VERSION_STRING=$ac_cv_jdk_version
+	JDK_VERSION=15
+	JAVACFLAGS="-classpath ."
+	JAVAHFLAGS=""
+	JAVA_INCLUDES="$ac_cv_java_home/include"
+	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
+	JAVA_LIBS_OS="$ac_cv_java_home/jre/lib/i386:$ac_cv_java_home/jre/lib/i386/xawt"
+	;;
+1.6*)
+	JDK_VERSION_STRING=$ac_cv_jdk_version
+	JDK_VERSION=16
+	JAVACFLAGS="-classpath ."
+	JAVAHFLAGS=""
+	JAVA_INCLUDES="$ac_cv_java_home/include"
+	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
+	JAVA_LIBS_OS="$ac_cv_java_home/jre/lib/i386:$ac_cv_java_home/jre/lib/i386/xawt"
 	;;
 *)
 	{ { echo "$as_me:$LINENO: error: unrecognized JDK version:$ac_cv_jdk_version" >&5
@@ -2527,6 +2546,7 @@
 
 
 
+
 # Extract the first word of "javac", so it can be a program name with args.
 set dummy javac; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3627,6 +3647,7 @@
 s, at JAVA@,$JAVA,;t t
 s, at JAVA_INCLUDES@,$JAVA_INCLUDES,;t t
 s, at JAVA_INCLUDES_OS@,$JAVA_INCLUDES_OS,;t t
+s, at JAVA_LIBS_OS@,$JAVA_LIBS_OS,;t t
 s, at ac_cv_javac@,$ac_cv_javac,;t t
 s, at ac_cv_jikes@,$ac_cv_jikes,;t t
 s, at JAVAC@,$JAVAC,;t t


>Release-Note:
>Audit-Trail:
>Unformatted: