pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/hdf hdf: update to 4.2.15
details: https://anonhg.NetBSD.org/pkgsrc/rev/cb67881c8d4a
branches: trunk
changeset: 377771:cb67881c8d4a
user: tnn <tnn%pkgsrc.org@localhost>
date: Sun Apr 24 21:50:48 2022 +0000
description:
hdf: update to 4.2.15
Fix MASTER_SITES and HOMEPAGE.
Fix the build with gfortran 10.
Remove some obsolete patches.
Other changes unknown.
diffstat:
devel/hdf/Makefile | 30 ++++---
devel/hdf/PLIST | 96 ++++++++++++++++++++++++-
devel/hdf/distinfo | 23 ++---
devel/hdf/patches/patch-ai | 48 ------------
devel/hdf/patches/patch-aj | 82 ---------------------
devel/hdf/patches/patch-ao | 10 +-
devel/hdf/patches/patch-ap | 10 +-
devel/hdf/patches/patch-ar | 13 ---
devel/hdf/patches/patch-as | 13 ---
devel/hdf/patches/patch-ba | 30 ++-----
devel/hdf/patches/patch-bin_cmakehdf4 | 13 +++
devel/hdf/patches/patch-hdf_fmpool_configure.in | 13 ---
devel/hdf/patches/patch-hdf_test_tutils.h | 13 +++
devel/hdf/patches/patch-mfhdf_ncgen_ncgen.l | 8 +-
14 files changed, 170 insertions(+), 232 deletions(-)
diffs (truncated from 543 to 300 lines):
diff -r 74c0cfc33793 -r cb67881c8d4a devel/hdf/Makefile
--- a/devel/hdf/Makefile Sun Apr 24 20:28:03 2022 +0000
+++ b/devel/hdf/Makefile Sun Apr 24 21:50:48 2022 +0000
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2019/05/01 12:36:09 bacon Exp $
+# $NetBSD: Makefile,v 1.42 2022/04/24 21:50:48 tnn Exp $
-DISTNAME= HDF4.2r4
-PKGNAME= hdf-4.2r4
-PKGREVISION= 3
+DISTNAME= hdf-4.2.15
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/
-EXTRACT_USING= bsdtar
+MASTER_SITES= https://support.hdfgroup.org/ftp/HDF/releases/HDF${PKGVERSION_NOREV}/src/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://www.hdfgroup.org/products/hdf4/
+HOMEPAGE= https://support.hdfgroup.org/products/hdf4/
COMMENT= NCSA Hierarchical Data Format
USE_LIBTOOL= yes
@@ -20,11 +18,19 @@
# pkgsrc libtool builds shared objects anyway
#CONFIGURE_ARGS+= --enable-shared
-post-patch:
- ${MV} -f ${WRKSRC}/mfhdf/ncdump/ncdump.1 \
- ${WRKSRC}/mfhdf/ncdump/hdfncdump.1
- ${MV} -f ${WRKSRC}/mfhdf/ncgen/ncgen.1 \
- ${WRKSRC}/mfhdf/ncgen/hdfncgen.1
+.include "../../mk/compiler.mk"
+
+.if empty(GFORTRAN_VERSION:M[0-9])
+# gfortran>=10 requires this, earlier compilers don't
+FFLAGS= -O -fallow-argument-mismatch
+.endif
+
+# conflicts with devel/netcdf
+post-install:
+ mv ${DESTDIR}${PREFIX}/bin/ncdump ${DESTDIR}${PREFIX}/bin/hdfncdump
+ mv ${DESTDIR}${PREFIX}/bin/ncgen ${DESTDIR}${PREFIX}/bin/hdfncgen
+ mv ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ncdump.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/hdfncdump.1
+ mv ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ncgen.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/hdfncgen.1
do-test:
@cd ${WRKSRC}/hdf/test && ${SETENV} ${MAKE_ENV} ${MAKE} check
diff -r 74c0cfc33793 -r cb67881c8d4a devel/hdf/PLIST
--- a/devel/hdf/PLIST Sun Apr 24 20:28:03 2022 +0000
+++ b/devel/hdf/PLIST Sun Apr 24 21:50:48 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/12/10 17:10:14 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/04/24 21:50:48 tnn Exp $
bin/gif2hdf
bin/h4cc
bin/h4fc
@@ -26,6 +26,7 @@
bin/ristosds
bin/vmake
bin/vshow
+include/hdf/H4api_adpt.h
include/hdf/atom.h
include/hdf/bitvect.h
include/hdf/cdeflate.h
@@ -51,6 +52,7 @@
include/hdf/hcomp.h
include/hdf/hcompi.h
include/hdf/hconv.h
+include/hdf/hdatainfo.h
include/hdf/hdf.f90
include/hdf/hdf.h
include/hdf/hdf.inc
@@ -67,6 +69,7 @@
include/hdf/linklist.h
include/hdf/local_nc.h
include/hdf/mfan.h
+include/hdf/mfdatainfo.h
include/hdf/mffunc.f90
include/hdf/mffunc.inc
include/hdf/mfgr.h
@@ -85,4 +88,93 @@
man/man1/hdf.1
man/man1/hdfncdump.1
man/man1/hdfncgen.1
-man/man1/hdfunpac.1
+share/hdf4_examples/README
+share/hdf4_examples/c/AN_create_annotation.c
+share/hdf4_examples/c/AN_get_annotation_info.c
+share/hdf4_examples/c/AN_read_annotation.c
+share/hdf4_examples/c/GR_create_and_write_image.c
+share/hdf4_examples/c/GR_get_attribute.c
+share/hdf4_examples/c/GR_image_info.c
+share/hdf4_examples/c/GR_modify_image.c
+share/hdf4_examples/c/GR_read_chunks.c
+share/hdf4_examples/c/GR_read_image.c
+share/hdf4_examples/c/GR_read_palette.c
+share/hdf4_examples/c/GR_set_attribute.c
+share/hdf4_examples/c/GR_write_chunks.c
+share/hdf4_examples/c/GR_write_palette.c
+share/hdf4_examples/c/SD_alter_sds_values.c
+share/hdf4_examples/c/SD_chunking_example.c
+share/hdf4_examples/c/SD_compress_sds.c
+share/hdf4_examples/c/SD_create_sds.c
+share/hdf4_examples/c/SD_dimscale_vs_sds.c
+share/hdf4_examples/c/SD_find_sds_by_name.c
+share/hdf4_examples/c/SD_get_attr.c
+share/hdf4_examples/c/SD_get_info.c
+share/hdf4_examples/c/SD_mv_sds_to_external.c
+share/hdf4_examples/c/SD_read_from_sds.c
+share/hdf4_examples/c/SD_read_subsets.c
+share/hdf4_examples/c/SD_set_attr.c
+share/hdf4_examples/c/SD_set_get_dim_info.c
+share/hdf4_examples/c/SD_unlimited_sds.c
+share/hdf4_examples/c/SD_write_slab.c
+share/hdf4_examples/c/SD_write_to_sds.c
+share/hdf4_examples/c/VD_create_onefield_vdatas.c
+share/hdf4_examples/c/VD_create_vdatas.c
+share/hdf4_examples/c/VD_get_vdata_info.c
+share/hdf4_examples/c/VD_locate_vdata.c
+share/hdf4_examples/c/VD_read_from_vdata.c
+share/hdf4_examples/c/VD_read_mixed_vdata.c
+share/hdf4_examples/c/VD_set_get_vdata_attr.c
+share/hdf4_examples/c/VD_write_mixed_vdata.c
+share/hdf4_examples/c/VD_write_mixed_vdata_struct.c
+share/hdf4_examples/c/VD_write_to_vdata.c
+share/hdf4_examples/c/VG_add_sds_to_vgroup.c
+share/hdf4_examples/c/VG_create_vgroup.c
+share/hdf4_examples/c/VG_get_vgroup_info.c
+share/hdf4_examples/c/VG_insert_vdatas_to_vgroup.c
+share/hdf4_examples/c/VG_set_get_vgroup_attr.c
+share/hdf4_examples/c/VG_vgroup_contents.c
+share/hdf4_examples/c/run-c-ex.sh
+share/hdf4_examples/fortran/AN_create_annotation.f
+share/hdf4_examples/fortran/AN_get_annotation_info.f
+share/hdf4_examples/fortran/AN_read_annotation.f
+share/hdf4_examples/fortran/GR_create_and_write_image.f
+share/hdf4_examples/fortran/GR_get_attribute.f
+share/hdf4_examples/fortran/GR_image_info.f
+share/hdf4_examples/fortran/GR_modify_image.f
+share/hdf4_examples/fortran/GR_read_image.f
+share/hdf4_examples/fortran/GR_read_palette.f
+share/hdf4_examples/fortran/GR_set_attribute.f
+share/hdf4_examples/fortran/GR_write_palette.f
+share/hdf4_examples/fortran/SD_alter_sds_values.f
+share/hdf4_examples/fortran/SD_chunking_example.f
+share/hdf4_examples/fortran/SD_compress_sds.f
+share/hdf4_examples/fortran/SD_create_sds.f
+share/hdf4_examples/fortran/SD_dimscale_vs_sds.f
+share/hdf4_examples/fortran/SD_find_sds_by_name.f
+share/hdf4_examples/fortran/SD_get_attr.f
+share/hdf4_examples/fortran/SD_get_info.f
+share/hdf4_examples/fortran/SD_mv_sds_to_external.f
+share/hdf4_examples/fortran/SD_read_from_sds.f
+share/hdf4_examples/fortran/SD_read_subsets.f
+share/hdf4_examples/fortran/SD_set_attr.f
+share/hdf4_examples/fortran/SD_set_get_dim_info.f
+share/hdf4_examples/fortran/SD_unlimited_sds.f
+share/hdf4_examples/fortran/SD_write_slab.f
+share/hdf4_examples/fortran/SD_write_to_sds.f
+share/hdf4_examples/fortran/VD_create_onefield_vdatas.f
+share/hdf4_examples/fortran/VD_create_vdatas.f
+share/hdf4_examples/fortran/VD_get_vdata_info.f
+share/hdf4_examples/fortran/VD_locate_vdata.f
+share/hdf4_examples/fortran/VD_read_from_vdata.f
+share/hdf4_examples/fortran/VD_read_mixed_vdata.f
+share/hdf4_examples/fortran/VD_write_mixed_vdata.f
+share/hdf4_examples/fortran/VD_write_to_vdata.f
+share/hdf4_examples/fortran/VG_add_sds_to_vgroup.f
+share/hdf4_examples/fortran/VG_create_vgroup.f
+share/hdf4_examples/fortran/VG_get_vgroup_info.f
+share/hdf4_examples/fortran/VG_insert_vdatas_to_vgroup.f
+share/hdf4_examples/fortran/VG_set_get_vgroup_attr.f
+share/hdf4_examples/fortran/VG_vgroup_contents.f
+share/hdf4_examples/fortran/run-fortran-ex.sh
+share/hdf4_examples/run-all-ex.sh
diff -r 74c0cfc33793 -r cb67881c8d4a devel/hdf/distinfo
--- a/devel/hdf/distinfo Sun Apr 24 20:28:03 2022 +0000
+++ b/devel/hdf/distinfo Sun Apr 24 21:50:48 2022 +0000
@@ -1,14 +1,11 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:14:50 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/04/24 21:50:48 tnn Exp $
-BLAKE2s (HDF4.2r4.tar.gz) = f4a3d8769280b953447317e4c03ea001e71d4b940caaaae02c399708a2b112db
-SHA512 (HDF4.2r4.tar.gz) = 184166a79154bbae4e4efa888042d3b1d398e0b35f6bca680a598bbfc137122b4109da9db6ae45c0caea02a0bd64c2d6a6459ba88f411a3f62edc5de57e83e0a
-Size (HDF4.2r4.tar.gz) = 3914118 bytes
-SHA1 (patch-ai) = 3b85a0d32ca8e7d4065bf09960de2769c12740cd
-SHA1 (patch-aj) = f1f64d19b4346da5b18c2d80c93f929a96b56b70
-SHA1 (patch-ao) = cf461ca847ddef05c4876fe3527beda3242ee2f2
-SHA1 (patch-ap) = 18a209229a60742a73c720d55f558949285351f2
-SHA1 (patch-ar) = 5fbb6e8c56ccf05db0217e9551a0c72ecd9f5c06
-SHA1 (patch-as) = b4fa7cd3bcafd75c9bfc045c2849bde21becd2de
-SHA1 (patch-ba) = 33e79d38ce68540308445f709f5cbafb1b917d05
-SHA1 (patch-hdf_fmpool_configure.in) = 78c80e18fdc931476c36fc451a36dc93cc254484
-SHA1 (patch-mfhdf_ncgen_ncgen.l) = a2d5a5de6a1491582d73dad291fdb0ffa40b7e9a
+BLAKE2s (hdf-4.2.15.tar.bz2) = ff1c7833d9b0c21f46e437a3071bf376a3f5783ea2c91e5b8afb96d56360e223
+SHA512 (hdf-4.2.15.tar.bz2) = 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
+Size (hdf-4.2.15.tar.bz2) = 3647900 bytes
+SHA1 (patch-ao) = 1d17fef8c7b10670a1a82fd41aacf5761684a693
+SHA1 (patch-ap) = 6587f64f688d39aac99dad9d445d388f555f8aff
+SHA1 (patch-ba) = e1bc12d455a0b85c93ea8cab9f0b39621b349980
+SHA1 (patch-bin_cmakehdf4) = 13c1f36d72f6fc780c61591ac4623a07421217dc
+SHA1 (patch-hdf_test_tutils.h) = 98d99e153f33cfaa1fc24321c993b734f9dba9ab
+SHA1 (patch-mfhdf_ncgen_ncgen.l) = 721f73cb5b219922fdc096b7f7fe1e9c8db5e9cc
diff -r 74c0cfc33793 -r cb67881c8d4a devel/hdf/patches/patch-ai
--- a/devel/hdf/patches/patch-ai Sun Apr 24 20:28:03 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-ai,v 1.8 2009/12/10 17:10:14 drochner Exp $
-
---- 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)
- 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
-
- 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_OBJECTS) $(ncdump_LDADD) $(LIBS)
-
-@@ -554,11 +554,11 @@ uninstall-man: uninstall-man1
- uninstall-man1
-
-
--check: ncdump $(srcdir)/test0.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
-+ $(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 -r 74c0cfc33793 -r cb67881c8d4a devel/hdf/patches/patch-aj
--- a/devel/hdf/patches/patch-aj Sun Apr 24 20:28:03 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-$NetBSD: patch-aj,v 1.8 2009/12/10 17:10:14 drochner Exp $
-
---- mfhdf/ncgen/Makefile.in.orig 2008-10-13 21:39:11.000000000 +0200
-+++ mfhdf/ncgen/Makefile.in
-@@ -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
-
- #############################################################################
- #############################################################################
-@@ -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_OBJECTS) $(ncgen_LDADD) $(LIBS)
-
-@@ -613,13 +613,13 @@ ncgenyy.c: ncgen.l
- $(LEX) $(srcdir)/ncgen.l
- mv lex.yy.c ncgenyy.c
-
Home |
Main Index |
Thread Index |
Old Index