. Update to 2.3_4.

. Fix Java version detection for OpenJDK.
. Remove RESTRICTED and manual download as the source is now freely available.

PR:		164814
Approved by:	Yuri Khotyaintsev <yuri@irfu.se> (MAINTAINER)

6 files changed, 20 insertions, 124 deletions

diff --git a/science/ovt/Makefile b/science/ovt/Makefile
index 65e48814831e..5d6c5c56a2cc 100644
--- a/science/ovt/Makefile
+++ b/science/ovt/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ovt
 PORTVERSION=	2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science astro java
-MASTER_SITES=	# http://ovt.irfu.se/download/
+MASTER_SITES=	http://ovt.irfu.se/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_${OVTBUILD}-src
 
 MAINTAINER=	yuri@irfu.se
@@ -17,8 +17,8 @@ COMMENT=	The Orbit Visualization Tool
 
 LIB_DEPENDS=	vtkCommonJava:${PORTSDIR}/math/vtk-java
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-OVTBUILD=	3
+WRKSRC=		${WRKDIR}/${PORTNAME}2g
+OVTBUILD=	4
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
@@ -33,18 +33,4 @@ CONFIGURE_ARGS=	--with-jdk=${JAVA_HOME}
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-RESTRICTED=	yes
-
-.include <bsd.port.pre.mk>
-
-# Check for OVT distfile
-.if !exists(${DISTDIR}/${DISTNAME}{EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-IGNORE=	because of licensing restrictions, you must fetch the source\
-distribution \ manually.  Please access http://ovt.irfu.se/download/ with a\
-web browser and follow the "Download" link for the "OVT ${PORTVERSION} Sources.\
-You will be required to log in and register, but you can create an account\
-on this page.  After registration download the source file, ${DISTFILES}.\
-Please place this file in ${DISTDIR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/ovt/distinfo b/science/ovt/distinfo
index 70d83b793850..0a543c5d0df5 100644
--- a/science/ovt/distinfo
+++ b/science/ovt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ovt-2.3_3-src.tar.bz2) = 29b155ce1eadd08b4b9e8e5dcc91e3d563eabfcbc15755ae55b98f1f11a466f5
-SIZE (ovt-2.3_3-src.tar.bz2) = 13360012
+SHA256 (ovt-2.3_4-src.tar.bz2) = 907d13b4d4be41a1ef8ae9ebc7dfa1941e22ed9a57b98bc24db4ccf6f2ad171e
+SIZE (ovt-2.3_4-src.tar.bz2) = 29089497
diff --git a/science/ovt/files/patch-Makefile.in b/science/ovt/files/patch-Makefile.in
deleted file mode 100644
index 92aa6b39a872..000000000000
--- a/science/ovt/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Oct  5 13:12:51 2006
-+++ Makefile.in	Thu Oct  5 13:13:25 2006
-@@ -151,7 +151,7 @@
- 
- install-odata:
- 	$(mkinstalldirs) $(ovt_datadir)/$(ODATA_DIR) ;\
--	${INSTALL} -m 644 $(ODATA_DIR)/*.tle $(ODATA_DIR)/*.spin\
-+	${INSTALL} -m 644 $(ODATA_DIR)/*.tle $(ODATA_DIR)/*.spin \
- 	$(ODATA_DIR)/*.ltof $(ovt_datadir)/$(ODATA_DIR)
- 
- install-conf: $(conf-files)
diff --git a/science/ovt/files/patch-bin-ovt.in b/science/ovt/files/patch-bin-ovt.in
deleted file mode 100644
index ae52cdef53ba..000000000000
--- a/science/ovt/files/patch-bin-ovt.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- bin/ovt.in.orig	Thu Oct  5 13:25:50 2006
-+++ bin/ovt.in	Thu Oct  5 13:39:43 2006
-@@ -7,6 +7,7 @@
- # java or jre v1.2.x or 1.3.x
- # note that JAVA_HOME overrides JAVABIN
- JAVABIN=@JAVABIN@
-+JAVA_LIBS_OS=@JAVA_LIBS_OS@
- 
- # set it to /path/to/your/vtk.jar
- VTK_CLASSPATH=@VTK_CLASSPATH@
-@@ -78,6 +79,10 @@
- 
- if [ "$VTK_LIBS" != "" ]
- then
-+	if [ "X$JAVA_LIBS_OS" != "X" ]
-+	then
-+		VTK_LIBS=$VTK_LIBS:$JAVA_LIBS_OS
-+	fi
- 	echo "  VTK LIBS DIR  = $VTK_LIBS"
- 	if [ "$LD_LIBRARY_PATH" != "" ]
- 	then
diff --git a/science/ovt/files/patch-configure b/science/ovt/files/patch-configure
index e47b4d5e90eb..b15c64254928 100644
--- a/science/ovt/files/patch-configure
+++ b/science/ovt/files/patch-configure
@@ -1,70 +1,13 @@
-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
-
-
+$FreeBSD$
+
+--- configure.orig	2012-02-05 18:29:34.000000000 -0800
++++ configure	2012-02-05 18:29:49.000000000 -0800
+@@ -3234,7 +3234,7 @@
+ if test "${ac_cv_jdk_version+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_cv_jdk_version=`($JAVABIN -version 2>&1) | sed -n '/.*java.* version *"\(.*\)".*/s//\1/p'`
++  ac_cv_jdk_version=`($JAVABIN -version 2>&1) | sed -n '/.* version *"\(.*\)".*/s//\1/p'`
+ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_jdk_version" >&5
+ $as_echo "$ac_cv_jdk_version" >&6; }
diff --git a/science/ovt/pkg-plist b/science/ovt/pkg-plist
index a60dc72468e1..9fe6873695ba 100644
--- a/science/ovt/pkg-plist
+++ b/science/ovt/pkg-plist
@@ -37,7 +37,6 @@ share/ovt-%%PORTVERSION%%/odata/dmspf14.tle
 share/ovt-%%PORTVERSION%%/odata/dmspf15.tle
 share/ovt-%%PORTVERSION%%/odata/dmspf8.tle
 share/ovt-%%PORTVERSION%%/odata/dmspf9.tle
-share/ovt-%%PORTVERSION%%/odata/exosd.tle
 share/ovt-%%PORTVERSION%%/odata/uars.tle
 share/ovt-%%PORTVERSION%%/textures/earth8km2000x1000.pnm
 share/ovt-%%PORTVERSION%%/textures/earth_BnW.pnm