diff options
| author | miwi <miwi@FreeBSD.org> | 2008-09-06 16:26:10 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-09-06 16:26:10 +0000 |
| commit | f7b59d223d79b415d8563c6a0eaf46cd04f6fc27 (patch) | |
| tree | ba1ee2b49812d54cba40d612641804282ca10cc4 /science | |
| parent | 5a984a3bf1bede3d3fa08a703750313b174e78c8 (diff) | |
| download | FreeBSD-ports-f7b59d223d79b415d8563c6a0eaf46cd04f6fc27.zip FreeBSD-ports-f7b59d223d79b415d8563c6a0eaf46cd04f6fc27.tar.gz | |
- Fix build with jdk16
PR: 127112
Submitted by: maintainer
Diffstat (limited to 'science')
| -rw-r--r-- | science/ovt/files/patch-configure | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/science/ovt/files/patch-configure b/science/ovt/files/patch-configure index 4ddff64..e47b4d5 100644 --- a/science/ovt/files/patch-configure +++ b/science/ovt/files/patch-configure @@ -1,5 +1,9 @@ ---- configure.orig Tue Mar 23 22:21:46 2004 -+++ configure Thu Oct 5 13:48:28 2006 +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 @@ -19,7 +23,7 @@ ;; 1.4*) JDK_VERSION_STRING=$ac_cv_jdk_version -@@ -2515,7 +2516,16 @@ +@@ -2515,7 +2516,25 @@ JAVAHFLAGS="" JAVA_INCLUDES="$ac_cv_java_home/include" JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR" @@ -34,10 +38,19 @@ + 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 +2537,7 @@ +@@ -2527,6 +2546,7 @@ @@ -45,7 +58,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 +3638,7 @@ +@@ -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 @@ -53,3 +66,5 @@ s,@ac_cv_javac@,$ac_cv_javac,;t t s,@ac_cv_jikes@,$ac_cv_jikes,;t t s,@JAVAC@,$JAVAC,;t t + + |
