Index: branches/2020Q3/science/hdf/Makefile =================================================================== --- branches/2020Q3/science/hdf/Makefile (revision 545783) +++ branches/2020Q3/science/hdf/Makefile (revision 545784) @@ -1,50 +1,45 @@ # Created by: mi # $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/ \ ftp://ftp.hdfgroup.org/HDF/releases/HDF${PORTVERSION}/src/ MAINTAINER= ports@FreeBSD.org 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} USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check PORTDATA= * PORTEXAMPLES= * 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 post-install: ${INSTALL_MAN} ${WRKSRC}/man/hdfunpac.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/man/gr_chunk.3 \ ${STAGEDIR}${MAN3PREFIX}/man/man3 .include Index: branches/2020Q3/science/hdf/distinfo =================================================================== --- branches/2020Q3/science/hdf/distinfo (revision 545783) +++ branches/2020Q3/science/hdf/distinfo (revision 545784) @@ -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 Index: branches/2020Q3/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in =================================================================== --- branches/2020Q3/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in (revision 545783) +++ branches/2020Q3/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in (nonexistent) @@ -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) - Property changes on: branches/2020Q3/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q3/science/hdf/files/patch-hdf-fortran-examples-Makefile.in =================================================================== --- branches/2020Q3/science/hdf/files/patch-hdf-fortran-examples-Makefile.in (revision 545783) +++ branches/2020Q3/science/hdf/files/patch-hdf-fortran-examples-Makefile.in (nonexistent) @@ -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) - Property changes on: branches/2020Q3/science/hdf/files/patch-hdf-fortran-examples-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q3/science/hdf/files/patch-hdf-examples-Makefile.in =================================================================== --- branches/2020Q3/science/hdf/files/patch-hdf-examples-Makefile.in (revision 545783) +++ branches/2020Q3/science/hdf/files/patch-hdf-examples-Makefile.in (nonexistent) @@ -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) - Property changes on: branches/2020Q3/science/hdf/files/patch-hdf-examples-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q3/science/hdf/files/patch-mfhdf-examples-Makefile.in =================================================================== --- branches/2020Q3/science/hdf/files/patch-mfhdf-examples-Makefile.in (revision 545783) +++ branches/2020Q3/science/hdf/files/patch-mfhdf-examples-Makefile.in (nonexistent) @@ -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) - Property changes on: branches/2020Q3/science/hdf/files/patch-mfhdf-examples-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q3/science/hdf/pkg-plist =================================================================== --- branches/2020Q3/science/hdf/pkg-plist (revision 545783) +++ branches/2020Q3/science/hdf/pkg-plist (revision 545784) @@ -1,97 +1,187 @@ bin/gif2hdf bin/h4cc bin/h4fc bin/h4redeploy bin/hdf24to8 bin/hdf2gif bin/hdf2jpeg bin/hdf8to24 bin/hdfcomp bin/hdfed bin/hdfimport bin/hdfls bin/hdfpack bin/hdftopal bin/hdftor8 bin/hdfunpac bin/hdiff bin/hdp bin/hrepack bin/jpeg2hdf bin/ncdump bin/ncgen bin/paltohdf bin/r8tohdf bin/ristosds bin/vmake bin/vshow include/H4api_adpt.h include/atom.h include/bitvect.h include/cdeflate.h include/cnbit.h include/cnone.h include/crle.h include/cskphuff.h include/cszip.h include/df.h include/dfan.h include/dffunc.f90 include/dffunc.inc include/dfgr.h include/dfi.h include/dfrig.h include/dfsd.h include/dfstubs.h include/dfufp2i.h include/dynarray.h include/h4config.h include/hbitio.h include/hchunks.h include/hcomp.h include/hcompi.h include/hconv.h include/hdatainfo.h include/hdf.f90 include/hdf.h include/hdf.inc include/hdf2netcdf.h include/hdfi.h include/herr.h include/hfile.h include/hkit.h include/hlimits.h include/hntdefs.h include/hproto.h include/hproto_fortran.h include/htags.h include/linklist.h include/local_nc.h include/mfan.h include/mfdatainfo.h include/mffunc.f90 include/mffunc.inc include/mfgr.h include/mfhdf.h include/mfhdfi.h include/mstdio.h include/netcdf.f90 include/netcdf.h include/netcdf.inc include/tbbt.h include/vattr.h include/vg.h lib/libdf.a lib/libdf.so lib/libdf.so.2 lib/libdf.so.2.0.0 lib/libhdf4.settings lib/libmfhdf.a lib/libmfhdf.so lib/libmfhdf.so.3 lib/libmfhdf.so.3.0.0 man/man1/hdf.1.gz 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 Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 545783) +++ branches/2020Q3 (revision 545784) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r545783