<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121032] trunk/dports/science/wgrib2</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121032">121032</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-06-14 20:21:33 -0700 (Sat, 14 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>wgrib2: updated for 2.0.0. use PortGroup compilers. use canonical names for patches. link against a new separate port gctpc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencewgrib2Portfile">trunk/dports/science/wgrib2/Portfile</a></li>
<li><a href="#trunkdportssciencewgrib2filespatchmakefilediff">trunk/dports/science/wgrib2/files/patch-makefile.diff</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencewgrib2filespatchg2clibmakefilediff">trunk/dports/science/wgrib2/files/patch-g2clib-makefile.diff</a></li>
<li><a href="#trunkdportssciencewgrib2filespatchiplibmakefilediff">trunk/dports/science/wgrib2/files/patch-iplib-makefile.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencewgrib2filesranlibpatch">trunk/dports/science/wgrib2/files/ranlib.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencewgrib2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/wgrib2/Portfile (121031 => 121032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wgrib2/Portfile        2014-06-15 03:15:05 UTC (rev 121031)
+++ trunk/dports/science/wgrib2/Portfile        2014-06-15 03:21:33 UTC (rev 121032)
</span><span class="lines">@@ -1,11 +1,14 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> # $Id$
</span><span class="cx"> 
</span><del>-PortSystem 1.0
</del><ins>+PortSystem          1.0
+PortGroup compilers 1.0
</ins><span class="cx"> 
</span><ins>+compilers.choose    fc f77 f90
+compilers.setup
+
</ins><span class="cx"> name                wgrib2
</span><del>-version             1.9.9
-revision            3
</del><ins>+version             2.0.0
</ins><span class="cx"> platforms           darwin
</span><span class="cx"> maintainers         takeshi
</span><span class="cx"> license             public-domain
</span><span class="lines">@@ -17,9 +20,9 @@
</span><span class="cx"> extract.suffix     
</span><span class="cx"> set version_iplib   2012
</span><span class="cx"> set version_g2clib  1.4.0
</span><del>-checksums           md5     0b2a6acfcf4e2abf55b72bbdcc06c575 \
-                    sha1    4dafc4aa7369d69c9d4039a0c6bdb6d56f381b90 \
-                    rmd160  da3351788c3b9ca6b77a3039396435c77079213c
</del><ins>+checksums           md5     47fcc30c1b4d4f883952fdd0cb683a97 \
+                    sha1    eee050b720ba4bc4891d41e7f5c81ad2033c091c \
+                    rmd160  f915db25714fb2af88c706988c0ac421e83321fc
</ins><span class="cx"> homepage            http://www.cpc.ncep.noaa.gov/products/wesley/wgrib2/
</span><span class="cx"> long_description   \
</span><span class="cx">     wgrib2 is a swiss army knife for grib2 files. \
</span><span class="lines">@@ -33,65 +36,19 @@
</span><span class="cx"> 
</span><span class="cx"> worksrcdir          grib2
</span><span class="cx"> 
</span><del>-patchfiles          patch-makefile.diff ranlib.patch
-
-configure           {}
</del><ins>+patchfiles          patch-makefile.diff  \
+                    patch-g2clib-makefile.diff \
+                    patch-iplib-makefile.diff
+use_configure       no
</ins><span class="cx"> use_parallel_build  no
</span><span class="cx"> 
</span><span class="cx"> set ip ${worksrcpath}/iplib.${version_iplib}
</span><span class="cx"> set lipolate ${ip}/libipolate.a
</span><span class="cx"> set g2c ${worksrcpath}/g2clib-${version_g2clib}
</span><span class="cx"> set lg2c ${g2c}/libgrib2c.a
</span><del>-set gctpc ${worksrcpath}/gctpc
-set lgeo ${gctpc}/source/libgeo.a
-set fsymbol &quot;&quot;
</del><ins>+set lgctpc -lgctpc
</ins><span class="cx"> 
</span><del>-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} &quot;.&quot;] &quot;&quot;]
-
-    set variant_line {variant gcc${ver_no_dot} description &quot;build iplib with gfortran from gcc${ver_no_dot}&quot; conflicts g95}
-
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-
-        set over_no_dot [join [split ${over} &quot;.&quot;] &quot;&quot;]
-        append variant_line &quot; conflicts gcc${over_no_dot}&quot;
-    }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts &quot; conflicts gcc${ver_no_dot}&quot;
-}
-
-eval [concat {variant g95 description {build iplib with g95}} $g95_conflicts {{}}]
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} &quot;.&quot;] &quot;&quot;]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
-
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        set fsymbol -DGFORTRAN
-        set my_ver_no_dot ${ver_no_dot}
-    }
-}
-
-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
-
-    configure.fc ${prefix}/bin/g95
-    set fsymbol -DG95
-}
-
</del><ins>+configure.cppflags-append   -I${prefix}/include/gctpc
</ins><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx">     set cflags &quot;${configure.cflags} ${configure.universal_cflags}&quot;
</span><span class="cx">     set ldflags &quot;${configure.ldflags} ${configure.universal_ldflags}&quot;
</span><span class="lines">@@ -99,35 +56,42 @@
</span><span class="cx">     set cflags &quot;${configure.cflags} ${configure.cc_archflags}&quot;
</span><span class="cx">     set ldflags &quot;${configure.ldflags} ${configure.cc_archflags}&quot;
</span><span class="cx"> }
</span><ins>+build.args         &quot;-f makefile \
+                    zlib=\&quot;\&quot; plib=\&quot;\&quot; jlib=\&quot;\&quot; h5lib=\&quot;\&quot; n4lib=\&quot;\&quot; &quot;
</ins><span class="cx"> 
</span><del>-if {${fsymbol} != &quot;&quot;} {
</del><ins>+set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set fsymbol &quot;&quot;
+if {[fortran_variant_isset]} {
</ins><span class="cx">     set iip &quot;-I${ip}&quot;
</span><del>-    set libs &quot;${lg2c} ${lgeo} ${lipolate}&quot;
</del><ins>+    set libs &quot;${lg2c} ${lgctpc} ${lipolate}&quot;
+    build.args-append   USE_IPOLATES=1
+    if {[variant_isset g95]} {
+        set fsymbol -DG95
+        configure.fc    ${prefix}/bin/g95
+        set libs &quot;${libs} -lf95&quot;
+    } else {
+        set fsymbol -DGFORTRAN
+        build.args-append   USE_OPENMP=1
+        foreach ver ${gcc_versions} {
+            set ver_no_dot [join [split ${ver} &quot;.&quot;] &quot;&quot;]
+            if {[variant_isset gcc${ver_no_dot}]} {
+                configure.fc    ${prefix}/bin/gfortran-mp-${ver}
+                set libs &quot;${libs} -L${prefix}/lib/gcc${ver_no_dot} -lgfortran&quot;
+            }
+        }
+    }
+    build.env           FC=\&quot;${configure.fc}\&quot; \
+                        F90=\&quot;${configure.fc}\&quot; \
+                        FFLAGS=\&quot;${configure.fflags}\&quot;
</ins><span class="cx"> } else {
</span><span class="cx">     set iip &quot;&quot;
</span><del>-    set libs &quot;${lg2c} ${lgeo}&quot;
</del><ins>+    set libs &quot;${lg2c} ${lgctpc}&quot;
</ins><span class="cx"> }
</span><del>-if {${fsymbol} == &quot;-DGFORTRAN&quot;} {
-    set libs &quot;${libs} -L${prefix}/lib/gcc${my_ver_no_dot} -lgfortran&quot;
-} elseif {${fsymbol} == &quot;-DG95&quot;} {
-    set libs &quot;${libs} -lf95&quot;
-}
-build.env           LDFLAGS=\&quot;${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\&quot; \
</del><ins>+build.env-append    LDFLAGS=\&quot;${libs} ${configure.ldflags} -lpng -ljasper -lnetcdf\&quot; \
</ins><span class="cx">                     CC=\&quot;${configure.cc}\&quot; \
</span><span class="cx">                     CPPFLAGS=\&quot;${fsymbol} ${configure.cppflags}\&quot; \
</span><span class="cx">                     CFLAGS=\&quot;${cflags}\&quot;
</span><del>-build.args         &quot;-f makefile \
-                    zlib=\&quot;\&quot; plib=\&quot;\&quot; jlib=\&quot;\&quot; h5lib=\&quot;\&quot; n4lib=\&quot;\&quot; \
-                    iip=\&quot;${iip}\&quot; &quot;
-if {${fsymbol} != &quot;&quot;} {
-    build.args-append   USE_IPOLATES=1
-    build.env-append    FC=\&quot;${configure.fc}\&quot; \
-                        F90=\&quot;${configure.fc}\&quot; \
-                        FFLAGS=\&quot;${configure.fflags}\&quot;
-}
-if {${fsymbol} != &quot;-DGFORTRAN&quot;} {
-    build.args-append   USE_OPENMP=1
-}
</del><ins>+build.args-append   iip=\&quot;${iip}\&quot;
</ins><span class="cx"> 
</span><span class="cx"> destroot {
</span><span class="cx">     xinstall -m 644 ${g2c}/grib2.h ${destroot}${prefix}/include
</span></span></pre></div>
<a id="trunkdportssciencewgrib2filespatchg2clibmakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/wgrib2/files/patch-g2clib-makefile.diff (0 => 121032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wgrib2/files/patch-g2clib-makefile.diff                                (rev 0)
+++ trunk/dports/science/wgrib2/files/patch-g2clib-makefile.diff        2014-06-15 03:21:33 UTC (rev 121032)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- g2clib-1.4.0/makefile.orig        2012-09-04 21:27:30.000000000 +0900
++++ g2clib-1.4.0/makefile        2014-06-15 08:29:35.000000000 +0900
+@@ -86,6 +86,7 @@
+ #        $(LIB)(getgb2.o) \
+ #        $(LIB)(putgb2.o) \
+ #        $(LIB)(params.o)
++        ranlib ${LIB}

+ .c.a:
+         $(CC) -c $(CPPFLAGS) $(CFLAGS) ${DEFS} $&lt;
</ins></span></pre></div>
<a id="trunkdportssciencewgrib2filespatchiplibmakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/wgrib2/files/patch-iplib-makefile.diff (0 => 121032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wgrib2/files/patch-iplib-makefile.diff                                (rev 0)
+++ trunk/dports/science/wgrib2/files/patch-iplib-makefile.diff        2014-06-15 03:21:33 UTC (rev 121032)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- iplib.2012/makefile.orig        2012-02-25 04:57:49.000000000 +0900
++++ iplib.2012/makefile        2014-06-15 08:31:21.000000000 +0900
+@@ -32,6 +32,7 @@

+ $(LIB):        $(objs)
+         ar $(ARFLAGS) ${LIB} $(objs)
++        ranlib ${LIB}

+ .f.o:
+         $(FC) ${FFLAGS} -c $&lt;
</ins></span></pre></div>
<a id="trunkdportssciencewgrib2filespatchmakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/wgrib2/files/patch-makefile.diff (121031 => 121032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wgrib2/files/patch-makefile.diff        2014-06-15 03:15:05 UTC (rev 121031)
+++ trunk/dports/science/wgrib2/files/patch-makefile.diff        2014-06-15 03:21:33 UTC (rev 121032)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- makefile.orig        2013-09-19 00:09:17.000000000 +0900
-+++ makefile        2013-11-17 12:32:27.000000000 +0900
-@@ -91,8 +91,8 @@
</del><ins>+--- makefile.orig        2014-06-07 03:37:11.000000000 +0900
++++ makefile        2014-06-15 11:28:40.000000000 +0900
+@@ -92,8 +92,8 @@
</ins><span class="cx">  #
</span><span class="cx">  
</span><span class="cx">  # Warning do not set both USE_NETCDF3 and USE_NETCDF4 to one
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">  USE_REGEX=1
</span><span class="cx">  USE_TIGGE=1
</span><span class="cx">  USE_MYSQL=0
</span><del>-@@ -127,11 +127,11 @@
</del><ins>+@@ -132,11 +132,11 @@
</ins><span class="cx">    endif
</span><span class="cx">  endif
</span><span class="cx">  
</span><span class="lines">@@ -28,7 +28,20 @@
</span><span class="cx">  
</span><span class="cx">  ifeq ($(USE_IPOLATES),1)
</span><span class="cx">    ifeq ($(FC),)
</span><del>-@@ -430,11 +430,11 @@
</del><ins>+@@ -226,9 +226,9 @@
+ # gctpc library
+ gctpc:=${cwd}/gctpc
+ gctpcsrc:=gctpc20a.tgz
+-gctpclib:=${lib}/libgeo.a
+-wLDFLAGS+=-lgeo
+-# wCPPFLAGS+=-I${gctpc}/source
++gctpclib:=${lib}/libgctpc.a
++wLDFLAGS+=-lgctpc
++wCPPFLAGS+=-I${prefix}/include/gctpc

+ # proj4 library
+ ifeq ($(USE_PROJ4),1)
+@@ -446,11 +446,11 @@
</ins><span class="cx">  w=wgrib2
</span><span class="cx">  prog=$w/wgrib2
</span><span class="cx">  
</span><span class="lines">@@ -38,12 +51,12 @@
</span><span class="cx">  
</span><span class="cx"> -${prog}:        $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib}
</span><span class="cx"> -        cd &quot;$w&quot; &amp;&amp; export LDFLAGS=&quot;${wLDFLAGS}&quot; &amp;&amp; export CPPFLAGS=&quot;${wCPPFLAGS}&quot; &amp;&amp; ${MAKE}
</span><del>-+${prog}:        $w/*.c $w/*.h ${glib} ${iplib} ${gctpclib}
-+        cd &quot;$w&quot; &amp;&amp; ${MAKE} CPPFLAGS=&quot;-I${g} -I${gctpc}/source ${iip} ${CPPFLAGS}&quot;
</del><ins>++${prog}:        $w/*.c $w/*.h ${glib} ${iplib}
++        cd &quot;$w&quot; &amp;&amp; ${MAKE} CPPFLAGS=&quot;-I${g} ${iip} ${CPPFLAGS}&quot;
</ins><span class="cx">  
</span><span class="cx">  fast:        $w/*.c $w/*.h ${jlib} ${nlib} ${zlib} ${plib} ${h5lib} ${glib} ${n4lib} ${iplib} ${gctpclib} ${proj4lib}
</span><span class="cx">          cd &quot;$w&quot; &amp;&amp; export LDFLAGS=&quot;${wLDFLAGS}&quot; &amp;&amp; export CPPFLAGS=&quot;${wCPPFLAGS}&quot; &amp;&amp; ${MAKE} fast
</span><del>-@@ -465,19 +465,21 @@
</del><ins>+@@ -481,10 +481,11 @@
</ins><span class="cx">          cd &quot;$z&quot; &amp;&amp; export CFLAGS=&quot;${wCPPFLAGS}&quot; &amp;&amp; ./configure --prefix=${cwd} &amp;&amp; ${MAKE} check install
</span><span class="cx">  
</span><span class="cx">  
</span><span class="lines">@@ -55,24 +68,21 @@
</span><span class="cx"> +        ranlib ${glib}
</span><span class="cx">  
</span><span class="cx">  ${gctpclib}:
</span><del>-         cp ${gctpcsrc} tmpgctpc.tar.Z
-         gunzip -n -f tmpgctpc.tar.Z
</del><ins>+         cp ${gctpcsrc} tmpgctpc.tar.gz
+@@ -492,7 +493,7 @@
</ins><span class="cx">          tar -xvf tmpgctpc.tar
</span><span class="cx">          rm tmpgctpc.tar
</span><del>--        cp makefile.gctpc proj.h cproj.c ${gctpc}/source/
</del><ins>+         cp makefile.gctpc proj.h ${gctpc}/source/
</ins><span class="cx"> -        cd &quot;${gctpc}/source&quot; &amp;&amp; export CPPFLAGS=&quot;${wCPPFLAGS}&quot; &amp;&amp; ${MAKE} -f makefile.gctpc
</span><del>-+        cp makefile.gctpc proj.h ${gctpc}/source/
</del><span class="cx"> +        cd &quot;${gctpc}/source&quot; &amp;&amp;  ${MAKE} -f makefile.gctpc CPPFLAGS=&quot;-I${gctpc}/source ${CPPFLAGS}&quot;
</span><span class="cx">          cp ${gctpc}/source/libgeo.a ${lib}
</span><del>-+        ranlib ${gctpclib}
</del><span class="cx">          cp ${gctpc}/source/proj.h ${cwd}/include
</span><span class="cx">  
</span><del>- ${proj4lib}:
-@@ -516,7 +518,7 @@
</del><ins>+@@ -532,7 +533,7 @@
</ins><span class="cx">          $(error ERROR, get hdf5 source by &quot;wget http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.11/src/hdf5-1.8.11.tar.gz&quot; )
</span><span class="cx">  
</span><span class="cx">  ${iplib}:
</span><del>--        cd &quot;${ip}&quot; &amp;&amp; export FFLAGS=&quot;${wFFLAGS}&quot; &amp;&amp; ${MAKE} &amp;&amp; cp libipolate.a ${lib}
</del><ins>+-        cd &quot;${ip}&quot; &amp;&amp; export FFLAGS=&quot;${wFFLAGS}&quot; &amp;&amp; ${MAKE} &amp;&amp; cp libipolate.a ${iplib}
</ins><span class="cx"> +        cd &quot;${ip}&quot; &amp;&amp; ${MAKE} &amp;&amp; cp libipolate.a ${lib}
</span><span class="cx">  
</span><span class="cx">  aux_progs/gmerge:        aux_progs/gmerge.c                
</span></span></pre></div>
<a id="trunkdportssciencewgrib2filesranlibpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/wgrib2/files/ranlib.patch (121031 => 121032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/wgrib2/files/ranlib.patch        2014-06-15 03:15:05 UTC (rev 121031)
+++ trunk/dports/science/wgrib2/files/ranlib.patch        2014-06-15 03:21:33 UTC (rev 121032)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-diff -Naurp grib2.orig/g2clib-1.4.0/makefile grib2/g2clib-1.4.0/makefile
---- g2clib-1.4.0/makefile        2012-09-04 05:27:30.000000000 -0700
-+++ g2clib-1.4.0/makefile        2013-11-17 22:57:54.000000000 -0800
-@@ -86,6 +86,7 @@ $(LIB):        $(LIB)(gridtemplates.o) \
- #        $(LIB)(getgb2.o) \
- #        $(LIB)(putgb2.o) \
- #        $(LIB)(params.o)
-+        ranlib ${LIB}

- .c.a:
-         $(CC) -c $(CPPFLAGS) $(CFLAGS) ${DEFS} $&lt;
-diff -Naurp grib2.orig/iplib.2012/makefile grib2/iplib.2012/makefile
---- iplib.2012/makefile        2012-02-24 11:57:49.000000000 -0800
-+++ iplib.2012/makefile        2013-11-17 22:58:32.000000000 -0800
-@@ -32,6 +32,7 @@ gdswizcd.o  gdswzdcd.o

- $(LIB):        $(objs)
-         ar $(ARFLAGS) ${LIB} $(objs)
-+        ranlib ${LIB}

- .f.o:
-         $(FC) ${FFLAGS} -c $&lt;
-diff -Naurp grib2.orig/makefile.gctpc grib2/makefile.gctpc
---- makefile.gctpc        2012-04-20 10:52:55.000000000 -0700
-+++ makefile.gctpc        2013-11-17 22:57:28.000000000 -0800
-@@ -23,6 +23,7 @@ objs=gctp.o alberfor.o alberinv.o alconf

- $(LIB): $(objs)
-         ar $(ARFLAGS) ${LIB} $(objs)
-+        ranlib ${LIB}

- clean:
-         touch junk.o
</del></span></pre>
</div>
</div>

</body>
</html>