[109081] trunk/dports/science/wgrib2

[takeshi at macports.org]

Revision: 109081
          https://trac.macports.org/changeset/109081
Author:   takeshi at macports.org
Date:     2013-08-07 16:08:12 -0700 (Wed, 07 Aug 2013)
Log Message:
-----------
wgrib2: enabled universal, closing #40003. removed unnecessary patches.

Modified Paths:
--------------
    trunk/dports/science/wgrib2/Portfile
    trunk/dports/science/wgrib2/files/patch-makefile.diff

Removed Paths:
-------------
    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	2013-08-07 22:47:45 UTC (rev 109080)
+++ trunk/dports/science/wgrib2/Portfile	2013-08-07 23:08:12 UTC (rev 109081)
@@ -5,7 +5,7 @@
 
 name                wgrib2
 version             1.9.8
-revision            2
+revision            3
 platforms           darwin
 maintainers         takeshi
 license             public-domain
@@ -35,7 +35,7 @@
 
 patchfiles          patch-makefile.diff
 
-use_configure       no
+configure           {}
 use_parallel_build  no
 
 if {[variant_isset universal]} {
@@ -102,7 +102,6 @@
 }
 
 destroot {
-    system "ranlib ${lg2c}" 
     xinstall -m 644 ${g2c}/grib2.h ${destroot}${prefix}/include
     xinstall -m 644 ${lg2c} ${destroot}${prefix}/lib
     xinstall -m 755 ${worksrcpath}/${name}/${name} ${destroot}${prefix}/bin

Deleted: trunk/dports/science/wgrib2/files/patch-dec_png.c.diff
===================================================================
--- trunk/dports/science/wgrib2/files/patch-dec_png.c.diff	2013-08-07 22:47:45 UTC (rev 109080)
+++ trunk/dports/science/wgrib2/files/patch-dec_png.c.diff	2013-08-07 23:08:12 UTC (rev 109081)
@@ -1,11 +0,0 @@
---- g2clib-1.2.1/dec_png.c.orig	2011-07-16 04:38:22.000000000 +0900
-+++ g2clib-1.2.1/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   */

Deleted: trunk/dports/science/wgrib2/files/patch-enc_png.c.diff
===================================================================
--- trunk/dports/science/wgrib2/files/patch-enc_png.c.diff	2013-08-07 22:47:45 UTC (rev 109080)
+++ trunk/dports/science/wgrib2/files/patch-enc_png.c.diff	2013-08-07 23:08:12 UTC (rev 109081)
@@ -1,11 +0,0 @@
---- g2clib-1.2.1/enc_png.c.orig	2011-07-16 04:38:22.000000000 +0900
-+++ g2clib-1.2.1/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);  */

Modified: trunk/dports/science/wgrib2/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/wgrib2/files/patch-makefile.diff	2013-08-07 22:47:45 UTC (rev 109080)
+++ trunk/dports/science/wgrib2/files/patch-makefile.diff	2013-08-07 23:08:12 UTC (rev 109081)
@@ -1,5 +1,5 @@
---- makefile.orig	2013-07-27 15:43:19.000000000 +0900
-+++ makefile	2013-07-27 15:44:32.000000000 +0900
+--- makefile.orig	2013-08-07 18:27:02.000000000 +0900
++++ makefile	2013-08-07 18:28:30.000000000 +0900
 @@ -83,8 +83,8 @@
  #
  
@@ -40,7 +40,7 @@
  
  fast:        $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib}
  	cd "$w" && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} fast
-@@ -415,7 +414,7 @@
+@@ -415,18 +414,21 @@
  	cd "$z" && export CFLAGS="${wCPPFLAGS}" && ./configure && ${MAKE}
  
  
@@ -49,7 +49,10 @@
  	touch ${glib}
  	rm ${glib}
  	cd "$g" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE}
-@@ -425,8 +424,10 @@
++	ranlib ${glib}
+ 
+ ${gctpclib}:
+ 	cp gctpc20.tar.Z tmpgctpc.tar.Z
  	gunzip -n -f tmpgctpc.tar.Z
  	tar -xvf tmpgctpc.tar
  	rm tmpgctpc.tar
@@ -62,7 +65,7 @@
  
  ${proj4lib}:
  	rm -rf ${proj4} ${proj4src}
-@@ -469,7 +470,7 @@
+@@ -469,7 +471,7 @@
  	cd "${h5}" && export CPPFLAGS="${CPPFLAGS}" && ./configure --disable-shared --disable-fortran --with-zlib=$z && ${MAKE} && ${MAKE}
  
  ${iplib}:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130807/c2913839/attachment.html>