<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/eaead356e92ec91f64daee7bc6bbc6bd0252d444">https://github.com/macports/macports-ports/commit/eaead356e92ec91f64daee7bc6bbc6bd0252d444</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 eaead35 hdfeos5: remove hdf5-18 and add pathes to fix build Closes: 54603
</span>eaead35 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit eaead356e92ec91f64daee7bc6bbc6bd0252d444
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Sun Oct 1 16:34:06 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> hdfeos5: remove hdf5-18 and add pathes to fix build
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: 54603
</span>---
science/hdfeos5/Portfile | 15 ++++++----
science/hdfeos5/files/patch-src-GDapi.c.diff | 40 +++++++++++++++++++++++++
science/hdfeos5/files/patch-src-PTapi.c.diff | 11 +++++++
science/hdfeos5/files/patch-src-SWapi.c.diff | 44 ++++++++++++++++++++++++++++
science/hdfeos5/files/patch-src-ZAapi.c.diff | 20 +++++++++++++
5 files changed, 125 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdfeos5/Portfile b/science/hdfeos5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a400a8e..9a0ee89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdfeos5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdfeos5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup mpi 1.0
</span>
name hdfeos5
version 1.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 14
</span> categories science
platforms darwin
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +37,17 @@ worksrcdir ${name}
</span> extract.suffix .tar.Z
fetch.use_epsv no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-GDapi.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-PTapi.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-SWapi.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-ZAapi.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[mpi_variant_isset]} {
set h5cc h5pcc
} else {
set h5cc h5cc
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![catch {set result [active_variants port:hdf5-18 szip]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set result [active_variants port:hdf5 szip]}]} {
</span> if {$result} {
default_variants-append +szip
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,16 +61,16 @@ configure.args --prefix=${prefix}/lib/${name} \
</span> --disable-dependency-tracking
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc ${prefix}/lib/hdf5-18/bin/${h5cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc ${prefix}/bin/${h5cc}
</span> }
post-configure {
file copy -force ${prefix}/bin/glibtool ${worksrcpath}/libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\\\\$CC|${prefix}/lib/hdf5-18/bin/${h5cc}|" ${worksrcpath}/libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\\\\\$CC|${prefix}/bin/${h5cc}|" ${worksrcpath}/libtool
</span> }
variant szip description {enables szip support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants hdf5-18 szip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants hdf5 szip
</span> depends_lib-append port:szip
configure.args-append --with-szlib=${prefix} \
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdfeos5/files/patch-src-GDapi.c.diff b/science/hdfeos5/files/patch-src-GDapi.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dee614c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdfeos5/files/patch-src-GDapi.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/GDapi.c.orig 2014-02-07 01:10:29.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/GDapi.c 2017-10-01 16:15:34.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,8 +88,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int HE5_szip_can_encode(void );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void HE5_GDgetEastAndNorthFiles(char *eastFile, char *northFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static herr_t HE5_GDflddiminfo(int gridID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static herr_t HE5_GDupdatedim(int gridhID, char *dimname, hsize_t dim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static herr_t HE5_GDflddiminfo(hid_t gridID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static herr_t HE5_GDupdatedim(hid_t gridhID, char *dimname, hsize_t dim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FORTRAN wrappers */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* ================ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17263,7 +17263,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | 7/12/00 A.Muslimov Unmasked hdf5 data types. |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-hid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HE5_GDdeftimeperiod(hid_t gridID, hid_t periodID, double starttime, double stoptime)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double timerange[2]={0.,0.};/* Range of periods */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19990,7 +19990,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_GDfldnameinfo(int gridID, const char *fieldname, char *actualname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_GDfldnameinfo(hid_t gridID, const char *fieldname, char *actualname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nameFlag = FAIL;/* Return value of flag */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int length = 0; /* String length */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27698,7 +27698,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_GDflddiminfo(int GridID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_GDflddiminfo(hid_t GridID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t status = FAIL; /* return status */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hid_t gdID = FAIL; /* HDF5 type grid ID */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdfeos5/files/patch-src-PTapi.c.diff b/science/hdfeos5/files/patch-src-PTapi.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f31a6d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdfeos5/files/patch-src-PTapi.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;'>+--- src/PTapi.c.orig 2013-12-13 02:12:02.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/PTapi.c 2017-10-01 16:19:04.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1896,7 +1896,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++hid_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HE5_PTopenlevel(hid_t loc_id, const char *name, void *opdata)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i = 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdfeos5/files/patch-src-SWapi.c.diff b/science/hdfeos5/files/patch-src-SWapi.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bde4b6e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdfeos5/files/patch-src-SWapi.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/SWapi.c.orig 2014-02-07 01:10:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/SWapi.c 2017-10-01 16:24:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,12 +90,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *fldactualname);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_SWupdatedim(int swathID, char *dimname, hsize_t dim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_SWupdatedim(hid_t swathID, char *dimname, hsize_t dim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HE5_SWllmapedidxinfo(hid_t swathID, char *object, long *index0, long *index1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_SWflddiminfo(int SwathID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_SWflddiminfo(hid_t SwathID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[]);
</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;'>+ /* CUSTOM MEMORY MANAGEMENT ROUTINES */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4087,7 +4087,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_SWfldnameinfo(int swathID, char *fieldname, char *actualname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *actualname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nameFlag = FAIL;/* Return value of flag */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int length = 0; /* String length */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4284,7 +4284,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_SWfinfo(int swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_SWfinfo(hid_t swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t status = FAIL;/* routine return status variable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t statmeta = FAIL;/* EHgetmetavalue return status */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31317,7 +31317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_SWflddiminfo(int SwathID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_SWflddiminfo(hid_t SwathID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t status = FAIL; /* return status */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hid_t swID = FAIL; /* HDF5 type swath ID */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdfeos5/files/patch-src-ZAapi.c.diff b/science/hdfeos5/files/patch-src-ZAapi.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8b9cb98
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdfeos5/files/patch-src-ZAapi.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ZAapi.c.orig 2014-01-15 02:00:26.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ZAapi.c 2017-10-01 16:27:15.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2948,7 +2948,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_ZAfldnameinfo(int zaID, char *fieldname, char *actualname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_ZAfldnameinfo(hid_t zaID, char *fieldname, char *actualname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nameFlag = FAIL;/* Return value of flag */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int length = 0; /* String length */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3100,7 +3100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | END_PROLOG |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -----------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static herr_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HE5_ZAfldinfo(int zaID, char *datafield, char *za_name, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HE5_ZAfldinfo(hid_t zaID, char *datafield, char *za_name, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t status = FAIL;/* routine return status variable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ herr_t statmeta = FAIL;/* EHgetmetavalue return status */
</span></pre><pre style='margin:0'>
</pre>