5 files changed, 69 insertions, 81 deletions

diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 593998977282..61853665ce0d 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	hdf5
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	science archivers graphics
-MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current/src/ \
+MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current16/src/ \
+		ftp://ftp.hdfgroup.org/HDF5/prev-releases/ \
 		ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-${PORTVERSION}/src/
 
 MAINTAINER=	koziol@hdfgroup.org
@@ -19,10 +20,15 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure c++/configure
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-cxx --enable-production \
-		--enable-threadsafe --disable-debug \
-		--with-pthread
+CONFIGURE_ARGS=	--disable-debug \
+		--enable-cxx \
+		--enable-instrument \
+		--enable-production \
+		--enable-strict-format-checks \
+		--enable-threadsafe \
+		--with-pthread=/usr \
+		--with-ssl=/usr \
+		--with-zlib=/usr
 ALL_TARGET=	lib progs
 
 .include <bsd.port.pre.mk>
@@ -33,20 +39,23 @@ BROKEN=		Does not compile on ${ARCH}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
-		 s|[\$$]LDFLAGS -pthread|\$$LDFLAGS ${PTHREAD_LIBS}|g'  \
-			${WRKSRC}/config/freebsd
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
-		 s|[\$$]LDFLAGS -pthread|\$$LDFLAGS ${PTHREAD_LIBS}|g'  \
-			${WRKSRC}/c++/config/freebsd
+	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' \
+		-e 's|[\$$]LDFLAGS -pthread|\$$LDFLAGS ${PTHREAD_LIBS}|g'  \
+			${WRKSRC}/config/freebsd ${WRKSRC}/c++/config/freebsd
 	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags
