From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 24 23:20:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC3BE1065678 for ; Sat, 24 Dec 2011 23:20:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A7D538FC1A for ; Sat, 24 Dec 2011 23:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pBONKApr058756 for ; Sat, 24 Dec 2011 23:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pBONKAXi058755; Sat, 24 Dec 2011 23:20:10 GMT (envelope-from gnats) Resent-Date: Sat, 24 Dec 2011 23:20:10 GMT Resent-Message-Id: <201112242320.pBONKAXi058755@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rob Farmer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0473C106564A for ; Sat, 24 Dec 2011 23:14:55 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E64A98FC12 for ; Sat, 24 Dec 2011 23:14:54 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pBONEsax056450 for ; Sat, 24 Dec 2011 23:14:54 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id pBONEs3t056449; Sat, 24 Dec 2011 23:14:54 GMT (envelope-from nobody) Message-Id: <201112242314.pBONEs3t056449@red.freebsd.org> Date: Sat, 24 Dec 2011 23:14:54 GMT From: Rob Farmer To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163601: [maintainer] [patch] science/hdf-java X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Dec 2011 23:20:10 -0000 >Number: 163601 >Category: ports >Synopsis: [maintainer] [patch] science/hdf-java >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 24 23:20:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Rob Farmer >Release: 10-CURRENT >Organization: >Environment: FreeBSD turquoise.predatorlabs.net 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Sat Dec 24 01:03:56 PST 2011 rfarmer@turquoise.predatorlabs.net:/usr/obj/usr/src/sys/TURQUOISE amd64 >Description: Commit after ports/163595 - I haven't tested with the old version -Update to 2.8 -Wrap long lines -Fix java paths so the hdfview script works -Add jpeg support -Build javadoc -Prevent implicit dependencies >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/science/hdf-java/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 15 Jul 2011 07:00:46 -0000 1.5 +++ Makefile 22 Dec 2011 02:37:18 -0000 @@ -6,8 +6,7 @@ # PORTNAME= hdf-java -PORTVERSION= 2.7 -PORTREVISION= 1 +PORTVERSION= 2.8 CATEGORIES= science java MASTER_SITES= http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/ \ http://www.predatorlabs.net/dl/ @@ -16,20 +15,25 @@ MAINTAINER= rfarmer@predatorlabs.net COMMENT= Java interface to HDF5 -LIB_DEPENDS= hdf5.7:${PORTSDIR}/science/hdf5-18 +LIB_DEPENDS= hdf5.7:${PORTSDIR}/science/hdf5-18 \ + jpeg.11:${PORTSDIR}/graphics/jpeg USE_JAVA= yes -JAVA_VERSION= 1.5+ +JAVA_VERSION= 1.6+ JAVA_BUILD= yes JAVA_RUN= yes USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*/examples/.*Makefile.in +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-jdk=${JAVA_HOME}/include,${JAVA_HOME}/jre/lib/ \ --with-hdf5=${LOCALBASE}/include \ - --with-libz=/lib + --with-libz=/lib \ + --with-libjpeg=${LOCALBASE} \ + --without-hdf4 \ + --without-h4toh5 WRKSRC= ${WRKDIR}/${PORTNAME} @@ -39,24 +43,37 @@ .if defined(WITH_SZIP) CONFIGURE_ARGS+= --with-libsz=${LOCALBASE}/lib +.else +CONFIGURE_ARGS+= --without-libsz +.endif + +.if !defined(NOPORTDOCS) +ALL_TARGET= all javadocs .endif post-patch: - ${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|LLEXT="a"|LLEXT="so"|g' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's|$$(JH45INSTALLDIR)/lib|${JAVAJARDIR}|' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's|$$(LIBDIR)/@JAVATARG@|${PREFIX}/lib|g' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's|cp -R|#|' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's|cp ./lib/@JAVATARG@|${INSTALL_PROGRAM} ./lib/@JAVATARG@|g' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's|cp |${INSTALL_DATA} |g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' \ + -e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' \ + -e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' \ + -e 's|LLEXT="a"|LLEXT="so"|g' \ + -e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|LIBDIR=$$(JH45INSTALLDIR)|LIBDIR=${PREFIX}|' \ + -e 's|$$(JH45INSTALLDIR)/lib|${JAVAJARDIR}|g' \ + -e 's|INSTALL_LIB |${INSTALL_LIB} |' \ + -e 's|cp |${INSTALL_DATA} |g' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e\ + 's|$$HDFJAVA"/lib/freebsd:"$$HDFJAVA"/lib/ext|${PREFIX}/lib"|' \ + -e 's|$$HDFJAVA"/lib|${JAVAJARDIR}"|g' \ + ${WRKSRC}/bin/hdfview.sh.in post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/UsersGuide (cd ${WRKSRC}/docs/hdfview/ && ${COPYTREE_SHARE} "UsersGuide" ${DOCSDIR}/) + (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} "javadocs" ${DOCSDIR}/) .endif +regression-test: build + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check + .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/science/hdf-java/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 17 Mar 2011 17:24:59 -0000 1.4 +++ distinfo 21 Dec 2011 06:49:47 -0000 @@ -1,2 +1,2 @@ -SHA256 (hdf-java-2.7-src.tar) = 091c999cf53266ba113bef45a83912b12444624cfe0253d5eb565b95e0832706 -SIZE (hdf-java-2.7-src.tar) = 13209600 +SHA256 (hdf-java-2.8-src.tar) = bc1b1eb2b9e40c2a23aff295818526ba007cdf8d43bb9a3d1cb117304b56fbb5 +SIZE (hdf-java-2.8-src.tar) = 13670400 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/science/hdf-java/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- pkg-plist 17 Mar 2011 17:24:59 -0000 1.2 +++ pkg-plist 21 Dec 2011 23:14:28 -0000 @@ -63,6 +63,132 @@ %%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug05spreadsheet.html %%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug06imageview.html %%PORTDOCS%%%%DOCSDIR%%/UsersGuide/ug07textview.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFArray.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFChunkInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFConstants.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFDeflateCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFDeprecated.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFIMCOMPCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFJavaException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFJPEGCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFLibrary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFLibraryException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNativeData.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNBITChunkInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNBITCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNewCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFNotImplementedException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFOldCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFOldRLECompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFRLECompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFSKPHUFFCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFSZIPCompInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/HDFTable.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdflib/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/Callbacks.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5D_iterate_cb.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5D_iterate_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5L_iterate_cb.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5L_iterate_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5O_iterate_cb.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/H5O_iterate_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5AtomException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5AttributeException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5BtreeException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DataFiltersException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DatasetInterfaceException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DataspaceInterfaceException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DataStorageException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5DatatypeInterfaceException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5Exception.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ExternalFileListException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5FileInterfaceException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5FunctionArgumentException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5FunctionEntryExitException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5HeapException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5InternalErrorException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5JavaException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5LibraryException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5LowLevelIOException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5MetaDataCacheException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ObjectHeaderException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5PropertyListInterfaceException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ReferenceException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5ResourceUnavailableException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/HDF5SymbolTableException.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5_ih_info_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5A_info_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5AC_cache_config_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5G_info_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5L_info_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5O_hdr_info_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/H5O_info_t.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/H5.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDF5Constants.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDF5GroupInfo.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDFArray.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/HDFNativeData.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Attribute.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/CompoundDS.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/DataFormat.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Dataset.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Datatype.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/FileFormat.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Group.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/HObject.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/Metadata.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/ScalarDS.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4Datatype.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4File.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4GRImage.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4Group.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4SDS.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/H4Vdata.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h4/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5CompoundDS.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5Datatype.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5File.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5Group.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5Link.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/H5ScalarDS.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/h5/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/package-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/package-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/ncsa/hdf/object/package-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/package-list +%%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/constant-values.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/serialized-form.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/inherit.gif +%%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-tree.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/index-all.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/deprecated-list.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/allclasses-frame.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/allclasses-noframe.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/index.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-summary.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/help-doc.html +%%PORTDOCS%%%%DOCSDIR%%/javadocs/stylesheet.css share/java/classes/ext/fitsobj.jar share/java/classes/ext/nc2obj.jar share/java/classes/fits.jar @@ -70,11 +196,20 @@ share/java/classes/jhdf5obj.jar share/java/classes/jhdfobj.jar share/java/classes/jhdfview.jar -share/java/classes/junit.jar share/java/classes/netcdf.jar -@dirrm share/java/classes/ext +@dirrmtry share/java/classes/ext %%PORTDOCS%%@dirrm %%DOCSDIR%%/UsersGuide/images %%PORTDOCS%%@dirrm %%DOCSDIR%%/UsersGuide +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/resources +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/object/h5 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/object/h4 +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/object +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/structs +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/exceptions +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib/callbacks +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdf5lib +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf/hdflib +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa/hdf +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs/ncsa +%%PORTDOCS%%@dirrm %%DOCSDIR%%/javadocs %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm UsersGuide -@exec mkdir -p %D/UsersGuide Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile.in 21 Dec 2011 23:03:11 -0000 @@ -0,0 +1,76 @@ +--- ./Makefile.in.orig 2011-11-29 12:19:58.000000000 -0800 ++++ ./Makefile.in 2011-12-21 15:03:05.000000000 -0800 +@@ -283,18 +283,8 @@ + uninstall: uninstall-jhdfview uninstall-jhdfobj uninstall-lib uninstall-jhi uninstall-jhi5 + + install-lib: natives +- -mkdir -p $(LIBDIR); +- -mkdir -p $(LIBDIR)/@JAVATARG@ + @if test -n "$(H5INC)" ; then \ +- cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi +- @if test -n "$(H5INC)/../lib" ; then \ +- cp $(H5INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi +- @if test -n "$(H4INC)" ; then \ +- cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi +- @if test -n "$(H4INC)/../lib" ; then \ +- cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi +- @if test -n "$(H45INC)" ; then \ +- cp $(CLASS_DIR)/@JAVATARG@/libjh4toh5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi ++ INSTALL_LIB $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/ ; fi + @echo "Install Natives complete" + + install-hdflib: +@@ -325,7 +315,6 @@ + @if test -n "$(H4INC)" ; then $(MAKE) do-install-jhdf ; fi + + do-install-jhdf: jhdf-packages +- -mkdir -p $(LIBDIR); + $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES) + @echo "Install JHI complete" + +@@ -333,42 +322,30 @@ + @if test -n "$(H5INC)" ; then $(MAKE) do-install-jhdf5 ; fi + + do-install-jhdf5: jhdf5-packages +- -mkdir -p $(LIBDIR); + $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES) + @echo "Install JHI5 complete" + + install-jhdfobj: ncsa.hdf.object +- -mkdir -p $(LIBDIR); + $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES) + @if test -n "$(H4INC)" ; then $(MAKE) do-install-jhdf4obj ; fi + @if test -n "$(H5INC)" ; then $(MAKE) do-install-jhdf5obj ; fi + @echo "Install HDFOBJ complete" + + do-install-jhdf4obj: ncsa.hdf.object.h4 +- -mkdir -p $(LIBDIR); + $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES) + @echo "Install JHDF4 complete" + + do-install-jhdf5obj: ncsa.hdf.object.h5 +- -mkdir -p $(LIBDIR); + $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES) + @echo "Install JHDF4 complete" + + install-jhdfview: ncsa.hdf.view +- -mkdir -p $(LIBDIR); + $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS) +- -mkdir -p $(LIBDIR)/ext ++ -mkdir -p $(JH45INSTALLDIR)/lib/ext + $(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES) + $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES) +- $(RM) -rf $(UGDIR); +- -mkdir -p $(UGDIR); +- cp -R docs/hdfview/UsersGuide/* $(UGDIR); +- $(RM) -rf $(UGDIR)/.svn +- $(RM) -rf $(UGDIR)/images/.svn +- -mkdir -p $(BINDIR); +- cp lib/netcdf.jar $(LIBDIR) +- cp lib/fits.jar $(LIBDIR) +- cp lib/junit.jar $(LIBDIR) ++ cp lib/netcdf.jar $(JH45INSTALLDIR)/lib ++ cp lib/fits.jar $(JH45INSTALLDIR)/lib + cp bin/hdfview.sh $(BINDIR) + chmod a+x $(BINDIR)/hdfview.sh + @echo "Install HDFVIEW complete" Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/science/hdf-java/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- files/patch-configure 4 Nov 2010 13:05:36 -0000 1.1 +++ files/patch-configure 21 Dec 2011 23:18:33 -0000 @@ -1,28 +1,28 @@ ---- configure.orig 2010-11-01 02:54:27.000000000 -0700 -+++ configure 2010-11-01 02:56:20.000000000 -0700 +--- ./configure.orig 2011-12-21 15:16:44.000000000 -0800 ++++ ./configure 2011-12-21 15:18:28.000000000 -0800 @@ -4424,12 +4424,6 @@ - if test \( ! -d "$JH45INST" \); then - JH45INST_FOUND=0 - fi -- if test \( ! -w "$JH45INST" \); then -- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5 + if test \( ! -d "$JH45INST" \); then + JH45INST_FOUND=0 + fi +- if test \( ! -w "$JH45INST" \); then +- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5 -echo "$as_me: error: $JAVINST : not writable " >&2;} - { (exit 1); exit 1; }; } -- JH45INST_FOUND=0 -- fi +- JH45INST_FOUND=0 +- fi fi until test $JH45INST_FOUND -eq 1; do - echo "Please type the directory in which to install the JH45" + echo "Please type the directory in which to install the JH45" @@ -4438,12 +4432,6 @@ - if test \( ! -d "$JH45INST" \); then - JH45INST_FOUND=0 - fi -- if test \( ! -w "$JH45INST" \); then -- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5 + if test \( ! -d "$JH45INST" \); then + JH45INST_FOUND=0 + fi +- if test \( ! -w "$JH45INST" \); then +- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5 -echo "$as_me: error: $JAVINST : not writable " >&2;} - { (exit 1); exit 1; }; } -- JH45INST_FOUND=0 -- fi +- JH45INST_FOUND=0 +- fi done ac_cv_lib_JH45INST=$JH45INST >Release-Note: >Audit-Trail: >Unformatted: