Changes 1.6.7:

* Bug fixes
* Improvements

6 files changed, 27 insertions, 30 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 4634fb675b4..9f6ec4878d3 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.40 2008/05/26 02:13:17 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2008/09/11 10:27:52 adam Exp $
 
-DISTNAME=	hdf5-1.6.6
+DISTNAME=	hdf5-1.6.7
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current/src/
+MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current16/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hdf.ncsa.uiuc.edu/HDF5/
 COMMENT=	Hierarchical Data Format (new generation)
 
-DIST_SUBDIR=		${PKGNAME_NOREV}
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pax tr
 GNU_CONFIGURE=		yes
 TEST_TARGET=		check
-#CONFIGURE_ARGS+= --disable-production --enable-debug
 
 # it appears that this file is informative only and is not actually
 # used by any installed tools
@@ -21,7 +19,9 @@ CHECK_WRKREF_SKIP=	${PREFIX}/lib/libhdf5.settings
 
 .include "options.mk"
 
-INSTALL_ENV+=	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+INSTALL_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+INSTALLATION_DIRS+=	share/doc/hdf5
+INSTALLATION_DIRS+=	share/doc/hdf5/html
 
 post-extract:
 	${CP} ${WRKSRC}/config/freebsd ${WRKSRC}/config/netbsd
@@ -30,10 +30,8 @@ post-extract:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5cc ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5redeploy.in ${PREFIX}/bin/h5redeploy
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hdf5
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING release_docs/HISTORY.txt \
 		release_docs/RELEASE.txt ${PREFIX}/share/doc/hdf5
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hdf5/html
 	# avoid installing the Makefile and Makefile.in's  They are not needed
 	cd ${WRKSRC}/doc/html && pax -s '/.*Makefile.*//' -rwpm . ${PREFIX}/share/doc/hdf5/html
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/hdf5/html
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index 05039e25428..6ceff4b0196 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:42:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/09/11 10:27:52 adam Exp $
 bin/gif2h5
 bin/h52gif
 ${PLIST.cxx}bin/h5c++
@@ -31,7 +31,6 @@ include/H5FDpublic.h
 include/H5FDsec2.h
 include/H5FDsrb.h
 include/H5FDstdio.h
-include/H5FDstream.h
 include/H5Fpublic.h
 include/H5Gpublic.h
 include/H5HGpublic.h
diff --git a/devel/hdf5/distinfo b/devel/hdf5/distinfo
index 9d101d25f61..3425a5b5a2c 100644
--- a/devel/hdf5/distinfo
+++ b/devel/hdf5/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.22 2007/09/25 01:22:15 dmcmahill Exp $
+$NetBSD: distinfo,v 1.23 2008/09/11 10:27:52 adam Exp $
 
-SHA1 (hdf5-1.6.6/hdf5-1.6.6.tar.gz) = c8a9ec598cf0debb694a1d7034fd85bbd67f173b
-RMD160 (hdf5-1.6.6/hdf5-1.6.6.tar.gz) = e7cf3f8d6aa5f34ef10cabf650ed43d644e54f1b
-Size (hdf5-1.6.6/hdf5-1.6.6.tar.gz) = 5299558 bytes
-SHA1 (patch-aa) = 794ab1e1fbb41281c4b28a333f4bd91d37513084
+SHA1 (hdf5-1.6.7/hdf5-1.6.7.tar.gz) = 9c26fe09cdad269c9a6757933f70ca164a47b8e8
+RMD160 (hdf5-1.6.7/hdf5-1.6.7.tar.gz) = 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6
+Size (hdf5-1.6.7/hdf5-1.6.7.tar.gz) = 5299219 bytes
+SHA1 (patch-aa) = 7c035a6821e02ad79569022507b01f73324ac87d
 SHA1 (patch-ab) = aa4911184b72d4818f6e65d3adf86110db9bd379
-SHA1 (patch-ac) = 96c59a3694e0b80a2d321fed0af0b75d6b082462
-SHA1 (patch-ad) = 4379aaf79ce58b12b69fad2419d44bee514c2a8c
+SHA1 (patch-ac) = 77e3762e4e41274550cb1a25f4a1c2ffaa45dcdf
+SHA1 (patch-ad) = c0aa25378c987ca3675566ccab8bab246def1d53
 SHA1 (patch-ba) = 1ba84ee22c3307100a2c8d3df4dfb2037be8e773
 SHA1 (patch-bb) = bcfd87df515d64471f881d4d10c894d89a6bc56e
 SHA1 (patch-bc) = 05e84e19b15bb9eee771e5be8e397959ae40ca9c
diff --git a/devel/hdf5/patches/patch-aa b/devel/hdf5/patches/patch-aa
index 919cfd6c7a8..84f09c18836 100644
--- a/devel/hdf5/patches/patch-aa
+++ b/devel/hdf5/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2005/11/29 10:03:39 adam Exp $
+$NetBSD: patch-aa,v 1.9 2008/09/11 10:27:52 adam Exp $
 
---- config/commence.in.orig	2005-10-28 22:15:26.000000000 +0200
+--- config/commence.in.orig	2008-02-01 04:04:06.000000000 +0100
 +++ config/commence.in
-@@ -78,7 +78,7 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM
+@@ -79,7 +79,7 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM
  ## defined. The main makefile is free to redefine these to something else.
  DOCDIR=$(docdir)
  SUBDOCDIR=
diff --git a/devel/hdf5/patches/patch-ac b/devel/hdf5/patches/patch-ac
index 869c23288c5..00a68960584 100644
--- a/devel/hdf5/patches/patch-ac
+++ b/devel/hdf5/patches/patch-ac
@@ -1,10 +1,9 @@
-$NetBSD: patch-ac,v 1.9 2007/09/25 01:22:16 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.10 2008/09/11 10:27:52 adam Exp $
 
-regen from patched confgure.in
-
---- configure.orig	2007-08-16 12:16:59.000000000 -0400
-+++ configure	2007-09-24 11:07:04.910306000 -0400
-@@ -8820,4 +8820,75 @@
+--- configure.orig	2008-02-01 04:08:54.000000000 +0100
++++ configure
+@@ -8822,6 +8822,77 @@ fi
+ 
  if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
  
 +{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
@@ -80,3 +79,4 @@ regen from patched confgure.in
 +
  { echo "$as_me:$LINENO: checking for xdr_int in -lnsl" >&5
  echo $ECHO_N "checking for xdr_int in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_xdr_int+set}" = set; then
diff --git a/devel/hdf5/patches/patch-ad b/devel/hdf5/patches/patch-ad
index c536631b397..40da248e15b 100644
--- a/devel/hdf5/patches/patch-ad
+++ b/devel/hdf5/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/01/04 06:05:44 recht Exp $
+$NetBSD: patch-ad,v 1.2 2008/09/11 10:27:52 adam Exp $
 
---- ./c++/config/commence.in.orig	2005-12-24 13:16:41.000000000 +0100
-+++ ./c++/config/commence.in	2005-12-24 13:17:20.000000000 +0100
-@@ -79,7 +79,7 @@
+--- c++/config/commence.in.orig	2008-02-01 04:04:06.000000000 +0100
++++ c++/config/commence.in
+@@ -80,7 +80,7 @@ LT_UNINSTALL=$(LT) --mode=uninstall $(RM
  ## complains if it sees a reference to a variable which has never been
  ## defined. The main makefile is free to redefine these to something else.
  DOCDIR=$(docdir)