From nobody@FreeBSD.org  Fri Sep  5 13:16:53 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBB831065674
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Sep 2008 13:16:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id AE2A98FC1F
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  5 Sep 2008 13:16:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m85DGqhD011518
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 5 Sep 2008 13:16:53 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m85DGqZ9011517;
	Fri, 5 Sep 2008 13:16:52 GMT
	(envelope-from nobody)
Message-Id: <200809051316.m85DGqZ9011517@www.freebsd.org>
Date: Fri, 5 Sep 2008 13:16:52 GMT
From: Yuri Khotyaintsev <yuri@irfu.se>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] science/ovt - support java 1.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         127112
>Category:       ports
>Synopsis:       [maintainer update] science/ovt - support java 1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 05 13:20:01 UTC 2008
>Closed-Date:    Sat Sep 06 16:26:20 UTC 2008
>Last-Modified:  Sat Sep  6 16:30:01 UTC 2008
>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@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,@JAVA@,$JAVA,;t t
 s,@JAVA_INCLUDES@,$JAVA_INCLUDES,;t t
 s,@JAVA_INCLUDES_OS@,$JAVA_INCLUDES_OS,;t t
+s,@JAVA_LIBS_OS@,$JAVA_LIBS_OS,;t t
 s,@ac_cv_javac@,$ac_cv_javac,;t t
 s,@ac_cv_jikes@,$ac_cv_jikes,;t t
 s,@JAVAC@,$JAVAC,;t t


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: sw-bug->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Fri Sep 5 13:20:15 UTC 2008 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127112 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Sep 5 16:59:45 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127112 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Sep 6 16:26:19 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127112 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/127112: commit references a PR
Date: Sat,  6 Sep 2008 16:26:24 +0000 (UTC)

 miwi        2008-09-06 16:26:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     science/ovt/files    patch-configure 
   Log:
   - Fix build with jdk16
   
   PR:             127112
   Submitted by:   maintainer
   
   Revision  Changes    Path
   1.2       +20 -5     ports/science/ovt/files/patch-configure
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
