science/hdf: update to 4.2.15 to fix build on powerpc64

Newest version builds on powerpc64 just fine.

MFH:		2020Q3 (fix build blanket)

7 files changed, 95 insertions, 55 deletions

diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index b3d25b3e335f..55149fd82d15 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hdf
-PORTVERSION=	4.2.11
-PORTREVISION=	8
+PORTVERSION=	4.2.15
 PORTEPOCH=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF/releases/HDF${PORTVERSION}/src/ \
@@ -14,13 +13,12 @@ COMMENT=	Hierarchical Data Format library (from NCSA)
 
 LIB_DEPENDS=	libsz.so:science/szip
 
-BROKEN_powerpc64=	Does not build: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'you'
 NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	fails to compile: no machine type has been defined
 
 CONFLICTS_INSTALL=	netcdf-4.[0-9]*
 
-USES=		fortran jpeg libtool tar:bzip2
+USES=		fortran jpeg libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-jpeg=${LOCALBASE} \
 		--with-szlib=${LOCALBASE}
@@ -35,9 +33,6 @@ OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e '/PROD_/ s|=.*|=""|' ${WRKSRC}/config/freebsd
-# Allow to build on PowerPC
-	@${REINPLACE_CMD} -e '/if defined (__APPLE__)/ \
-		s,),) || defined(__powerpc__),' ${WRKSRC}/hdf/src/hdfi.h
 	@${REINPLACE_CMD} -e 's/ || (__APPLE__.*//' \
 		${WRKSRC}/hdf/test/fortest.c
 
diff --git a/science/hdf/distinfo b/science/hdf/distinfo
index de47ed8f66f0..0bb7c4798075 100644
--- a/science/hdf/distinfo
+++ b/science/hdf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hdf-4.2.11.tar.bz2) = bb0e900b8cc6bc89a5730abc97e654e7705e8e1fbc4e0d4477f417822428d99b
-SIZE (hdf-4.2.11.tar.bz2) = 3173535
+TIMESTAMP = 1598126512
+SHA256 (hdf-4.2.15.tar.gz) = dbeeef525af7c2d01539906c28953f0fdab7dba603d1bc1ec4a5af60d002c459
+SIZE (hdf-4.2.15.tar.gz) = 4461869
diff --git a/science/hdf/files/patch-hdf-examples-Makefile.in b/science/hdf/files/patch-hdf-examples-Makefile.in
deleted file mode 100644
index 85f4a1451715..000000000000
--- a/science/hdf/files/patch-hdf-examples-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- hdf/examples/Makefile.in.orig	2015-02-10 00:43:49.000000000 +0800
-+++ hdf/examples/Makefile.in	2015-03-16 23:05:52.348877136 +0800
-@@ -530,8 +530,8 @@
- INSTALL_TOP_FILES = README
- 
- # Where to install example files
--EXAMPLEDIR = $(prefix)/examples/c
--EXAMPLETOPDIR = $(prefix)/examples
-+EXAMPLEDIR = $(DESTDIR)$(prefix)/share/examples/hdf/c
-+EXAMPLETOPDIR = $(DESTDIR)$(prefix)/share/examples/hdf
- DISTCLEANFILES = *.chkexe *.chklog
- @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
- 
diff --git a/science/hdf/files/patch-hdf-fortran-examples-Makefile.in b/science/hdf/files/patch-hdf-fortran-examples-Makefile.in
deleted file mode 100644
index 5a3e51d42b56..000000000000
--- a/science/hdf/files/patch-hdf-fortran-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf/fortran/examples/Makefile.in.orig	2015-02-10 00:43:49.000000000 +0800
-+++ hdf/fortran/examples/Makefile.in	2015-03-16 23:41:52.776730245 +0800
-@@ -525,7 +525,7 @@
- INSTALL_SCRIPT_FILES = run-fortran-ex.sh
- 
- # Where to install Fortran example files
--EXAMPLEDIR = $(prefix)/examples/fortran
-+EXAMPLEDIR = $(DESTDIR)$(prefix)/share/hdf/examples/fortran
- DISTCLEANFILES = *.chkexe *.chklog
- @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
- 
diff --git a/science/hdf/files/patch-mfhdf-examples-Makefile.in b/science/hdf/files/patch-mfhdf-examples-Makefile.in
deleted file mode 100644
index 8fb080a5c523..000000000000
--- a/science/hdf/files/patch-mfhdf-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mfhdf/examples/Makefile.in.orig	2015-02-10 00:43:50.000000000 +0800
-+++ mfhdf/examples/Makefile.in	2015-03-16 23:43:17.287721940 +0800
-@@ -507,7 +507,7 @@
- 	SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c        \
- 	SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
- 
--EXAMPLEDIR = $(prefix)/examples/c
-+EXAMPLEDIR = $(DESTDIR)$(prefix)/share/examples/hdf/c
- DISTCLEANFILES = *.chklog *.chkexe .deps
- @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
- 
diff --git a/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in b/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in
deleted file mode 100644
index 8687c46b5547..000000000000
--- a/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- mfhdf/fortran/examples/Makefile.in.orig	2015-02-10 00:43:50.000000000 +0800
-+++ mfhdf/fortran/examples/Makefile.in	2015-03-16 23:44:30.846716566 +0800
-@@ -511,7 +511,7 @@
- 
- 
- # Where to install example files
--EXAMPLEDIR = $(prefix)/examples/fortran
-+EXAMPLEDIR = $(DESTDIR)$(prefix)/share/examples/hdf/fortran
- DISTCLEANFILES = *.chkexe *.chklog
- @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
- 
diff --git a/science/hdf/pkg-plist b/science/hdf/pkg-plist
index 9c3d6a6b5f04..7cdbf4bc4ed2 100644
--- a/science/hdf/pkg-plist
+++ b/science/hdf/pkg-plist
@@ -95,3 +95,93 @@ man/man1/hdfunpac.1.gz
 man/man1/ncdump.1.gz
 man/man1/ncgen.1.gz
 man/man3/gr_chunk.3.gz
