update to 4.2r4

changes:
-API additions
-hdp and hrepack utilities can now display more compression information
-build system updates
-bugfixes

pkgsrc notes:
-we build shared libraries now although it is officially unsupported
 if Fortran is enabled (works for me)
-The 24-bit-jpeg selftest fails. It also failed with the previous
 version. (perhaps jpeg-7 related?) The test contains too much magic
 to tell what happens.

4 files changed, 96 insertions, 85 deletions

diff --git a/devel/hdf/patches/patch-aa b/devel/hdf/patches/patch-aa
deleted file mode 100644
index 2d181d87460..00000000000
--- a/devel/hdf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/09 19:27:19 joerg Exp $
-
---- mfhdf/hdiff/Makefile.in.orig	2006-01-09 19:22:02.000000000 +0000
-+++ mfhdf/hdiff/Makefile.in
-@@ -189,7 +189,7 @@ am_hdiff_OBJECTS = hdiff.$(OBJEXT) hdiff
- 	hdiff_misc.$(OBJEXT) hdiff_sds.$(OBJEXT) hdiff_table.$(OBJEXT) \
- 	hdiff_vs.$(OBJEXT)
- hdiff_OBJECTS = $(am_hdiff_OBJECTS)
--hdiff_LDFLAGS =
-+hdiff_LDFLAGS = -lm
- am_hdifftst_OBJECTS = hdifftst.$(OBJEXT)
- hdifftst_OBJECTS = $(am_hdifftst_OBJECTS)
- hdifftst_LDFLAGS =
diff --git a/devel/hdf/patches/patch-ai b/devel/hdf/patches/patch-ai
index dbdd13580d4..a74d326a88a 100644
--- a/devel/hdf/patches/patch-ai
+++ b/devel/hdf/patches/patch-ai
@@ -1,48 +1,48 @@
-$NetBSD: patch-ai,v 1.7 2004/04/20 18:14:37 drochner Exp $
+$NetBSD: patch-ai,v 1.8 2009/12/10 17:10:14 drochner Exp $
 
---- mfhdf/ncdump/Makefile.in.orig	2003-11-07 19:39:00.000000000 +0100
-+++ mfhdf/ncdump/Makefile.in	2004-04-20 16:38:54.000000000 +0200
-@@ -156,7 +156,7 @@
- #############################################################################
- #############################################################################
- bin_PROGRAMS = ncdump
--man1_MANS = ncdump.1
-+man1_MANS = hdfncdump.1
- 
- ncdump_SOURCES = dumplib.c ncdump.c vardata.c
- ncdump_LDADD = ../libsrc/libmfhdf.a $(top_builddir)/hdf/src/libdf.a
-@@ -171,7 +171,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/hdf/src/h4config.h
- CONFIG_CLEAN_FILES =
+--- mfhdf/ncdump/Makefile.in.orig	2008-10-13 21:39:11.000000000 +0200
++++ mfhdf/ncdump/Makefile.in
+@@ -37,7 +37,7 @@ build_triplet = @build@
+ host_triplet = @host@
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/config/commence.am
 -bin_PROGRAMS = ncdump$(EXEEXT)
 +bin_PROGRAMS = hdfncdump$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
+ subdir = mfhdf/ncdump
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -216,7 +216,7 @@ INCLUDES = -I$(top_srcdir)/hdf/src      
  
- am_ncdump_OBJECTS = dumplib.$(OBJEXT) ncdump.$(OBJEXT) vardata.$(OBJEXT)
-@@ -227,7 +227,7 @@
- 
- clean-binPROGRAMS:
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ DEFINES = -DNDEBUG -DHDF
+ AM_CPPFLAGS = $(INCLUDES) $(DEFINES)
+-man1_MANS = ncdump.1
++man1_MANS = hdfncdump.1
+ ncdump_SOURCES = dumplib.c ncdump.c vardata.c
+ ncdump_LDADD = ../libsrc/libmfhdf.la $(top_builddir)/hdf/src/libdf.la
+ ncdump_DEPENDENCIES = $(top_builddir)/hdf/src/libdf.la ../libsrc/libmfhdf.la
+@@ -285,7 +285,7 @@ clean-binPROGRAMS:
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
 -ncdump$(EXEEXT): $(ncdump_OBJECTS) $(ncdump_DEPENDENCIES) 
 +hdfncdump$(EXEEXT): $(ncdump_OBJECTS) $(ncdump_DEPENDENCIES) 
  	@rm -f ncdump$(EXEEXT)
- 	$(LINK) $(ncdump_LDFLAGS) $(ncdump_OBJECTS) $(ncdump_LDADD) $(LIBS)
+ 	$(LINK) $(ncdump_OBJECTS) $(ncdump_LDADD) $(LIBS)
  
