- Update to 1.8.5 patch 1

- Add option: DEBUG

Changes:	http://www.hdfgroup.org/HDF5/doc/ADGuide/Changes.html
PR:		ports/153400 (based on)
Submitted by:	Rob Farmer <rfarmer@predatorlabs.net>
Approved by:	maintainer (timeout, 17 days)

3 files changed, 113 insertions, 76 deletions

diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index ce25d629c431..ca38ab2c4eef 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	hdf5
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.5
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	ftp://ftp.hdfgroup.org/HDF5/current/src/ \
-		ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-1.8.4/src/
+		ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-${PORTVERSION}/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-patch1
 
 MAINTAINER=	koziol@hdfgroup.org
@@ -21,31 +21,34 @@ NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-debug \
-		--enable-cxx \
+CONFIGURE_ARGS=	--enable-cxx \
 		--enable-instrument \
-		--enable-production \
 		--enable-strict-format-checks \
 		--with-pthread=/usr \
 		--with-zlib=/usr
 
-OPTIONS=	FORTRAN	"Fortran support"	off \
+OPTIONS=	DEBUG	"Debug"			off \
+		FORTRAN	"Fortran support"	off \
 		SZIP	"SZIP support"		off
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--disable-debug --enable-production
+.endif
+
 .if defined(WITH_FORTRAN)
-USE_FORTRAN=		yes
-CONFIGURE_ENV+=		F9X=${FC}
-CONFIGURE_ARGS+=	--enable-fortran
-PLIST_SUB+=		FORTRAN=""
+USE_FORTRAN=	yes
+CONFIGURE_ENV+=	F9X=${FC}
+CONFIGURE_ARGS+=--enable-fortran
+PLIST_SUB+=	FORTRAN=""
 .else
-PLIST_SUB+=		FORTRAN="@comment "
+PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if defined(WITH_SZIP)
-LIB_DEPENDS+=		sz.2:${PORTSDIR}/science/szip
-CONFIGURE_ARGS+=	--with-szlib=${LOCALBASE}
+LIB_DEPENDS+=	sz.2:${PORTSDIR}/science/szip
+CONFIGURE_ARGS+=--with-szlib=${LOCALBASE}
 .endif
 
 .if ${ARCH} == "sparc64"
@@ -55,15 +58,14 @@ BROKEN=		Does not compile on ${ARCH}
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags
-
-post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${REINPLACE_CMD} \
+		-e '/LD_LIBRARY_PATH/ s|^|#|' \
+		-e 's|/share/hdf5_examples|/${EXAMPLESDIR_REL}|' \
+		-e 's|(INSTALL)|(INSTALL_DATA)|' \
+			`${FIND} ${WRKSRC} -regex '.*/examples/Makefile.in'`
+.if defined(NOPORTEXAMPLES)
+	@${REINPLACE_CMD} -e '/^install:/ s|install-examples||' ${WRKSRC}/Makefile.in
 .endif
-.for i in gif2h5 h52gif h5debug h5diff h5dump h5import h5jam h5ls h5repack h5repart h5unjam
-	@${STRIP_CMD} ${PREFIX}/bin/${i}
-.endfor
 
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
diff --git a/science/hdf5-18/distinfo b/science/hdf5-18/distinfo
index 094a3a24eb9e..8328fb7fb566 100644
--- a/science/hdf5-18/distinfo
+++ b/science/hdf5-18/distinfo
@@ -1,3 +1,2 @@
-MD5 (hdf5-1.8.4-patch1.tar.bz2) = b19f4dfbf654a2af3653c492fc1c7513
-SHA256 (hdf5-1.8.4-patch1.tar.bz2) = 818b9f7ff767e9760d0c8aa0abc16ad20e616cfaab760dd3b18ead67326a3f18
-SIZE (hdf5-1.8.4-patch1.tar.bz2) = 5251124
+SHA256 (hdf5-1.8.5-patch1.tar.bz2) = 1028be671e24dcd9826d3eabe6c0ebe674282368689dcf0f6bb5926bc8d3be25
+SIZE (hdf5-1.8.5-patch1.tar.bz2) = 5413471
diff --git a/science/hdf5-18/pkg-plist b/science/hdf5-18/pkg-plist
index 3c497bf6beb8..767b67bbc366 100644
--- a/science/hdf5-18/pkg-plist
+++ b/science/hdf5-18/pkg-plist
@@ -1,11 +1,8 @@
-bin/h5mkgrp
-bin/h5copy
-bin/h5stat
-bin/h5perf_serial
 bin/gif2h5
 bin/h52gif
 bin/h5c++
 bin/h5cc
+bin/h5copy
 bin/h5debug
 bin/h5diff
 bin/h5dump
@@ -13,11 +10,13 @@ bin/h5dump
 bin/h5import
 bin/h5jam
 bin/h5ls
+bin/h5mkgrp
+bin/h5perf_serial
 bin/h5redeploy
 bin/h5repack
 bin/h5repart
+bin/h5stat
 bin/h5unjam
-include/hdf5_hl.h
 include/H5ACpublic.h
 include/H5AbstractDs.h
 include/H5Apublic.h
@@ -30,12 +29,12 @@ include/H5CompType.h
 include/H5Cpp.h
 include/H5CppDoc.h
 include/H5Cpublic.h
+include/H5DSpublic.h
 include/H5DataSet.h
 include/H5DataSpace.h
 include/H5DataType.h
 include/H5DcreatProp.h
 include/H5Dpublic.h
-include/H5DSpublic.h
 include/H5DxferProp.h
 include/H5EnumType.h
 include/H5Epubgen.h