+%%DATADIR%%4_examples/README
+%%DATADIR%%4_examples/c/AN_create_annotation.c
+%%DATADIR%%4_examples/c/AN_get_annotation_info.c
+%%DATADIR%%4_examples/c/AN_read_annotation.c
+%%DATADIR%%4_examples/c/GR_create_and_write_image.c
+%%DATADIR%%4_examples/c/GR_get_attribute.c
+%%DATADIR%%4_examples/c/GR_image_info.c
+%%DATADIR%%4_examples/c/GR_modify_image.c
+%%DATADIR%%4_examples/c/GR_read_chunks.c
+%%DATADIR%%4_examples/c/GR_read_image.c
+%%DATADIR%%4_examples/c/GR_read_palette.c
+%%DATADIR%%4_examples/c/GR_set_attribute.c
+%%DATADIR%%4_examples/c/GR_write_chunks.c
+%%DATADIR%%4_examples/c/GR_write_palette.c
+%%DATADIR%%4_examples/c/SD_alter_sds_values.c
+%%DATADIR%%4_examples/c/SD_chunking_example.c
+%%DATADIR%%4_examples/c/SD_compress_sds.c
+%%DATADIR%%4_examples/c/SD_create_sds.c
+%%DATADIR%%4_examples/c/SD_dimscale_vs_sds.c
+%%DATADIR%%4_examples/c/SD_find_sds_by_name.c
+%%DATADIR%%4_examples/c/SD_get_attr.c
+%%DATADIR%%4_examples/c/SD_get_info.c
+%%DATADIR%%4_examples/c/SD_mv_sds_to_external.c
+%%DATADIR%%4_examples/c/SD_read_from_sds.c
+%%DATADIR%%4_examples/c/SD_read_subsets.c
+%%DATADIR%%4_examples/c/SD_set_attr.c
+%%DATADIR%%4_examples/c/SD_set_get_dim_info.c
+%%DATADIR%%4_examples/c/SD_unlimited_sds.c
+%%DATADIR%%4_examples/c/SD_write_slab.c
+%%DATADIR%%4_examples/c/SD_write_to_sds.c
+%%DATADIR%%4_examples/c/VD_create_onefield_vdatas.c
+%%DATADIR%%4_examples/c/VD_create_vdatas.c
+%%DATADIR%%4_examples/c/VD_get_vdata_info.c
+%%DATADIR%%4_examples/c/VD_locate_vdata.c
+%%DATADIR%%4_examples/c/VD_read_from_vdata.c
+%%DATADIR%%4_examples/c/VD_read_mixed_vdata.c
+%%DATADIR%%4_examples/c/VD_set_get_vdata_attr.c
+%%DATADIR%%4_examples/c/VD_write_mixed_vdata.c
+%%DATADIR%%4_examples/c/VD_write_mixed_vdata_struct.c
+%%DATADIR%%4_examples/c/VD_write_to_vdata.c
+%%DATADIR%%4_examples/c/VG_add_sds_to_vgroup.c
+%%DATADIR%%4_examples/c/VG_create_vgroup.c
+%%DATADIR%%4_examples/c/VG_get_vgroup_info.c
+%%DATADIR%%4_examples/c/VG_insert_vdatas_to_vgroup.c
+%%DATADIR%%4_examples/c/VG_set_get_vgroup_attr.c
+%%DATADIR%%4_examples/c/VG_vgroup_contents.c
+%%DATADIR%%4_examples/c/run-c-ex.sh
+%%DATADIR%%4_examples/fortran/AN_create_annotation.f
+%%DATADIR%%4_examples/fortran/AN_get_annotation_info.f
+%%DATADIR%%4_examples/fortran/AN_read_annotation.f
+%%DATADIR%%4_examples/fortran/GR_create_and_write_image.f
+%%DATADIR%%4_examples/fortran/GR_get_attribute.f
+%%DATADIR%%4_examples/fortran/GR_image_info.f
+%%DATADIR%%4_examples/fortran/GR_modify_image.f
+%%DATADIR%%4_examples/fortran/GR_read_image.f
+%%DATADIR%%4_examples/fortran/GR_read_palette.f
+%%DATADIR%%4_examples/fortran/GR_set_attribute.f
+%%DATADIR%%4_examples/fortran/GR_write_palette.f
+%%DATADIR%%4_examples/fortran/SD_alter_sds_values.f
+%%DATADIR%%4_examples/fortran/SD_chunking_example.f
+%%DATADIR%%4_examples/fortran/SD_compress_sds.f
+%%DATADIR%%4_examples/fortran/SD_create_sds.f
+%%DATADIR%%4_examples/fortran/SD_dimscale_vs_sds.f
+%%DATADIR%%4_examples/fortran/SD_find_sds_by_name.f
+%%DATADIR%%4_examples/fortran/SD_get_attr.f
+%%DATADIR%%4_examples/fortran/SD_get_info.f
+%%DATADIR%%4_examples/fortran/SD_mv_sds_to_external.f
+%%DATADIR%%4_examples/fortran/SD_read_from_sds.f
+%%DATADIR%%4_examples/fortran/SD_read_subsets.f
+%%DATADIR%%4_examples/fortran/SD_set_attr.f
+%%DATADIR%%4_examples/fortran/SD_set_get_dim_info.f
+%%DATADIR%%4_examples/fortran/SD_unlimited_sds.f
+%%DATADIR%%4_examples/fortran/SD_write_slab.f
+%%DATADIR%%4_examples/fortran/SD_write_to_sds.f
+%%DATADIR%%4_examples/fortran/VD_create_onefield_vdatas.f
+%%DATADIR%%4_examples/fortran/VD_create_vdatas.f
+%%DATADIR%%4_examples/fortran/VD_get_vdata_info.f
+%%DATADIR%%4_examples/fortran/VD_locate_vdata.f
+%%DATADIR%%4_examples/fortran/VD_read_from_vdata.f
+%%DATADIR%%4_examples/fortran/VD_read_mixed_vdata.f
+%%DATADIR%%4_examples/fortran/VD_write_mixed_vdata.f
+%%DATADIR%%4_examples/fortran/VD_write_to_vdata.f
+%%DATADIR%%4_examples/fortran/VG_add_sds_to_vgroup.f
+%%DATADIR%%4_examples/fortran/VG_create_vgroup.f
+%%DATADIR%%4_examples/fortran/VG_get_vgroup_info.f
+%%DATADIR%%4_examples/fortran/VG_insert_vdatas_to_vgroup.f
+%%DATADIR%%4_examples/fortran/VG_set_get_vgroup_attr.f
+%%DATADIR%%4_examples/fortran/VG_vgroup_contents.f
+%%DATADIR%%4_examples/fortran/run-fortran-ex.sh
+%%DATADIR%%4_examples/run-all-ex.sh