[97365] trunk/dports/science/wgrib2

[takeshi at macports.org]

Revision: 97365
          https://trac.macports.org/changeset/97365
Author:   takeshi at macports.org
Date:     2012-09-04 01:41:15 -0700 (Tue, 04 Sep 2012)
Log Message:
-----------
wgrib2: replaced voidp with png_voidp in png_set_read_fn() and png_set_write_fn()

Modified Paths:
--------------
    trunk/dports/science/wgrib2/Portfile

Added Paths:
-----------
    trunk/dports/science/wgrib2/files/
    trunk/dports/science/wgrib2/files/patch-dec_png.c.diff
    trunk/dports/science/wgrib2/files/patch-enc_png.c.diff

Modified: trunk/dports/science/wgrib2/Portfile
===================================================================
--- trunk/dports/science/wgrib2/Portfile	2012-09-04 08:33:10 UTC (rev 97364)
+++ trunk/dports/science/wgrib2/Portfile	2012-09-04 08:41:15 UTC (rev 97365)
@@ -5,7 +5,7 @@
 
 name                wgrib2
 version             1.9.6a
-revision            1
+revision            2
 platforms           darwin
 maintainers         takeshi
 categories          science
@@ -31,6 +31,9 @@
                     port:netcdf \
                     port:hdf5-18
 
+patchfiles          patch-dec_png.c.diff \
+                    patch-enc_png.c.diff
+
 post-patch {
   set f ${workpath}/grib2/${name}/config.h
   reinplace "s|#define USE_NETCDF3|//#define USE_NETCDF3|" ${f}

Added: trunk/dports/science/wgrib2/files/patch-dec_png.c.diff
===================================================================
--- trunk/dports/science/wgrib2/files/patch-dec_png.c.diff	                        (rev 0)
+++ trunk/dports/science/wgrib2/files/patch-dec_png.c.diff	2012-09-04 08:41:15 UTC (rev 97365)
@@ -0,0 +1,11 @@
+--- dec_png.c.orig	2011-07-16 04:38:22.000000000 +0900
++++ dec_png.c	2012-09-04 15:54:57.000000000 +0900
+@@ -88,7 +88,7 @@
+ 
+ /*    Set new custom read function    */
+ 
+-    png_set_read_fn(png_ptr,(voidp)&read_io_ptr,(png_rw_ptr)user_read_data);
++    png_set_read_fn(png_ptr,(png_voidp)&read_io_ptr,(png_rw_ptr)user_read_data);
+ /*     png_init_io(png_ptr, fptr);   */
+ 
+ /*     Read and decode PNG stream   */

Added: trunk/dports/science/wgrib2/files/patch-enc_png.c.diff
===================================================================
--- trunk/dports/science/wgrib2/files/patch-enc_png.c.diff	                        (rev 0)
+++ trunk/dports/science/wgrib2/files/patch-enc_png.c.diff	2012-09-04 08:41:15 UTC (rev 97365)
@@ -0,0 +1,11 @@
+--- enc_png.c.orig	2011-07-16 04:38:22.000000000 +0900
++++ enc_png.c	2012-09-04 15:58:10.000000000 +0900
+@@ -88,7 +88,7 @@
+ 
+ /*    Set new custom write functions    */
+ 
+-    png_set_write_fn(png_ptr,(voidp)&write_io_ptr,(png_rw_ptr)user_write_data,
++    png_set_write_fn(png_ptr,(png_voidp)&write_io_ptr,(png_rw_ptr)user_write_data,
+                     (png_flush_ptr)user_flush_data);
+ /*    png_init_io(png_ptr, fptr);   */
+ /*    png_set_compression_level(png_ptr, Z_BEST_COMPRESSION);  */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120904/1bbb163e/attachment.html>