-	@${REINPLACE_CMD} -e 's|objformat=|#objformat=|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|objformat=|#objformat=|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/version_type=freebsd-/s|=.*|=freebsd-elf|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e '/version_type=freebsd-/s|=.*|=freebsd-elf|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|objformat=|#objformat=|g' \
+		-e 's|\(version_type=freebsd\)-.*|\1-elf|g' \
+			${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
+.if defined(NOPORTEXAMPLES)
+.for i in . c++ hl
+	@${REINPLACE_CMD} \
+		-e 's,\((cd examples && $$(MAKE) $$@) || exit 1;\),#\1,g' \
+			${WRKSRC}/${i}/Makefile.in
+.endfor
+.endif
 
 post-install:
-.for i in gif2h5 h52gif h5debug h5diff h5dump h5import h5ls h5repart h5jam h5unjam
+.for i in gif2h5 h52gif h5debug h5diff h5dump h5import h5jam h5ls h5repack h5repart h5unjam
 	@${STRIP_CMD} ${PREFIX}/bin/${i}
 .endfor
 
diff --git a/science/hdf5-18/distinfo b/science/hdf5-18/distinfo
index 8da119903467..5bbf08c91ba0 100644
--- a/science/hdf5-18/distinfo
+++ b/science/hdf5-18/distinfo
@@ -1,3 +1,3 @@
-MD5 (hdf5-1.6.6.tar.gz) = 6c7fcc91f1579555d88bb10c6c9a33a9
-SHA256 (hdf5-1.6.6.tar.gz) = 432d02f2d6988999d3d18caa6680af3cef14c8a7537c98e7adbaa8f873fba2a7
-SIZE (hdf5-1.6.6.tar.gz) = 5299558
+MD5 (hdf5-1.6.7.tar.gz) = 79027c67188e2e4131c5573771f477ce
+SHA256 (hdf5-1.6.7.tar.gz) = 9d9a98204f8c7d82f767f27f84db2520c04f5c73a4a6348c781a0d91a296e9a2
+SIZE (hdf5-1.6.7.tar.gz) = 5299219
diff --git a/science/hdf5-18/files/patch-c++::configure b/science/hdf5-18/files/patch-c++::configure
deleted file mode 100644
index ae57d3016cd8..000000000000
--- a/science/hdf5-18/files/patch-c++::configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- c++/configure.orig	Fri Jun 28 03:42:45 2002
-+++ c++/configure	Wed Jul 10 01:41:13 2002
-@@ -7563,6 +7563,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/science/hdf5-18/files/patch-configure b/science/hdf5-18/files/patch-configure
deleted file mode 100644
index 2ee407ec215f..000000000000
--- a/science/hdf5-18/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Jun 29 05:03:55 2002
-+++ configure	Wed Jul 10 01:40:52 2002
-@@ -7263,6 +7263,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/science/hdf5-18/pkg-plist b/science/hdf5-18/pkg-plist
index 4084f8ac104a..6e13bd372267 100644
--- a/science/hdf5-18/pkg-plist
+++ b/science/hdf5-18/pkg-plist
@@ -46,7 +46,6 @@ include/H5FDpublic.h
 include/H5FDsec2.h
 include/H5FDsrb.h
 include/H5FDstdio.h
-include/H5FDstream.h
 include/H5FaccProp.h
 include/H5FcreatProp.h
 include/H5File.h
@@ -92,43 +91,43 @@ lib/libhdf5_hl.a
 lib/libhdf5_hl.la
 lib/libhdf5_hl.so
 lib/libhdf5_hl.so.0
-%%EXAMPLESDIR%%/c/h5_attribute.c
-%%EXAMPLESDIR%%/c/h5_chunk_read.c
-%%EXAMPLESDIR%%/c/h5_compound.c
-%%EXAMPLESDIR%%/c/h5_drivers.c
-%%EXAMPLESDIR%%/c/h5_extend_write.c
-%%EXAMPLESDIR%%/c/h5_group.c
-%%EXAMPLESDIR%%/c/h5_mount.c
-%%EXAMPLESDIR%%/c/h5_read.c
-%%EXAMPLESDIR%%/c/h5_reference.c
-%%EXAMPLESDIR%%/c/h5_select.c
-%%EXAMPLESDIR%%/c/h5_write.c
-%%EXAMPLESDIR%%/c/ph5example.c
-%%EXAMPLESDIR%%/c/ex_lite1.c
-%%EXAMPLESDIR%%/c/ex_lite2.c
-%%EXAMPLESDIR%%/c/ex_lite3.c
-%%EXAMPLESDIR%%/c/ex_image1.c
-%%EXAMPLESDIR%%/c/ex_image2.c
-%%EXAMPLESDIR%%/c/ex_table_01.c
-%%EXAMPLESDIR%%/c/ex_table_02.c
-%%EXAMPLESDIR%%/c/ex_table_03.c
-%%EXAMPLESDIR%%/c/ex_table_04.c
-%%EXAMPLESDIR%%/c/ex_table_05.c
-%%EXAMPLESDIR%%/c/ex_table_06.c
-%%EXAMPLESDIR%%/c/ex_table_07.c
-%%EXAMPLESDIR%%/c/ex_table_08.c
-%%EXAMPLESDIR%%/c/ex_table_09.c
-%%EXAMPLESDIR%%/c/ex_table_10.c
-%%EXAMPLESDIR%%/c/ex_table_11.c
-%%EXAMPLESDIR%%/c/ex_table_12.c
-%%EXAMPLESDIR%%/c++/chunks.cpp
-%%EXAMPLESDIR%%/c++/compound.cpp
-%%EXAMPLESDIR%%/c++/create.cpp
-%%EXAMPLESDIR%%/c++/extend_ds.cpp
-%%EXAMPLESDIR%%/c++/h5group.cpp
-%%EXAMPLESDIR%%/c++/readdata.cpp
-%%EXAMPLESDIR%%/c++/strtype.cpp
-%%EXAMPLESDIR%%/c++/writedata.cpp
-@dirrm %%EXAMPLESDIR%%/c
-@dirrm %%EXAMPLESDIR%%/c++
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/chunks.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/compound.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/create.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/extend_ds.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/h5group.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/readdata.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/strtype.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/writedata.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_image1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_image2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_lite1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_lite2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_lite3.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_05.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_06.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_07.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_08.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_09.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_10.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_11.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ex_table_12.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_attribute.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_chunk_read.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_compound.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_drivers.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend_write.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_group.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_mount.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_read.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_reference.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_select.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c++
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%