diff options
| -rw-r--r-- | science/ovt/Makefile | 10 | ||||
| -rw-r--r-- | science/ovt/distinfo | 1 | ||||
| -rw-r--r-- | science/ovt/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | science/ovt/files/patch-bin-ovt.in | 21 | ||||
| -rw-r--r-- | science/ovt/files/patch-configure | 55 |
5 files changed, 92 insertions, 6 deletions
diff --git a/science/ovt/Makefile b/science/ovt/Makefile index e0f99c69c46..0eeefecb0fb 100644 --- a/science/ovt/Makefile +++ b/science/ovt/Makefile @@ -7,28 +7,26 @@ PORTNAME= ovt PORTVERSION= 2.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science astro java MASTER_SITES= # http://ovt.irfu.se/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}_${OVTBUILD}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yuri@irfu.se COMMENT= The Orbit Visualization Tool LIB_DEPENDS= vtkCommonJava:${PORTSDIR}/math/vtk-java -BROKEN= Does not build - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OVTBUILD= 3 USE_BZIP2= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes ONLY_FOR_ARCHS= i386 USE_JAVA= yes -JAVA_VERSION= 1.4 +JAVA_VERSION= 1.4+ JAVA_OS= native CONFIGURE_ARGS= --with-jdk=${JAVA_HOME} diff --git a/science/ovt/distinfo b/science/ovt/distinfo index be0142deace..e6760054aae 100644 --- a/science/ovt/distinfo +++ b/science/ovt/distinfo @@ -1,2 +1,3 @@ MD5 (ovt-2.3_3-src.tar.bz2) = c80cc901f3dea0ddecd42a1f65ce7614 +SHA256 (ovt-2.3_3-src.tar.bz2) = 29b155ce1eadd08b4b9e8e5dcc91e3d563eabfcbc15755ae55b98f1f11a466f5 SIZE (ovt-2.3_3-src.tar.bz2) = 13360012 diff --git a/science/ovt/files/patch-Makefile.in b/science/ovt/files/patch-Makefile.in new file mode 100644 index 00000000000..92aa6b39a87 --- /dev/null +++ b/science/ovt/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 00000000000..ae52cdef53b --- /dev/null +++ b/science/ovt/files/patch-bin-ovt.in @@ -0,0 +1,21 @@ +--- 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 new file mode 100644 index 00000000000..4ddff64ce23 --- /dev/null +++ b/science/ovt/files/patch-configure @@ -0,0 +1,55 @@ +--- configure.orig Tue Mar 23 22:21:46 2004 ++++ configure Thu Oct 5 13:48:28 2006 +@@ -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,16 @@ + 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" + ;; + *) + { { echo "$as_me:$LINENO: error: unrecognized JDK version:$ac_cv_jdk_version" >&5 +@@ -2527,6 +2537,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 @@ + 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 |