Date: Tue, 21 Aug 2007 08:25:09 GMT From: Yuri Khotyaintsev <yuri@irfu.se> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/115674: [patch] science/ovt: unbreak build, take maintainership Message-ID: <200708210825.l7L8P9u0031740@www.freebsd.org> Resent-Message-ID: <200708210831.l7L8VTi9075652@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115674 >Category: ports >Synopsis: [patch] science/ovt: unbreak build, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Aug 21 08:30:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Yuri Khotyaintsev >Release: 6.2-STABLE >Organization: Swedish Inst. of Space Physics >Environment: FreeBSD xxx.irfu.se 6.2-STABLE FreeBSD 6.2-STABLE #14: Wed Jul 11 11:35:08 CEST 2007 root@xxx.irfu.se:/usr/obj/usr/src/sys/ICE i386 >Description: Port is currently marked broken. The patch included unbreaks the build. I would also like to take over maintainership of the port. >How-To-Repeat: cd science/ovt; make >Fix: Patch below. Patch attached with submission follows: diff -ruN ovt.bak/Makefile ovt/Makefile --- ovt.bak/Makefile Sat May 19 22:22:17 2007 +++ ovt/Makefile Tue Aug 21 10:05:41 2007 @@ -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 -ruN ovt.bak/distinfo ovt/distinfo --- ovt.bak/distinfo Wed Mar 24 00:34:29 2004 +++ ovt/distinfo Tue Aug 21 10:01:49 2007 @@ -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 -ruN ovt.bak/files/patch-Makefile.in ovt/files/patch-Makefile.in --- ovt.bak/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 +++ ovt/files/patch-Makefile.in Thu Oct 5 13:13:46 2006 @@ -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 -ruN ovt.bak/files/patch-bin-ovt.in ovt/files/patch-bin-ovt.in --- ovt.bak/files/patch-bin-ovt.in Thu Jan 1 01:00:00 1970 +++ ovt/files/patch-bin-ovt.in Thu Oct 5 13:51:14 2006 @@ -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 -ruN ovt.bak/files/patch-configure ovt/files/patch-configure --- ovt.bak/files/patch-configure Thu Jan 1 01:00:00 1970 +++ ovt/files/patch-configure Thu Oct 5 13:59:15 2006 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708210825.l7L8P9u0031740>