[125376] trunk/dports/science/ncarg
takeshi at macports.org
takeshi at macports.org
Mon Sep 15 05:59:18 PDT 2014
Revision: 125376
https://trac.macports.org/changeset/125376
Author: takeshi at macports.org
Date: 2014-09-15 05:59:18 -0700 (Mon, 15 Sep 2014)
Log Message:
-----------
ncarg: update to 6.2.1
Modified Paths:
--------------
trunk/dports/science/ncarg/Portfile
Removed Paths:
-------------
trunk/dports/science/ncarg/files/patch-Fsplit.c.diff
trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff
trunk/dports/science/ncarg/files/patch-ncarview-idt-w_idt.c.diff
trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff
trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff
trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff
trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff
trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff
trunk/dports/science/ncarg/files/patch-ni-nyacc-error.c.diff
trunk/dports/science/ncarg/files/patch-ni-nyacc-main.c.diff
trunk/dports/science/ncarg/files/patch-ni-nyacc-output.c.diff
trunk/dports/science/ncarg/files/patch-ni-nyacc-reader.c.diff
trunk/dports/science/ncarg/files/patch-ni-nyacc-verbose.c.diff
Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/Portfile 2014-09-15 12:59:18 UTC (rev 125376)
@@ -10,7 +10,7 @@
mpi.setup
name ncarg
-version 6.2.0
+version 6.2.1
categories science
maintainers takeshi
license {UCAR-Unidata public-domain BSD LGPL-3 GPL-3}
@@ -37,13 +37,11 @@
${g2clib_src}:g2clib
checksums ${ncl_src} \
- md5 10e17772120a17f3ff30ffd79ea43a7a \
- sha1 9f7be65e0406a410b27d338309315deac2e64b6c \
- rmd160 4366489193cb94e5ae6811ed4cd6d45c87bdd7d4 \
+ rmd160 41c1f4c163dc4210bac9a7ba386974d4a67ff1b3 \
+ sha256 59ec837790725e20a33a1ac2912d3e96356ffebd0c7265340bef4e2f30ee6532 \
${g2clib_src} \
- md5 f857f49a66918316996eb52399e04120 \
- sha1 3113b88e0295dbc64428edd87c0b583e774fb320 \
- rmd160 221b308be9258ed3ec9ebe126d872aa451f879cf
+ rmd160 221b308be9258ed3ec9ebe126d872aa451f879cf \
+ sha256 1852aa7404426e4d2fecbf75dee47bb1ffeb2ef06c63644c068bad9b9433bfff
depends_lib path:lib/pkgconfig/cairo.pc:cairo \
port:proj \
@@ -78,27 +76,9 @@
set usedap y
-# clang raises error on (assumed) non-void functions without return value.
-patchfiles patch-ni-nyacc-error.c.diff \
- patch-ni-nyacc-main.c.diff \
- patch-ni-nyacc-output.c.diff \
- patch-ni-nyacc-reader.c.diff \
- patch-ni-nyacc-verbose.c.diff \
- patch-ni-lib-hlu-CnTriMeshRenderer.c.diff \
- patch-ni-lib-hlu-Transform.c.diff \
- patch-ncarview-idt-w_idt.c.diff \
- patch-ncarview-idt-glob.c.diff \
- patch-Fsplit.c.diff
-# Some C compilers, notably clang does not support OpenMP.
-patchfiles-append \
- patch-ni-ncl-NclDriver.h.diff \
- patch-ni-ncl-NclDriver.c.diff
if {$build_arch eq "x86_64"} {
patchfiles-append patch-config-ymake.diff
}
-if {[variant_isset g95]} {
- patchfiles-append patch-ni-lib-nfpfort-yMakefile.diff
-}
post-patch {
reinplace "s|hdf/||" ${worksrcpath}/ni/src/ncl/FileSupport.c
@@ -154,11 +134,7 @@
}
if {[variant_isset accelerate]} {
reinplace "s|-llapack_ncl|-framework Accelerate|g" ${worksrcpath}/config/Project
- if {[variant_isset g95] || ([string match *64* $build_arch] && ${os.major} >= 10)} {
- reinplace "s|-lblas_ncl|-ldotwrp -framework Accelerate|g" ${worksrcpath}/config/Project
- } else {
- reinplace "s|-lblas_ncl|-framework Accelerate|g" ${worksrcpath}/config/Project
- }
+ reinplace "s|-lblas_ncl|-lvecLibFort|g" ${worksrcpath}/config/Project
foreach f {Darwin Darwin_Intel} {
reinplace "/LAPACKLIB/d" ${worksrcpath}/config/${f}
reinplace "/BLASLIB/d" ${worksrcpath}/config/${f}
@@ -249,9 +225,7 @@
}
variant accelerate description {use Accelerate.framework} {
- if {[variant_isset g95] || ([string match *64* $build_arch] && ${os.major} >= 10)} {
- depends_lib-append port:dotwrp
- }
+ depends_lib-append port:vecLibFort
}
livecheck.type regex
Deleted: trunk/dports/science/ncarg/files/patch-Fsplit.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-Fsplit.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-Fsplit.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,11 +0,0 @@
---- ncarg2d/src/libncarg/Iftran/Fsplit.c.orig 2013-02-07 12:26:17.000000000 +0900
-+++ ncarg2d/src/libncarg/Iftran/Fsplit.c 2013-11-10 08:02:36.000000000 +0900
-@@ -136,7 +136,7 @@
- fprintf(stderr,"%s: Can't reopen file \"%s\".\n",objectname,pkeyword);
- return errorflag=6;
- } else printf("%s: Opening file \"%s\".\n",objectname,pkeyword);
-- strcpy(lastfile,pkeyword);
-+ if (lastfile != pkeyword) strcpy(lastfile,pkeyword);
- if (!nosplit) {
- if (cvs==2||cvs==3) {
- fprintf(pdst,"C\nC $I");
Deleted: trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,11 +0,0 @@
---- ncarview/src/bin/idt/glob.c.orig 2014-04-01 11:23:27.000000000 +0900
-+++ ncarview/src/bin/idt/glob.c 2014-08-20 15:59:54.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;
Deleted: trunk/dports/science/ncarg/files/patch-ncarview-idt-w_idt.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ncarview-idt-w_idt.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ncarview-idt-w_idt.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,18 +0,0 @@
---- ncarview/src/bin/idt/w_idt.c.orig 2013-08-01 08:27:17.000000000 +0900
-+++ ncarview/src/bin/idt/w_idt.c 2013-08-01 08:28:00.000000000 +0900
-@@ -570,7 +570,7 @@
-
-
-
--void
-+int
- main(argc, argv)
- int argc;
- char **argv;
-@@ -653,5 +653,6 @@
- }
-
- XtAppMainLoop(app_con);
-+ return 0;
- }
-
Deleted: trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,38 +0,0 @@
---- ni/src/lib/hlu/CnTriMeshRenderer.c.orig 2014-04-01 11:23:12.000000000 +0900
-+++ ni/src/lib/hlu/CnTriMeshRenderer.c 2014-08-20 16:09:26.000000000 +0900
-@@ -23,7 +23,9 @@
- #include <stdlib.h>
- #include <math.h>
- #include <ctype.h>
-+#ifdef _OPENMP
- #include <omp.h>
-+#endif
- #include <ncarg/hlu/hluutil.h>
- #include <ncarg/hlu/CnTriMeshRendererP.h>
- #include <ncarg/hlu/WorkstationI.h>
-@@ -1532,8 +1534,13 @@
- private(tbp,block_ix,ys,ye,ye_adj,xs,xe,xe_adj,npnt,ntri,nedg,npnt_alloc,xt,yt,i,j,in,out,vout, \
- snodes,stris,sedges,vedges,cpoints,cedges,ctris,tid,xmx,xmn,ymx,ymn,ytmp,xtmp)
- {
-+#ifdef _OPENMP
- tid = omp_get_thread_num();
- nthreads = omp_get_num_threads();
-+#else
-+ tid = 0;
-+ nthreads = 1;
-+#endif
- if (tid == 0) {
- /* printf("%d threads\n",nthreads);*/
- if (nthreads > block_count) {
-@@ -3424,7 +3431,11 @@
- #pragma omp parallel shared(cnp, tmp,entry_name,Lopn,Loen,Lotn,nthreads,bbox,msize,nsize,min_cell_size,fill_op) \
- private(tbp,i)
- {
-+#ifdef _OPENMP
- nthreads = omp_get_num_threads();
-+#else
-+ nthreads = 1;
-+#endif
- if (nthreads > 1) fill_op = 2;
-
- #pragma omp for schedule(static,1)
Deleted: trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,12 +0,0 @@
---- ni/src/lib/hlu/Transform.c.orig 2014-04-01 11:23:12.000000000 +0900
-+++ ni/src/lib/hlu/Transform.c 2014-08-20 16:09:54.000000000 +0900
-@@ -36,7 +36,9 @@
- #include <ncarg/hlu/ConvertersP.h>
- #include <ncarg/hlu/color.h>
- #include <ncarg/hlu/WorkstationP.h>
-+#ifdef _OPENMP
- #include <omp.h>
-+#endif
-
- static _NhlRawObjCB callbacks[] = {
- {_NhlCBtfOverlayStatus,
Deleted: trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,11 +0,0 @@
---- ni/src/lib/nfpfort/yMakefile.orig 2014-04-01 11:23:13.000000000 +0900
-+++ ni/src/lib/nfpfort/yMakefile 2014-08-20 15:19:46.000000000 +0900
-@@ -45,7 +45,7 @@
-
-
- plotgrids_var.o: plotgrids_var.f90
-- $(F77) $(FFLAGS) -c plotgrids_var.f90
-+ $(F77) $(FFLAGS) -freal-loops -c plotgrids_var.f90
-
- plotfmt_open.o: plotfmt_open.f90
- $(F77) $(FFLAGS) -c plotfmt_open.f90
Deleted: trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,16 +0,0 @@
---- ni/src/ncl/NclDriver.c.orig 2014-04-01 11:23:16.000000000 +0900
-+++ ni/src/ncl/NclDriver.c 2014-08-20 13:45:56.000000000 +0900
-@@ -62,11 +62,13 @@
- yydebug = 1;
- #endif /* YYDEBUG */
-
-+#ifdef _OPENMP
- /* make sure that only one OMP thread runs unless OMP_NUM_THREADS is explicitly defined -- on Darwin at least the default is not a single thread */
-
- if (! getenv("OMP_NUM_THREADS")) {
- omp_set_num_threads(1);
- }
-+#endif
-
- strcpy(buffer,(char *)GetNCARGPath("tmp"));
- sr = access(buffer,W_OK|X_OK|F_OK);
Deleted: trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,12 +0,0 @@
---- ni/src/ncl/NclDriver.h.orig 2014-04-01 11:23:16.000000000 +0900
-+++ ni/src/ncl/NclDriver.h 2014-08-20 13:45:32.000000000 +0900
-@@ -29,7 +29,9 @@
- #include <ncarg/hlu/Error.h>
- #include <ncarg/hlu/App.h>
- #include <netcdf.h>
-+#ifdef _OPENMP
- #include <omp.h>
-+#endif
-
- #if defined(HPUX)
- #include <dl.h>
Deleted: trunk/dports/science/ncarg/files/patch-ni-nyacc-error.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-nyacc-error.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-nyacc-error.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,11 +0,0 @@
---- ni/src/nyacc/error.c.orig 2013-08-01 09:49:00.000000000 +0900
-+++ ni/src/nyacc/error.c 2013-08-01 09:49:14.000000000 +0900
-@@ -33,7 +33,7 @@
- done(1);
- }
-
--
-+void
- print_pos(st_line, st_cptr)
- char *st_line;
- char *st_cptr;
Deleted: trunk/dports/science/ncarg/files/patch-ni-nyacc-main.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-nyacc-main.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-nyacc-main.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,11 +0,0 @@
---- ni/src/nyacc/main.c.orig 2013-07-31 11:26:09.000000000 +0900
-+++ ni/src/nyacc/main.c 2013-07-31 11:26:28.000000000 +0900
-@@ -101,7 +101,7 @@
- }
-
-
--getargs(argc, argv)
-+void getargs(argc, argv)
- int argc;
- char *argv[];
- {
Deleted: trunk/dports/science/ncarg/files/patch-ni-nyacc-output.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-nyacc-output.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-nyacc-output.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,49 +0,0 @@
---- ni/src/nyacc/output.c.orig 2013-07-31 14:06:00.000000000 +0900
-+++ ni/src/nyacc/output.c 2013-07-31 14:08:52.000000000 +0900
-@@ -16,6 +16,10 @@
- static int lowzero;
- static int high;
-
-+void save_column(int symbol, int default_state);
-+void output_stored_text();
-+void output_trailing_text();
-+void output_semantic_actions();
-
- output()
- {
-@@ -355,7 +359,7 @@
-
-
-
--save_column(symbol, default_state)
-+void save_column(symbol, default_state)
- int symbol;
- int default_state;
- {
-@@ -825,7 +829,7 @@
- }
-
-
--output_stored_text()
-+void output_stored_text()
- {
- register int c;
- register FILE *in, *out;
-@@ -1076,7 +1080,7 @@
- }
-
-
--output_trailing_text()
-+void output_trailing_text()
- {
- register int c, last;
- register FILE *in, *out;
-@@ -1133,7 +1137,7 @@
- }
-
-
--output_semantic_actions()
-+void output_semantic_actions()
- {
- register int c, last;
- register FILE *out;
Deleted: trunk/dports/science/ncarg/files/patch-ni-nyacc-reader.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-nyacc-reader.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-nyacc-reader.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,110 +0,0 @@
---- ni/src/nyacc/reader.c.orig 2013-08-01 09:51:08.000000000 +0900
-+++ ni/src/nyacc/reader.c 2013-08-01 09:56:12.000000000 +0900
-@@ -48,7 +48,7 @@
- ++cinc;
- }
-
--
-+void
- get_line()
- {
- register FILE *f = input_file;
-@@ -112,7 +112,7 @@
- return (p);
- }
-
--
-+void
- skip_comment()
- {
- register char *s;
-@@ -267,7 +267,7 @@
- /*NOTREACHED*/
- }
-
--
-+void
- copy_ident()
- {
- register int c;
-@@ -296,7 +296,7 @@
- }
- }
-
--
-+void
- copy_text()
- {
- register int c;
-@@ -427,7 +427,7 @@
- }
- }
-
--
-+void
- copy_union()
- {
- register int c;
-@@ -823,7 +823,7 @@
- return (s);
- }
-
--
-+void
- declare_tokens(assoc)
- int assoc;
- {
-@@ -885,7 +885,7 @@
- }
- }
-
--
-+void
- declare_types()
- {
- register int c;
-@@ -931,7 +931,7 @@
- goal = bp;
- }
-
--
-+void
- read_declarations()
- {
- register int c, k;
-@@ -1144,7 +1144,7 @@
- rassoc[nrules-1] = TOKEN;
- }
-
--
-+void
- add_symbol()
- {
- register int c;
-@@ -1175,7 +1175,7 @@
- pitem[nitems-1] = bp;
- }
-
--
-+void
- copy_action()
- {
- register int c;
-@@ -1475,7 +1475,7 @@
- end_rule();
- }
-
--
-+void
- free_tags()
- {
- register int i;
-@@ -1716,7 +1716,7 @@
- FREE(pitem);
- }
-
--
-+void
- print_grammar()
- {
- register int i, j, k;
Deleted: trunk/dports/science/ncarg/files/patch-ni-nyacc-verbose.c.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-ni-nyacc-verbose.c.diff 2014-09-15 12:55:51 UTC (rev 125375)
+++ trunk/dports/science/ncarg/files/patch-ni-nyacc-verbose.c.diff 2014-09-15 12:59:18 UTC (rev 125376)
@@ -1,11 +0,0 @@
---- ni/src/nyacc/verbose.c.orig 2013-08-01 08:19:16.000000000 +0900
-+++ ni/src/nyacc/verbose.c 2013-08-01 08:20:12.000000000 +0900
-@@ -4,7 +4,7 @@
-
- static short *null_rules;
-
--verbose()
-+void verbose()
- {
- register int i;
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140915/8055a265/attachment-0001.html>
More information about the macports-changes
mailing list