@@ -59,13 +58,13 @@ include/H5FloatType.h
 include/H5Fpublic.h
 include/H5Gpublic.h
 include/H5Group.h
-include/H5IdComponent.h
 include/H5IMpublic.h
+include/H5IdComponent.h
 include/H5Include.h
 include/H5IntType.h
 include/H5Ipublic.h
-include/H5Library.h
 include/H5LTpublic.h
+include/H5Library.h
 include/H5Lpublic.h
 include/H5MMpublic.h
 include/H5Object.h
@@ -83,45 +82,35 @@ include/H5Tpublic.h
 include/H5VarLenType.h
 include/H5Zpublic.h
 include/H5api_adpt.h
+%%FORTRAN%%include/H5f90i.h
+%%FORTRAN%%include/H5f90i_gen.h
 include/H5overflow.h
 include/H5pubconf.h
 include/H5public.h
 include/H5version.h
-include/hdf5.h
+%%FORTRAN%%include/h5_dble_interface.mod
 %%FORTRAN%%include/h5a.mod
 %%FORTRAN%%include/h5d.mod
 %%FORTRAN%%include/h5e.mod
 %%FORTRAN%%include/h5f.mod
-%%FORTRAN%%include/h5fortran_flags.mod
 %%FORTRAN%%include/h5fortran_types.mod
 %%FORTRAN%%include/h5g.mod
 %%FORTRAN%%include/h5global.mod
 %%FORTRAN%%include/h5i.mod
+%%FORTRAN%%include/h5im.mod
+%%FORTRAN%%include/h5l.mod
 %%FORTRAN%%include/h5lib.mod
+%%FORTRAN%%include/h5lt.mod
+%%FORTRAN%%include/h5o.mod
 %%FORTRAN%%include/h5p.mod
 %%FORTRAN%%include/h5r.mod
 %%FORTRAN%%include/h5s.mod
 %%FORTRAN%%include/h5t.mod
+%%FORTRAN%%include/h5tb.mod
 %%FORTRAN%%include/h5z.mod
+include/hdf5.h
 %%FORTRAN%%include/hdf5.mod
-%%FORTRAN%%include/h5_dble_interface.mod
-%%FORTRAN%%include/h5o.mod
-%%FORTRAN%%include/h5l.mod
-%%FORTRAN%%include/h5tb.mod
-%%FORTRAN%%include/h5lt.mod
-%%FORTRAN%%include/h5im.mod
-%%FORTRAN%%lib/libhdf5_fortran.so
-%%FORTRAN%%lib/libhdf5_fortran.so.0
-%%FORTRAN%%lib/libhdf5hl_fortran.so
-%%FORTRAN%%lib/libhdf5hl_fortran.so.0
-%%FORTRAN%%lib/libhdf5hl_fortran.la
-%%FORTRAN%%lib/libhdf5hl_fortran.a
-lib/libhdf5_cpp.so
-lib/libhdf5_cpp.so.6
-lib/libhdf5_hl_cpp.so
-lib/libhdf5_hl_cpp.so.6
-lib/libhdf5_hl_cpp.la
-lib/libhdf5_hl_cpp.a
+include/hdf5_hl.h
 lib/libhdf5.a
 lib/libhdf5.la
 lib/libhdf5.settings
@@ -129,34 +118,81 @@ lib/libhdf5.so
 lib/libhdf5.so.6
 lib/libhdf5_cpp.a
 lib/libhdf5_cpp.la
+lib/libhdf5_cpp.so
+lib/libhdf5_cpp.so.6
 %%FORTRAN%%lib/libhdf5_fortran.a
 %%FORTRAN%%lib/libhdf5_fortran.la
+%%FORTRAN%%lib/libhdf5_fortran.so
+%%FORTRAN%%lib/libhdf5_fortran.so.6
 lib/libhdf5_hl.a
 lib/libhdf5_hl.la
 lib/libhdf5_hl.so
 lib/libhdf5_hl.so.6
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Attributes.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_attribute.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_chunk_read.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_compound.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_drivers.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_dtransform.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_elink_unix2win.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_extend_write.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_extlink.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_group.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_interm_group.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_mount.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_read.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_ref2reg.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_reference.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_select.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_shared_mesg.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/h5_write.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ph5example.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testh5cc.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testh5cc.sh.in
+lib/libhdf5_hl_cpp.a
+lib/libhdf5_hl_cpp.la
+lib/libhdf5_hl_cpp.so
+lib/libhdf5_hl_cpp.so.6
+%%FORTRAN%%lib/libhdf5hl_fortran.a
+%%FORTRAN%%lib/libhdf5hl_fortran.la
+%%FORTRAN%%lib/libhdf5hl_fortran.so
+%%FORTRAN%%lib/libhdf5hl_fortran.so.6
+%%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++/run-c++-ex.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/writedata.cpp
+%%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_elink_unix2win.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extend_write.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_extlink.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_group.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_mount.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_read.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_ref2reg.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_reference.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_select.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_shared_mesg.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/h5_write.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/ph5example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/run-c-ex.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/ptExampleFL.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/ptExampleVL.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c++/run-hlc++-ex.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_ds1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_image1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_image2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_lite1.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_lite2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_lite3.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_04.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_05.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_06.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_07.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_08.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_09.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_10.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_11.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ex_table_12.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/image24pixel.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/image8.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/pal_rgb.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ptExampleFL.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/ptExampleVL.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/c/run-hlc-ex.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hl/run-hl-ex.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-all-ex.sh
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/hl/c++
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/hl/c
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/hl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c++
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/c
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%