[147503] trunk/dports/science/hdfeos5
takeshi at macports.org
takeshi at macports.org
Wed Apr 6 00:27:14 PDT 2016
Revision: 147503
https://trac.macports.org/changeset/147503
Author: takeshi at macports.org
Date: 2016-04-06 00:27:14 -0700 (Wed, 06 Apr 2016)
Log Message:
-----------
hdfeos5: fix build error due to r147494
Revision Links:
--------------
https://trac.macports.org/changeset/147494
Modified Paths:
--------------
trunk/dports/science/hdfeos5/Portfile
Added Paths:
-----------
trunk/dports/science/hdfeos5/files/
trunk/dports/science/hdfeos5/files/patch-src-GDapi.c.diff
trunk/dports/science/hdfeos5/files/patch-src-PTapi.c.diff
trunk/dports/science/hdfeos5/files/patch-src-SWapi.c.diff
trunk/dports/science/hdfeos5/files/patch-src-ZAapi.c.diff
Modified: trunk/dports/science/hdfeos5/Portfile
===================================================================
--- trunk/dports/science/hdfeos5/Portfile 2016-04-06 06:30:38 UTC (rev 147502)
+++ trunk/dports/science/hdfeos5/Portfile 2016-04-06 07:27:14 UTC (rev 147503)
@@ -7,7 +7,7 @@
name hdfeos5
version 1.15
-revision 9
+revision 10
categories science
platforms darwin
license public-domain
@@ -38,6 +38,11 @@
extract.suffix .tar.Z
fetch.use_epsv no
+patchfiles patch-src-GDapi.c.diff \
+ patch-src-PTapi.c.diff \
+ patch-src-SWapi.c.diff \
+ patch-src-ZAapi.c.diff
+
mpi.enforce_variant hdf5
if {[mpi_variant_isset]} {
set h5cc h5pcc
Added: trunk/dports/science/hdfeos5/files/patch-src-GDapi.c.diff
===================================================================
--- trunk/dports/science/hdfeos5/files/patch-src-GDapi.c.diff (rev 0)
+++ trunk/dports/science/hdfeos5/files/patch-src-GDapi.c.diff 2016-04-06 07:27:14 UTC (rev 147503)
@@ -0,0 +1,47 @@
+--- src/GDapi.c.orig 2016-04-06 16:20:38.000000000 +0900
++++ src/GDapi.c 2016-04-06 16:22:11.000000000 +0900
+@@ -89,7 +89,7 @@
+ void HE5_GDgetEastAndNorthFiles(char *eastFile, char *northFile);
+
+ static herr_t HE5_GDflddiminfo(int gridID, char *fieldname, int *rank, hsize_t dims[], hsize_t maxdims[]);
+-static herr_t HE5_GDupdatedim(int gridhID, char *dimname, hsize_t dim);
++static herr_t HE5_GDupdatedim(hid_t gridhID, char *dimname, hsize_t dim);
+
+ /* FORTRAN wrappers */
+ /* ================ */
+@@ -166,7 +166,7 @@
+
+ int HE5_GDdefboxregionF(int gridID, double cornerlon[], double cornerlat[]);
+ int HE5_GDextractregionF(int gridID, int regionID, char *fieldname, void *buffer);
+-int HE5_GDdeftimeperiodF(int gridID, int periodID, double starttime, double stoptime);
++int HE5_GDdeftimeperiodF(hid_t gridID, hid_t periodID, double starttime, double stoptime);
+ int HE5_GDdefvrtregionF(int gridID, int regionID, char *vertObj, double range[]);
+ int HE5_GDdupregionF(int oldregionID);
+ int HE5_GDgetpixelsF(int gridID, long nLonLat, double lonVal[], double latVal[], long pixRow[], long pixCol[]);
+@@ -17263,7 +17263,7 @@
+ | 7/12/00 A.Muslimov Unmasked hdf5 data types. |
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+-hid_t
++herr_t
+ HE5_GDdeftimeperiod(hid_t gridID, hid_t periodID, double starttime, double stoptime)
+ {
+ double timerange[2]={0.,0.};/* Range of periods */
+@@ -19990,7 +19990,7 @@
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static int
+-HE5_GDfldnameinfo(int gridID, const char *fieldname, char *actualname)
++HE5_GDfldnameinfo(hid_t gridID, const char *fieldname, char *actualname)
+ {
+ int nameFlag = FAIL;/* Return value of flag */
+ int length = 0; /* String length */
+@@ -25947,7 +25947,7 @@
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ int
+-HE5_GDdeftimeperiodF(int GridID, int PeriodID, double starttime, double stoptime)
++HE5_GDdeftimeperiodF(hid_t GridID, hid_t PeriodID, double starttime, double stoptime)
+ {
+ hid_t gridID = FAIL;/* HDF5 type Grid ID */
+ hid_t periodID = FAIL;/* HDF5 type period ID */
Added: trunk/dports/science/hdfeos5/files/patch-src-PTapi.c.diff
===================================================================
--- trunk/dports/science/hdfeos5/files/patch-src-PTapi.c.diff (rev 0)
+++ trunk/dports/science/hdfeos5/files/patch-src-PTapi.c.diff 2016-04-06 07:27:14 UTC (rev 147503)
@@ -0,0 +1,11 @@
+--- src/PTapi.c.orig 2013-12-13 02:12:02.000000000 +0900
++++ src/PTapi.c 2016-04-06 15:34:56.000000000 +0900
+@@ -1896,7 +1896,7 @@
+ | |
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+-int
++hid_t
+ HE5_PTopenlevel(hid_t loc_id, const char *name, void *opdata)
+ {
+ int i = 0;
Added: trunk/dports/science/hdfeos5/files/patch-src-SWapi.c.diff
===================================================================
--- trunk/dports/science/hdfeos5/files/patch-src-SWapi.c.diff (rev 0)
+++ trunk/dports/science/hdfeos5/files/patch-src-SWapi.c.diff 2016-04-06 07:27:14 UTC (rev 147503)
@@ -0,0 +1,29 @@
+--- src/SWapi.c.orig 2016-04-06 15:53:11.000000000 +0900
++++ src/SWapi.c 2016-04-06 15:59:09.000000000 +0900
+@@ -90,7 +90,7 @@
+ static int
+ HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *fldactualname);
+ static herr_t
+-HE5_SWupdatedim(int swathID, char *dimname, hsize_t dim);
++HE5_SWupdatedim(hid_t swathID, char *dimname, hsize_t dim);
+ static herr_t
+ HE5_SWllmapedidxinfo(hid_t swathID, char *object, long *index0, long *index1);
+
+@@ -4087,7 +4087,7 @@
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static int
+-HE5_SWfldnameinfo(int swathID, char *fieldname, char *actualname)
++HE5_SWfldnameinfo(hid_t swathID, char *fieldname, char *actualname)
+ {
+ int nameFlag = FAIL;/* Return value of flag */
+ int length = 0; /* String length */
+@@ -4284,7 +4284,7 @@
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static herr_t
+-HE5_SWfinfo(int swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
++HE5_SWfinfo(hid_t swathID, char *fieldtype, char *fieldname, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
+ {
+ herr_t status = FAIL;/* routine return status variable */
+ herr_t statmeta = FAIL;/* EHgetmetavalue return status */
Added: trunk/dports/science/hdfeos5/files/patch-src-ZAapi.c.diff
===================================================================
--- trunk/dports/science/hdfeos5/files/patch-src-ZAapi.c.diff (rev 0)
+++ trunk/dports/science/hdfeos5/files/patch-src-ZAapi.c.diff 2016-04-06 07:27:14 UTC (rev 147503)
@@ -0,0 +1,20 @@
+--- src/ZAapi.c.orig 2014-01-15 02:00:26.000000000 +0900
++++ src/ZAapi.c 2016-04-06 15:43:53.000000000 +0900
+@@ -2948,7 +2948,7 @@
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static int
+-HE5_ZAfldnameinfo(int zaID, char *fieldname, char *actualname)
++HE5_ZAfldnameinfo(hid_t zaID, char *fieldname, char *actualname)
+ {
+ int nameFlag = FAIL;/* Return value of flag */
+ int length = 0; /* String length */
+@@ -3100,7 +3100,7 @@
+ | END_PROLOG |
+ -----------------------------------------------------------------------------*/
+ static herr_t
+-HE5_ZAfldinfo(int zaID, char *datafield, char *za_name, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
++HE5_ZAfldinfo(hid_t zaID, char *datafield, char *za_name, int *rank, hsize_t dims[], hid_t numbertype[], char *dimlist, char *maxdimlist)
+ {
+ herr_t status = FAIL;/* routine return status variable */
+ herr_t statmeta = FAIL;/* EHgetmetavalue return status */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160406/d578b5d8/attachment.html>
More information about the macports-changes
mailing list