-@@ -491,11 +491,11 @@
- 	uninstall-man uninstall-man1
+@@ -554,11 +554,11 @@ uninstall-man: uninstall-man1
+ 	uninstall-man1
  
  
 -check: ncdump $(srcdir)/test0.cdl
--	../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
--	./ncdump test0.nc > test1.cdl
--	../ncgen/ncgen -o test1.nc -n test1.cdl
--	./ncdump -n test0 test1.nc > test2.cdl
+-	$(TESTS_ENVIRONMENT) ../ncgen/ncgen -o test0.nc -n $(srcdir)/test0.cdl
+-	$(TESTS_ENVIRONMENT) ./ncdump test0.nc > test1.cdl
+-	$(TESTS_ENVIRONMENT) ../ncgen/ncgen -o test1.nc -n test1.cdl
+-	$(TESTS_ENVIRONMENT) ./ncdump -n test0 test1.nc > test2.cdl
 +check: hdfncdump $(srcdir)/test0.cdl
-+	../ncgen/hdfncgen -o test0.nc -n $(srcdir)/test0.cdl
-+	./hdfncdump test0.nc > test1.cdl
-+	../ncgen/hdfncgen -o test1.nc -n test1.cdl
-+	./hdfncdump -n test0 test1.nc > test2.cdl
++	$(TESTS_ENVIRONMENT) ../ncgen/hdfncgen -o test0.nc -n $(srcdir)/test0.cdl
++	$(TESTS_ENVIRONMENT) ./hdfncdump test0.nc > test1.cdl
++	$(TESTS_ENVIRONMENT) ../ncgen/hdfncgen -o test1.nc -n test1.cdl
++	$(TESTS_ENVIRONMENT) ./hdfncdump -n test0 test1.nc > test2.cdl
  	@cmp test1.cdl test2.cdl && echo "*** ncdump test successful ***" ;     \
  	    rm -f test1.nc test1.cdl test2.cdl
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/devel/hdf/patches/patch-aj b/devel/hdf/patches/patch-aj
index 76401693f94..2ecead1679c 100644
--- a/devel/hdf/patches/patch-aj
+++ b/devel/hdf/patches/patch-aj
@@ -1,58 +1,82 @@
-$NetBSD: patch-aj,v 1.7 2005/02/24 16:25:38 adam Exp $
+$NetBSD: patch-aj,v 1.8 2009/12/10 17:10:14 drochner Exp $
 
---- mfhdf/ncgen/Makefile.in.orig	2004-12-06 23:20:34.000000000 +0000
+--- mfhdf/ncgen/Makefile.in.orig	2008-10-13 21:39:11.000000000 +0200
 +++ mfhdf/ncgen/Makefile.in
-@@ -169,7 +169,7 @@ ncgen_DEPENDENCIES = $(top_builddir)/hdf
+@@ -37,7 +37,7 @@ build_triplet = @build@
+ host_triplet = @host@
+ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/config/commence.am
+-bin_PROGRAMS = ncgen$(EXEEXT)
++bin_PROGRAMS = hdfncgen$(EXEEXT)
+ @HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_NETCDF_TRUE@noinst_PROGRAMS = ctest0$(EXEEXT)
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@noinst_PROGRAMS = ctest0$(EXEEXT) \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@	ftest0$(EXEEXT)
+@@ -242,11 +242,11 @@ ftest0_SOURCES = 
  
  #############################################################################
  #############################################################################
 -man1_MANS = ncgen.1
 +man1_MANS = hdfncgen.1
  
+ #############################################################################
+ #############################################################################
+-NCDUMP = ../ncdump/ncdump
++NCDUMP = ../ncdump/hdfncdump
  
  #############################################################################
-@@ -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)
- @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)
+ #############################################################################
+@@ -328,7 +328,7 @@ clean-noinstPROGRAMS:
+ @HDF_BUILD_NETCDF_FALSE@ftest0$(EXEEXT): $(ftest0_OBJECTS) $(ftest0_DEPENDENCIES) 
+ @HDF_BUILD_NETCDF_FALSE@	@rm -f ftest0$(EXEEXT)
+ @HDF_BUILD_NETCDF_FALSE@	$(LINK) $(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)
+ 	$(LINK) $(ncgen_OBJECTS) $(ncgen_LDADD) $(LIBS)
+ 
+@@ -613,13 +613,13 @@ ncgenyy.c: ncgen.l
+ 	$(LEX) $(srcdir)/ncgen.l
+ 	mv lex.yy.c ncgenyy.c
+ 
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@check: ncgen $(srcdir)/test0.cdl b-check c-check f-check
+-@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_NETCDF_TRUE@check: ncgen $(srcdir)/test0.cdl b-check c-check
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@check: hdfncgen $(srcdir)/test0.cdl b-check c-check f-check
++@HDF_BUILD_FORTRAN_FALSE@@HDF_BUILD_NETCDF_TRUE@check: hdfncgen $(srcdir)/test0.cdl b-check c-check
  
