[119146] trunk/dports/science/ncarg

[takeshi at macports.org]

Revision: 119146
          https://trac.macports.org/changeset/119146
Author:   takeshi at macports.org
Date:     2014-04-17 22:44:31 -0700 (Thu, 17 Apr 2014)
Log Message:
-----------
ncarg: updated to 6.2.0

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

Removed Paths:
-------------
    trunk/dports/science/ncarg/files/patch-libncarg_gks-cdrivers-cro.c.diff
    trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2014-04-18 05:23:40 UTC (rev 119145)
+++ trunk/dports/science/ncarg/Portfile	2014-04-18 05:44:31 UTC (rev 119146)
@@ -5,8 +5,7 @@
 PortGroup                   conflicts_build 1.0
 
 name                        ncarg
-version                     6.1.2
-revision                    6
+version                     6.2.0
 categories                  science
 maintainers                 takeshi
 license                     {UCAR-Unidata public-domain BSD LGPL-3 GPL-3}
@@ -26,20 +25,20 @@
 
 distname                    ncl_${name}-${version}
 set ncl_src             ${distname}${extract.suffix}
-set g2clib_version      1.2.3
+set g2clib_version      1.5.0
 set g2clib_src          g2clib-${g2clib_version}-patch${extract.suffix}
 set g2clib_worksrcdir   g2clib-${g2clib_version}-patch
 distfiles           ${ncl_src}:ncl \
                     ${g2clib_src}:g2clib
 
 checksums   ${ncl_src} \
-                    md5     a13d4a97d1d580a24fe144d127e4ce31 \
-                    sha1    c8d3447f97af017a72f7c2222e0fadca913d1c8f \
-                    rmd160  9b9f87111914c261d9486f987a12bb5e76bf99ad \
+                    md5     10e17772120a17f3ff30ffd79ea43a7a \
+                    sha1    9f7be65e0406a410b27d338309315deac2e64b6c \
+                    rmd160  4366489193cb94e5ae6811ed4cd6d45c87bdd7d4 \
             ${g2clib_src} \
-                    md5     43eb24f168300f34e0d4e5a7260aba59 \
-                    sha1    5da7cc7319253b80ee0d9693753212d33f32c2b0 \
-                    rmd160  e67d9430bb03a255716763f72e31eddb6d1d5516
+                    md5     f857f49a66918316996eb52399e04120 \
+                    sha1    3113b88e0295dbc64428edd87c0b583e774fb320 \
+                    rmd160  221b308be9258ed3ec9ebe126d872aa451f879cf
 
 depends_lib                 path:lib/pkgconfig/cairo.pc:cairo \
                             port:proj       \
@@ -75,8 +74,6 @@
             patch-ni-nyacc-output.c.diff \
             patch-ni-nyacc-reader.c.diff \
             patch-ni-nyacc-verbose.c.diff \
-            patch-libncarg_gks-cdrivers-cro.c.diff \
-            patch-ncarview-idt-glob.c.diff \
             patch-ncarview-idt-w_idt.c.diff \
             patch-Fsplit.c.diff
 if {$build_arch eq "x86_64"} {
@@ -96,6 +93,8 @@
     foreach f {Darwin Darwin_Intel} {
         if {[variant_isset g95]} {
             reinplace "s|-lgfortran|-lf95|" ${worksrcpath}/config/${f}
+        } else {
+            reinplace "s|-lgfortran|-lgfortran -lgomp|" ${worksrcpath}/config/${f}
         }
         reinplace "s| gfortran$| ${configure.fc}|" ${worksrcpath}/config/${f} 
         reinplace "s|gcc$|${configure.cc}|" ${worksrcpath}/config/${f}

Deleted: trunk/dports/science/ncarg/files/patch-libncarg_gks-cdrivers-cro.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-libncarg_gks-cdrivers-cro.c.diff	2014-04-18 05:23:40 UTC (rev 119145)
+++ trunk/dports/science/ncarg/files/patch-libncarg_gks-cdrivers-cro.c.diff	2014-04-18 05:44:31 UTC (rev 119146)
@@ -1,11 +0,0 @@
---- ncarg2d/src/libncarg_gks/cdrivers/cro.c.orig	2013-07-31 13:30:04.000000000 +0900
-+++ ncarg2d/src/libncarg_gks/cdrivers/cro.c	2013-07-31 13:42:41.000000000 +0900
-@@ -1361,7 +1361,7 @@
-     }
- 
-     if ((index & ARGB_MASK) > 0)
--    	return;   /* value is a 32-bit color, not an index */
-+    	return 255;   /* value is a 32-bit color, not an index */
- 
-     if (psa->max_color < index + 1) {
-         psa->ctable = (unsigned int*) realloc(psa->ctable, (index + 1)

Deleted: trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff	2014-04-18 05:23:40 UTC (rev 119145)
+++ trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff	2014-04-18 05:44:31 UTC (rev 119146)
@@ -1,11 +0,0 @@
---- ncarview/src/bin/idt/glob.c.orig	2013-08-01 10:28:37.000000000 +0900
-+++ ncarview/src/bin/idt/glob.c	2013-08-01 10:29:00.000000000 +0900
-@@ -49,7 +49,7 @@
-  *	to_child[1]	: fd for writing to spawned process
-  *	to_parent[0]	: fd for reading from spawned process
-  */
--static	talkto(argv) 
-+static void	talkto(argv) 
- 	char	**argv;
- {
- 	int	pid;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140417/536dcde0/attachment.html>