Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Feb 2012 19:58:20 -0800 (PST)
From:      Greg Lewis <glewis@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        yuri@irfu.se
Subject:   ports/164814: [PATCH] science/ovt: Update to 2.3_4
Message-ID:  <201202060358.q163wKtM005408@misty.eyesbeyond.com>
Resent-Message-ID: <201202060430.q164UHEC003324@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         164814
>Category:       ports
>Synopsis:       [PATCH] science/ovt: Update to 2.3_4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 06 04:30:17 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Greg Lewis
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD misty.eyesbeyond.com 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat May  7 21:48:55 PDT
>Description:

. Update to 2.3_4.
. Fix Java version detection for OpenJDK.

Removed file(s):
- files/patch-Makefile.in
- files/patch-bin-ovt.in

Port maintainer (yuri@irfu.se) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- ovt-2.3_8.patch begins here ---
Index: Makefile
===================================================================
RCS file: /var/fcvs/ports/science/ovt/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	3 Jan 2012 02:34:10 -0000	1.17
+++ Makefile	6 Feb 2012 03:41:47 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	ovt
 PORTVERSION=	2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	science astro java
 MASTER_SITES=	# http://ovt.irfu.se/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}_${OVTBUILD}-src
@@ -17,8 +17,8 @@
 
 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
@@ -40,7 +40,7 @@
 # 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\
+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}.\
Index: distinfo
===================================================================
RCS file: /var/fcvs/ports/science/ovt/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	3 Jul 2011 13:22:20 -0000	1.3
+++ distinfo	5 Feb 2012 19:48:50 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /var/fcvs/ports/science/ovt/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	23 Mar 2004 23:34:29 -0000	1.1
+++ pkg-plist	6 Feb 2012 02:59:54 -0000
@@ -37,7 +37,6 @@
 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
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- files/patch-Makefile.in	24 Aug 2007 18:37:06 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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)
Index: files/patch-bin-ovt.in
===================================================================
RCS file: files/patch-bin-ovt.in
diff -N files/patch-bin-ovt.in
--- files/patch-bin-ovt.in	24 Aug 2007 18:37:06 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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
Index: files/patch-configure
===================================================================
RCS file: /var/fcvs/ports/science/ovt/files/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- files/patch-configure	6 Sep 2008 16:26:10 -0000	1.2
+++ files/patch-configure	6 Feb 2012 03:40:35 -0000
@@ -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; }
--- ovt-2.3_8.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202060358.q163wKtM005408>