[100760] trunk/dports/science/wgrib2

[takeshi at macports.org]

Revision: 100760
          https://trac.macports.org/changeset/100760
Author:   takeshi at macports.org
Date:     2012-12-23 00:04:21 -0800 (Sun, 23 Dec 2012)
Log Message:
-----------
wgrib2: added ranlib to enable building +universal, closing #37371

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

Modified: trunk/dports/science/wgrib2/Portfile
===================================================================
--- trunk/dports/science/wgrib2/Portfile	2012-12-23 07:22:52 UTC (rev 100759)
+++ trunk/dports/science/wgrib2/Portfile	2012-12-23 08:04:21 UTC (rev 100760)
@@ -5,7 +5,7 @@
 
 name                wgrib2
 version             1.9.6a
-revision            4
+revision            5
 platforms           darwin
 maintainers         takeshi
 license             public-domain

Modified: trunk/dports/science/wgrib2/files/patch-makefile.diff
===================================================================
--- trunk/dports/science/wgrib2/files/patch-makefile.diff	2012-12-23 07:22:52 UTC (rev 100759)
+++ trunk/dports/science/wgrib2/files/patch-makefile.diff	2012-12-23 08:04:21 UTC (rev 100760)
@@ -1,5 +1,5 @@
 --- makefile.orig	2012-05-15 23:52:15.000000000 +0900
-+++ makefile	2012-11-11 22:26:56.000000000 +0900
++++ makefile	2012-12-23 16:53:14.000000000 +0900
 @@ -76,8 +76,8 @@
  #
  
@@ -39,7 +39,7 @@
  
  fast:        $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib}
  	cd $w && export LDFLAGS="${wLDFLAGS}" && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE}
-@@ -378,10 +378,10 @@
+@@ -378,10 +378,11 @@
  	cd $z && export CFLAGS="${wCPPFLAGS}" && ./configure && ${MAKE}
  
  
@@ -49,19 +49,21 @@
  	rm ${glib}
 -	cd $g && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE}
 +	cd $g && ${MAKE} CPPFLAGS="-I${g} ${CPPFLAGS}"
++	ranlib ${glib}
  
  ${gctpclib}:
  	cp gctpc20.tar.Z tmpgctpc.tar.Z
-@@ -389,7 +389,7 @@
+@@ -389,7 +390,8 @@
  	tar -xvf tmpgctpc.tar
  	rm tmpgctpc.tar
  	cp makefile.gctpc proj.h ${gctpc}/source/
 -	cd ${gctpc}/source && export CPPFLAGS="${wCPPFLAGS}" && ${MAKE} -f makefile.gctpc
 +	cd ${gctpc}/source &&  ${MAKE} -f makefile.gctpc CPPFLAGS="-I${gctpc}/source ${CPPFLAGS}"
++	ranlib ${gctpclib}
  
  ${nlib}:
  	cp netcdf.tar.gz tmpn.tar.gz
-@@ -423,7 +423,7 @@
+@@ -423,7 +425,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/20121223/645e61c3/attachment.html>