[75355] trunk/dports/science/ncarg

[takeshi at macports.org]

Revision: 75355
          http://trac.macports.org/changeset/75355
Author:   takeshi at macports.org
Date:     2011-01-22 23:29:50 -0800 (Sat, 22 Jan 2011)
Log Message:
-----------
ncarg: replaced reinplace with patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff

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

Added Paths:
-----------
    trunk/dports/science/ncarg/files/patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2011-01-23 06:10:27 UTC (rev 75354)
+++ trunk/dports/science/ncarg/Portfile	2011-01-23 07:29:50 UTC (rev 75355)
@@ -55,8 +55,9 @@
 
 set usedap y
 
+patchfiles  patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff
 if {$build_arch eq "x86_64"} {
-    patchfiles                  patch-config-ymake.diff
+    patchfiles-append           patch-config-ymake.diff
 }
 post-patch {
     foreach f {Darwin Darwin_Intel} {
@@ -98,7 +99,6 @@
         reinplace "s|hdf\/||" ${worksrcpath}/${f}
     }
     reinplace "s|\$\(NCARGGKSCAIROLIB\) \$\(NCARGCLIB\)|\$(NCARGGKSCAIROLIB) \$(NCARGGKSLIB) \$(NCARGCLIB)|" ${worksrcpath}/config/Project
-    reinplace "s|int_p_NULL|(int*)NULL|g" ${worksrcpath}/ncarg2d/src/libncarg/ezmap/mapngb.c
 }
 #define NetCDF4lib -lnetcdf -lhdf5_hl -lhdf5 -lz -lsz -lmfhdf -ldf -lcurl -lidn -lssl -lcrypto|" ${worksrcpath}/config/${f}
 

Added: trunk/dports/science/ncarg/files/patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff	                        (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ncarg2d-src-libncarg-ezmap-mapngb.c.diff	2011-01-23 07:29:50 UTC (rev 75355)
@@ -0,0 +1,11 @@
+--- ncarg2d/src/libncarg/ezmap/mapngb.c.orig	2010-07-24 14:53:37.000000000 -0500
++++ ncarg2d/src/libncarg/ezmap/mapngb.c	2011-01-22 03:59:02.000000000 -0600
+@@ -78,7 +78,7 @@
+   png_init_io(png_ptr,fp);
+   png_read_info(png_ptr,read_info_ptr);
+   png_get_IHDR(png_ptr,read_info_ptr,&width,&height,&bit_depth,
+-               &color_type,&interlace_type,int_p_NULL,int_p_NULL);
++               &color_type,&interlace_type,(int*)NULL,(int*)NULL);
+   channels=png_get_channels(png_ptr,read_info_ptr);
+   rowbytes=png_get_rowbytes(png_ptr,read_info_ptr);
+   if (bit_depth<8) {png_set_packing(png_ptr);}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110122/3a5694b3/attachment.html>