From 0f2c6aa292c93babb86dc8e48b9f651923bd51e0 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 24 Feb 2005 16:25:38 +0000 Subject: Changes 4.2r1: Configuration * By default HDF4 libraries and utilities are installed under /NewHDF * Windows configuration, build and testing procedures have been changed. Please see INSTALL_WINDOWS.txt file for more information Library * New API SDidtype was added to the library (bug #766) * HCgetcompress renamed to HCPgetcompress * New API HCget_config_info added * The default chunk cache size was changed for 2D and higher chunks * Pablo instumentation was removed Utilities * hdiff and hrepack are supported on Windows. * Substantial performance improvements in hdiff and hrepack Support for new platforms and compilers * Fortran IBM xlf v 8.1 and Absoft f95 version 8.2 compilers are supported on Mac OSX. * Absoft Fortran compiler f95 version 9.0 is supported on Linux 2.4 * PGI C and Fortran compilers are supported on Linux 2.4 * Intel C and Fortran compilers are supported on Linux 2.4 * Cray TS IEEE is supported. Bugs fixed since HDF4.2r0 * VERY IMPORTANT: Data compressed with SZIP may be corrupted; fixed. For more information see "HDF4.2r1 SZIP Release Notes" available at http://hdf.ncsa.uiuc.edu/doc_resource/SZIP/SZIP_HDF4_2r1.pdf * Fortran couldn't read names with spaces when NetCDF interfaces were used; fixed * Library failed to compile in presence of the NetCDF library; fixed * h4fc couldn't create object files; fixed * When rank of SDS is 0, some SD APIs give segmentation fault (bug 1045); fixed * Some GR images with special elements are read in as duplicate (bug 814); fixed * Many bugs fixed in hdiff and hrepack utilities --- devel/hdf/Makefile | 28 ++++++++++++++----------- devel/hdf/PLIST | 7 +++---- devel/hdf/distinfo | 14 ++++++------- devel/hdf/patches/patch-aj | 51 +++++++++++++++++++++++++++++++++++----------- devel/hdf/patches/patch-ao | 10 ++++----- devel/hdf/patches/patch-ba | 8 ++++---- 6 files changed, 74 insertions(+), 44 deletions(-) (limited to 'devel/hdf') diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile index 6a6c731fcc3..0e951d39a2e 100644 --- a/devel/hdf/Makefile +++ b/devel/hdf/Makefile @@ -1,20 +1,23 @@ -# $NetBSD: Makefile,v 1.20 2005/01/12 15:31:59 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/02/24 16:25:38 adam Exp $ -DISTNAME= HDF4.2r0 -PKGNAME= hdf-4.2r0 -PKGREVISION= 1 -CATEGORIES= devel -MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.2r0/src/ +DISTNAME= HDF4.2r1 +PKGNAME= hdf-4.2r1 +CATEGORIES= devel +MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.2r1/src/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html -COMMENT= NCSA Hierarchical Data Format +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://hdf.ncsa.uiuc.edu/hdf4.html +COMMENT= NCSA Hierarchical Data Format + +#BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison +#YACC= ${PREFIX}/bin/bison -USE_LANGUAGES= fortran USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make +USE_LANGUAGES= c fortran GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-szlib CONFIGURE_ARGS+= --includedir=${PREFIX}/include/hdf +CONFIGURE_ARGS+= --with-szlib post-patch: ${MV} -f ${WRKSRC}/mfhdf/ncdump/ncdump.1 \ @@ -28,7 +31,8 @@ do-test: @cd ${WRKSRC}/mfhdf/ncdump && ${SETENV} ${MAKE_ENV} ${MAKE} check @cd ${WRKSRC}/mfhdf/nctest && ${SETENV} ${MAKE_ENV} ${MAKE} check +.include "../../archivers/szip/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" -.include "../../archivers/szip/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/devel/hdf/PLIST b/devel/hdf/PLIST index ca685b8b844..c07e3c8a2db 100644 --- a/devel/hdf/PLIST +++ b/devel/hdf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2004/04/20 18:14:37 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2005/02/24 16:25:38 adam Exp $ bin/gif2hdf bin/h4cc bin/h4fc @@ -11,6 +11,8 @@ bin/hdfcomp bin/hdfed bin/hdfimport bin/hdfls +bin/hdfncdump +bin/hdfncgen bin/hdfpack bin/hdftopal bin/hdftor8 @@ -19,8 +21,6 @@ bin/hdiff bin/hdp bin/hrepack bin/jpeg2hdf -bin/hdfncdump -bin/hdfncgen bin/paltohdf bin/r8tohdf bin/ristosds @@ -77,7 +77,6 @@ include/hdf/vattr.h include/hdf/vg.h lib/libdf.a lib/libmfhdf.a -lib/libudport.a man/man1/hdf.1 man/man1/hdfncdump.1 man/man1/hdfncgen.1 diff --git a/devel/hdf/distinfo b/devel/hdf/distinfo index 774b985a24a..1362171d5f2 100644 --- a/devel/hdf/distinfo +++ b/devel/hdf/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 22:24:16 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/02/24 16:25:38 adam Exp $ -SHA1 (HDF4.2r0.tar.gz) = 499d8c249a18a78ae81fe1d80095290ffc4d8b54 -RMD160 (HDF4.2r0.tar.gz) = 3d9608721a55b250e9b2793402bb3357d7b79715 -Size (HDF4.2r0.tar.gz) = 3712651 bytes +SHA1 (HDF4.2r1.tar.gz) = 8a9259a22180204a27d8dca3581614066fc6dcd3 +RMD160 (HDF4.2r1.tar.gz) = 1a0b7b4bf2a60d32d1e3ed69d40bf23dce912331 +Size (HDF4.2r1.tar.gz) = 3911745 bytes SHA1 (patch-ai) = ca2ea7f69d201fb5fd9b4b43201b96aec5c9c0d8 -SHA1 (patch-aj) = 848515c038b1c89abc3f4aaad7c816e4429a3780 -SHA1 (patch-ao) = 313ea577ddc7c6f55bd8536dc34625c232ebd168 +SHA1 (patch-aj) = a3e96cdeebfaf54b25df94742d1fd9a13b85362f +SHA1 (patch-ao) = cf461ca847ddef05c4876fe3527beda3242ee2f2 SHA1 (patch-ap) = b7d704321653cbf95d8784c6364b880bdc8d67df SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06 SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de -SHA1 (patch-ba) = a54063eec83563a7ee785ad6120beba4e096ef1a +SHA1 (patch-ba) = a5df16f8f577d8ce45e590e37f24ade88684afda diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj index 8ca1cb14733..76401693f94 100644 --- a/devel/hdf/patches/patch-aj +++ b/devel/hdf/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.6 2004/04/20 18:14:37 drochner Exp $ +$NetBSD: patch-aj,v 1.7 2005/02/24 16:25:38 adam Exp $ ---- mfhdf/ncgen/Makefile.in.orig 2003-11-07 19:39:04.000000000 +0100 -+++ mfhdf/ncgen/Makefile.in 2004-04-20 15:53:32.000000000 +0200 -@@ -166,7 +166,7 @@ +--- mfhdf/ncgen/Makefile.in.orig 2004-12-06 23:20:34.000000000 +0000 ++++ mfhdf/ncgen/Makefile.in +@@ -169,7 +169,7 @@ ncgen_DEPENDENCIES = $(top_builddir)/hdf ############################################################################# ############################################################################# @@ -11,21 +11,48 @@ $NetBSD: patch-aj,v 1.6 2004/04/20 18:14:37 drochner Exp $ ############################################################################# -@@ -185,7 +185,7 @@ +@@ -188,7 +188,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/hdf/src/h4config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = ncgen$(EXEEXT) +bin_PROGRAMS = hdfncgen$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - am_ncgen_OBJECTS = close.$(OBJEXT) escapes.$(OBJEXT) generate.$(OBJEXT) \ -@@ -246,7 +246,7 @@ - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) + @HDF_BUILD_FORTRAN_TRUE@noinst_PROGRAMS = ctest0$(EXEEXT) \ + @HDF_BUILD_FORTRAN_TRUE@ ftest0$(EXEEXT) + @HDF_BUILD_FORTRAN_FALSE@noinst_PROGRAMS = ctest0$(EXEEXT) +@@ -269,7 +269,7 @@ clean-noinstPROGRAMS: + @HDF_BUILD_FORTRAN_FALSE@ftest0$(EXEEXT): $(ftest0_OBJECTS) $(ftest0_DEPENDENCIES) + @HDF_BUILD_FORTRAN_FALSE@ @rm -f ftest0$(EXEEXT) + @HDF_BUILD_FORTRAN_FALSE@ $(LINK) $(ftest0_LDFLAGS) $(ftest0_OBJECTS) $(ftest0_LDADD) $(LIBS) -ncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES) +hdfncgen$(EXEEXT): $(ncgen_OBJECTS) $(ncgen_DEPENDENCIES) @rm -f ncgen$(EXEEXT) $(LINK) $(ncgen_LDFLAGS) $(ncgen_OBJECTS) $(ncgen_LDADD) $(LIBS) +@@ -581,8 +581,8 @@ c-check: test2.cdl ctest0 + @HDF_BUILD_FORTRAN_TRUE@ echo "*** ncgen -f test failed (but roundoff differences are OK) ***"; \ + @HDF_BUILD_FORTRAN_TRUE@ fi + +-@HDF_BUILD_FORTRAN_TRUE@ftest0: ncgen test0.cdl netcdf.inc +-@HDF_BUILD_FORTRAN_TRUE@ ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f ++@HDF_BUILD_FORTRAN_TRUE@ftest0: hdfncgen test0.cdl netcdf.inc ++@HDF_BUILD_FORTRAN_TRUE@ ./hdfncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f + @HDF_BUILD_FORTRAN_TRUE@ $(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(ncgen_LDADD) $(LIBS) + + netcdf.inc: +@@ -591,11 +591,11 @@ netcdf.inc: + test1.cdl: test0.nc + $(NCDUMP) -n test1 test0.nc > $@ + +-test0.nc: ncgen $(srcdir)/test0.cdl +- ./ncgen -b -o test0.nc $(srcdir)/test0.cdl ++test0.nc: hdfncgen $(srcdir)/test0.cdl ++ ./hdfncgen -b -o test0.nc $(srcdir)/test0.cdl + +-ctest0: ncgen $(srcdir)/test0.cdl +- ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c ++ctest0: hdfncgen $(srcdir)/test0.cdl ++ ./hdfncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c + $(COMPILE) -o $@ test0.c $(LDFLAGS) $(ncgen_LDADD) $(LIBS) + + ############################################################################# diff --git a/devel/hdf/patches/patch-ao b/devel/hdf/patches/patch-ao index bfed43b210b..73d6d210ef7 100644 --- a/devel/hdf/patches/patch-ao +++ b/devel/hdf/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.6 2004/04/20 18:14:37 drochner Exp $ +$NetBSD: patch-ao,v 1.7 2005/02/24 16:25:38 adam Exp $ ---- hdf/src/hdfi.h.orig 2003-11-01 01:17:14.000000000 +0100 -+++ hdf/src/hdfi.h 2004-04-20 17:02:01.000000000 +0200 -@@ -153,6 +153,8 @@ +--- hdf/src/hdfi.h.orig 2005-01-25 03:36:44.000000000 +0000 ++++ hdf/src/hdfi.h +@@ -147,6 +147,8 @@ * Define options for each platform *-------------------------------------------------------------------------*/ @@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.6 2004/04/20 18:14:37 drochner Exp $ /* * Meaning of each defined macros (not completed yet) * -@@ -1384,6 +1386,71 @@ +@@ -1386,6 +1388,71 @@ typedef long hdf_pint_t; #endif /* IA64 */ diff --git a/devel/hdf/patches/patch-ba b/devel/hdf/patches/patch-ba index 74d066f0371..2ddd1b23808 100644 --- a/devel/hdf/patches/patch-ba +++ b/devel/hdf/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.1 2004/04/20 18:14:37 drochner Exp $ +$NetBSD: patch-ba,v 1.2 2005/02/24 16:25:38 adam Exp $ ---- configure.orig 2004-04-20 14:41:07.000000000 +0200 -+++ configure 2004-04-20 14:41:38.000000000 +0200 -@@ -7512,6 +7512,7 @@ +--- configure.orig 2005-02-08 18:29:27.000000000 +0000 ++++ configure +@@ -7515,6 +7515,7 @@ case "$host" in mips*-sgi-irix4*) BAR="irix4" ;; *-linux*) BAR="linux" ;; *-freebsd*) BAR="fbsd" ;; -- cgit v1.2.3