-@@ -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_NETCDF_FALSE@check: ncgen $(srcdir)/test0.cdl b-check c-check
++@HDF_BUILD_NETCDF_FALSE@check: hdfncgen $(srcdir)/test0.cdl b-check c-check
  
--@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)
+-b-check:	ncgen $(srcdir)/test0.cdl test1.cdl
+-	$(TESTS_ENVIRONMENT) ./ncgen -b test1.cdl
++b-check:	hdfncgen $(srcdir)/test0.cdl test1.cdl
++	$(TESTS_ENVIRONMENT) ./hdfncgen -b test1.cdl
+ 	$(TESTS_ENVIRONMENT) $(NCDUMP) test1.nc > test2.cdl
+ 	@if $(DIFF) test1.cdl test2.cdl; then                               \
+ 	  echo "*** ncgen -b test successful ***";                          \
+@@ -645,8 +645,8 @@ c-check:	test2.cdl ctest0
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@	  echo "*** ncgen -f test failed (but roundoff differences are OK) ***"; \
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@	fi
+ 
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ftest0$(EXEEXT):		ncgen test0.cdl netcdf.inc
+-@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@	$(TESTS_ENVIRONMENT) ./ncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@ftest0$(EXEEXT):		hdfncgen test0.cdl netcdf.inc
++@HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@	$(TESTS_ENVIRONMENT) ./hdfncgen -f -o ftest0.nc $(srcdir)/test0.cdl > test0.f
+ @HDF_BUILD_FORTRAN_TRUE@@HDF_BUILD_NETCDF_TRUE@	$(F77) $(FFLAGS) -o $@ test0.f $(LDFLAGS) $(SHLIBLOC) $(LIBS)
  
  netcdf.inc:
-@@ -591,11 +591,11 @@ netcdf.inc:
+@@ -655,11 +655,11 @@ netcdf.inc:
  test1.cdl:	test0.nc
- 	$(NCDUMP) -n test1 test0.nc > $@
+ 	$(TESTS_ENVIRONMENT) $(NCDUMP) -n test1 test0.nc > $@
  
 -test0.nc:	ncgen $(srcdir)/test0.cdl
--	./ncgen -b -o test0.nc $(srcdir)/test0.cdl
+-	$(TESTS_ENVIRONMENT) ./ncgen -b -o test0.nc $(srcdir)/test0.cdl
 +test0.nc:	hdfncgen $(srcdir)/test0.cdl
-+	./hdfncgen -b -o test0.nc $(srcdir)/test0.cdl
++	$(TESTS_ENVIRONMENT) ./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)
+-ctest0$(EXEEXT):		ncgen $(srcdir)/test0.cdl
+-	$(TESTS_ENVIRONMENT) ./ncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
++ctest0$(EXEEXT):		hdfncgen $(srcdir)/test0.cdl
++	$(TESTS_ENVIRONMENT) ./hdfncgen -c -o ctest0.nc $(srcdir)/test0.cdl > test0.c
+ 	$(COMPILE) -c -o ctest0$(EXEEXT).o test0.c
+ 	$(LINK) ctest0$(EXEEXT).o $(ctest0_LDADD) $(LDFLAGS) $(SHLIBLOC) $(LIBS)
  
- #############################################################################
diff --git a/devel/hdf/patches/patch-ap b/devel/hdf/patches/patch-ap
index de4c17a1a2f..371e30b6bb6 100644
--- a/devel/hdf/patches/patch-ap
+++ b/devel/hdf/patches/patch-ap
@@ -1,12 +1,12 @@
-$NetBSD: patch-ap,v 1.2 2004/04/20 18:14:37 drochner Exp $
+$NetBSD: patch-ap,v 1.3 2009/12/10 17:10:14 drochner Exp $
 
---- hdf/src/hconv.h.orig	2003-11-01 01:17:13.000000000 +0100
-+++ hdf/src/hconv.h	2004-04-20 14:29:46.000000000 +0200
+--- hdf/src/hconv.h.orig	2007-09-07 19:17:23.000000000 +0200
++++ hdf/src/hconv.h
 @@ -63,7 +63,7 @@
  /* CONSTANT DEFINITIONS                                                      */
  /*****************************************************************************/
  /* Generally Big-Endian machines */
--#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !defined(__ia64) && !defined(__x86_64__)
+-#if !defined(VMS) && !defined(INTEL86) && !defined(MIPSEL) && !defined(DEC_ALPHA) && !defined(I860) && !defined(SUN386) && !(defined(__ia64) && !(defined(hpux) || defined(__hpux))) && !defined(__x86_64__)
 +#if BYTE_ORDER == BIG_ENDIAN
  #   if !defined(UNICOS)
  #       define UI8_IN     DFKnb1b   /* Unsigned Integer, 8 bits */