[32179] trunk/dports/science/nco

[ryandesign at macports.org]

Revision: 32179
          http://trac.macosforge.org/projects/macports/changeset/32179
Author:   ryandesign at macports.org
Date:     2007-12-19 03:14:30 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
nco: maintainer update:

 * update to version 3.9.3
 * add variant +mpich2
 * add sha1 and rmd160 checksum

Closes #13633.

Modified Paths:
--------------
    trunk/dports/science/nco/Portfile
    trunk/dports/science/nco/files/patch-src_nco++_Makefile.in.diff

Added Paths:
-----------
    trunk/dports/science/nco/files/patch-mpncra.c.diff

Modified: trunk/dports/science/nco/Portfile
===================================================================
--- trunk/dports/science/nco/Portfile	2007-12-19 11:08:20 UTC (rev 32178)
+++ trunk/dports/science/nco/Portfile	2007-12-19 11:14:30 UTC (rev 32179)
@@ -2,13 +2,15 @@
 PortSystem      1.0
 
 name               nco
-version            3.9.2
+version            3.9.3
 platforms          darwin
 maintainers        takeshi at mac.com
 categories         science
 description        The netCDF Operators
 master_sites       http://${name}.sourceforge.net/src/
-checksums          sha1 4a8a3e141d95cf4130ebac39fedf7e21d692b910
+checksums          md5 78b6821f883733a7808d5a482dec7076 \
+                   sha1 99e18c329b7a688505d13a3d4312b3fbdd468970 \
+                   rmd160 6514872d09dcce6d9c8545dc3586fa422474f6ea
 homepage           http://nco.sourceforge.net/
 long_description \
     Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), \
@@ -33,7 +35,7 @@
 depends_build      port:bison \
                    port:m4
 
-patchfiles         patch-src_nco++_Makefile.in.diff
+patchfiles         patch-src_nco++_Makefile.in.diff patch-mpncra.c.diff
 configure.env      MACOSX_DEPLOYMENT_TARGET=10.4 \
                    HAVE_ANTLR=yes ANTLR_ROOT=${prefix}
 configure.cppflags -I/usr/include/malloc
@@ -46,3 +48,8 @@
         eval xinstall -m 644 [glob ${worksrcpath}/doc/${f}] ${destroot}${prefix}/share/doc/${name}
     }
 }
+
+variant mpich2 {
+	depends_lib-append port:mpich2
+	configure.args-append --enable-mpi
+}

Added: trunk/dports/science/nco/files/patch-mpncra.c.diff
===================================================================
--- trunk/dports/science/nco/files/patch-mpncra.c.diff	                        (rev 0)
+++ trunk/dports/science/nco/files/patch-mpncra.c.diff	2007-12-19 11:14:30 UTC (rev 32179)
@@ -0,0 +1,11 @@
+--- src/nco/mpncra.c.orig	2007-12-19 10:11:55.000000000 +0900
++++ src/nco/mpncra.c	2007-12-19 10:12:16.000000000 +0900
+@@ -1204,7 +1204,7 @@
+ 
+     /* Add time variable to output file
+        NB: nco_cnv_arm_time_install() contains OpenMP critical region */
+-    if(CNV_ARM && prg == ncrcat) (void)nco_cnv_arm_time_install(out_id,base_time_srt);
++    if(CNV_ARM && prg == ncrcat) (void)nco_cnv_arm_time_install(out_id,base_time_srt,dfl_lvl);
+ #ifdef ENABLE_MPI
+     nco_close(out_id); 
+     printf("DEBUG: Mgr prc_rnk %d closed out file %d after fixing date, time \n", prc_rnk, out_id);

Modified: trunk/dports/science/nco/files/patch-src_nco++_Makefile.in.diff
===================================================================
--- trunk/dports/science/nco/files/patch-src_nco++_Makefile.in.diff	2007-12-19 11:08:20 UTC (rev 32178)
+++ trunk/dports/science/nco/files/patch-src_nco++_Makefile.in.diff	2007-12-19 11:14:30 UTC (rev 32179)
@@ -1,9 +1,9 @@
---- src/nco++/Makefile.in.orig	2007-09-08 13:31:20.000000000 +0900
-+++ src/nco++/Makefile.in	2007-09-08 14:05:38.000000000 +0900
-@@ -230,7 +230,7 @@
+--- src/nco++/Makefile.in.orig	2007-12-19 08:30:54.000000000 +0900
++++ src/nco++/Makefile.in	2007-12-19 08:34:04.000000000 +0900
+@@ -231,7 +231,7 @@
  
  # fxm: Split off all sources except front-end into nco++ library
- ncap2_SOURCES = Invoke.cc ncap2.cc ncap2_utl.cc sdo_utl.cc fmc_cls.cc prs_cls.cc NcapVarVector.cc ncoLexer.cpp ncoParser.cpp ncoTree.cpp
+ ncap2_SOURCES = Invoke.cc ncap2.cc ncap2_utl.cc sdo_utl.cc fmc_cls.cc prs_cls.cc NcapVar.cc NcapVarVector.cc ncoLexer.cpp ncoParser.cpp ncoTree.cpp
 -ncap2_LDADD = -lnco -lantlr
 +ncap2_LDADD = ../nco/.libs/libnco.dylib -lantlr
  ncap2_LDFLAGS = -L../nco

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071219/aae92f7d/attachment.html