<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/19abd99be97c0193ebb4b86d008be1114c5eaac8">https://github.com/macports/macports-ports/commit/19abd99be97c0193ebb4b86d008be1114c5eaac8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 19abd99be97 hdf4: added patches to fix implicit functions
</span>19abd99be97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 19abd99be97c0193ebb4b86d008be1114c5eaac8
</span>Author: tenomoto <takeshi@macports.org>
AuthorDate: Sun Nov 22 10:15:18 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> hdf4: added patches to fix implicit functions
</span>---
science/hdf4/Portfile | 23 +++++++++++-----------
science/hdf4/files/patch-mfhdf-Makefile.in.diff | 13 ++++++++++++
.../hdf4/files/patch-mfhdf-hdiff-hdiff_main.c.diff | 10 ++++++++++
science/hdf4/files/patch-mfhdf-libsrc-file.c.diff | 10 ++++++++++
science/hdf4/files/patch-mfhdf-test-hdftest.c.diff | 11 +++++++++++
.../hdf4/files/patch-mfhdf-test-tdatainfo.c.diff | 10 ++++++++++
science/hdf4/files/patch-mfhdf-test-tfile.c.diff | 11 +++++++++++
.../files/patch-mfhdf-test-tncvargetfill.c.diff | 11 +++++++++++
science/hdf4/files/patch-mfhdf-test-tsd.c.diff | 10 ++++++++++
science/hdf4/files/patch-mfhdf-test-tszip.c.diff | 10 ++++++++++
10 files changed, 107 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/Portfile b/science/hdf4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 311475f6d04..96a9e582c62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdf4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,23 +30,23 @@ depends_lib port:zlib port:jpeg
</span> patchfiles patch-configure.diff \
patch-m4-libtool.m4.diff \
patch-hdf-examples-Makefile.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mfhdf-examples-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-examples-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-hdiff-hdiff_main.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-libsrc-file.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-test-hdftest.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-test-tdatainfo.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-test-tfile.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-test-tncvargetfill.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-test-tsd.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mfhdf-test-tszip.c.diff
</span>
configure.args --disable-netcdf --disable-fortran \
--with-jpeg=${prefix} --enable-shared \
--without-szlib
configure.cppflags-delete -I${prefix}/include
configure.ldflags-delete -L${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -Wno-error=implicit-function-declaration
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## remove -arch from h4cc to fix failure of h4cc -E with +universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace -E {s|-arch [a-z0-9_]+||g} ${worksrcpath}/hdf/util/h4cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## remove ccache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if ${configure.ccache} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace {s|ccache ||} ${worksrcpath}/hdf/util/h4cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +57,7 @@ post-destroot {
</span> foreach f {COPYING release_notes/HISTORY.txt release_notes/RELEASE.txt} {
file copy ${worksrcpath}/$f ${destroot}${prefix}/share/doc/${name}/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f {bin/ncdump bin/ncgen lib/libudport.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/netcdf.h include/netcdf.inc include/netcdf.f90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f {lib/libudport.a include/netcdf.h include/netcdf.inc include/netcdf.f90 \
</span> share/man/man1/ncgen.1 share/man/man1/ncdump.1} {
file delete ${destroot}${prefix}/$f
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-Makefile.in.diff b/science/hdf4/files/patch-mfhdf-Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7a1394cbcf9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/Makefile.in.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/Makefile.in 2020-11-22 09:57:41.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -377,8 +377,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @HDF_BUILD_FORTRAN_TRUE@FORTRAN_DIR = fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # src folder in root Makefile, build other folders now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test ncdump ncgen dumper hdfimport hdiff hrepack nctest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DIST_SUBDIRS = xdr libsrc fortran test ncdump ncgen dumper hdfimport hdiff hrepack nctest examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test dumper hdfimport hdiff hrepack nctest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DIST_SUBDIRS = xdr libsrc fortran test dumper hdfimport hdiff hrepack nctest examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: all-recursive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SUFFIXES:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-hdiff-hdiff_main.c.diff b/science/hdf4/files/patch-mfhdf-hdiff-hdiff_main.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5203906e268
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-hdiff-hdiff_main.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/hdiff/hdiff_main.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/hdiff/hdiff_main.c 2020-11-22 10:10:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-libsrc-file.c.diff b/science/hdf4/files/patch-mfhdf-libsrc-file.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9b8a053d5d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-libsrc-file.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/libsrc/file.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/libsrc/file.c 2020-11-21 20:28:41.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <assert.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* DEBUG */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "local_nc.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-test-hdftest.c.diff b/science/hdf4/files/patch-mfhdf-test-hdftest.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..82a3641b755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-test-hdftest.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/test/hdftest.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/test/hdftest.c 2020-11-22 05:43:00.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int test_coordvar();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int test_chunk();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int test_compression();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern int test_dimension();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int test_dimensions();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int test_attributes();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int test_datasizes();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int test_datainfo();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-test-tdatainfo.c.diff b/science/hdf4/files/patch-mfhdf-test-tdatainfo.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0d73fdee8a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-test-tdatainfo.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/test/tdatainfo.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/test/tdatainfo.c 2020-11-22 06:18:51.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mfhdf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HDFLIBAPI intn SDgetdatainfo (int32, int32*, uintn, uintn, int32*, int32*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef H4_HAVE_SYS_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-test-tfile.c.diff b/science/hdf4/files/patch-mfhdf-test-tfile.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c8eaf0f8f25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-test-tfile.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/test/tfile.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/test/tfile.c 2020-11-22 06:03:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* $Id: tfile.c 5218 2009-08-29 04:21:49Z bmribler $ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mfhdf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "local_nc.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern intn make_datafilename(char*, char*, unsigned int );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-test-tncvargetfill.c.diff b/science/hdf4/files/patch-mfhdf-test-tncvargetfill.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2463454b5b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-test-tncvargetfill.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/test/tncvargetfill.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/test/tncvargetfill.c 2020-11-21 20:54:01.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mfhdf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hdftest.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int verify_info_data( int32, int32, int16 * );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DIM0 20 /* this value is used to declare larger buffer for when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reading past the maximum number of records in the file */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-test-tsd.c.diff b/science/hdf4/files/patch-mfhdf-test-tsd.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2a635766e72
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-test-tsd.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/test/tsd.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/test/tsd.c 2020-11-22 05:53:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * tsd.c - tests SDstart for file with no write permission
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "mfhdf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HDF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf4/files/patch-mfhdf-test-tszip.c.diff b/science/hdf4/files/patch-mfhdf-test-tszip.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6636f2faeaf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf4/files/patch-mfhdf-test-tszip.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mfhdf/test/tszip.c.orig 2020-03-04 02:40:50.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mfhdf/test/tszip.c 2020-11-22 06:06:46.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef H4_HAVE_LIBSZ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "szlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern intn make_datafilename(char*, char*, unsigned int );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FILE_NAME8 "SDS_8_sziped.hdf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FILE_NAME16 "SDS_16_sziped.hdf"
</span></pre><pre style='margin:0'>
</pre>