<!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>[124269] trunk/dports/science/ncarg</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/124269">124269</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-08-21 22:01:55 -0700 (Thu, 21 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ncarg: fix +g95 build with clang. use PortGroup compilers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencencargPortfile">trunk/dports/science/ncarg/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencencargfilespatchncarviewidtglobcdiff">trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff</a></li>
<li><a href="#trunkdportssciencencargfilespatchnilibhluCnTriMeshRenderercdiff">trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff</a></li>
<li><a href="#trunkdportssciencencargfilespatchnilibhluTransformcdiff">trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff</a></li>
<li><a href="#trunkdportssciencencargfilespatchnilibnfpfortyMakefilediff">trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff</a></li>
<li><a href="#trunkdportssciencencargfilespatchninclNclDrivercdiff">trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff</a></li>
<li><a href="#trunkdportssciencencargfilespatchninclNclDriverhdiff">trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencencargPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/ncarg/Portfile (124268 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/Portfile 2014-08-22 02:40:33 UTC (rev 124268)
+++ trunk/dports/science/ncarg/Portfile 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -3,7 +3,11 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup conflicts_build 1.0
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx">
</span><ins>+compilers.choose fc f77 f90 cc
+compilers.setup -clang -dragonegg -gfortran -llvm
+
</ins><span class="cx"> name ncarg
</span><span class="cx"> version 6.2.0
</span><span class="cx"> categories science
</span><span class="lines">@@ -74,17 +78,28 @@
</span><span class="cx"> patch-ni-nyacc-output.c.diff \
</span><span class="cx"> patch-ni-nyacc-reader.c.diff \
</span><span class="cx"> patch-ni-nyacc-verbose.c.diff \
</span><ins>+ patch-ni-lib-hlu-CnTriMeshRenderer.c.diff \
+ patch-ni-lib-hlu-Transform.c.diff \
</ins><span class="cx"> patch-ncarview-idt-w_idt.c.diff \
</span><ins>+ patch-ncarview-idt-glob.c.diff \
</ins><span class="cx"> patch-Fsplit.c.diff
</span><ins>+# Some C compilers, notably clang does not support OpenMP.
+patchfiles-append \
+ patch-ni-ncl-NclDriver.h.diff \
+ patch-ni-ncl-NclDriver.c.diff
</ins><span class="cx"> if {$build_arch eq "x86_64"} {
</span><span class="cx"> patchfiles-append patch-config-ymake.diff
</span><span class="cx"> }
</span><ins>+if {[variant_isset g95]} {
+ patchfiles-append patch-ni-lib-nfpfort-yMakefile.diff
+}
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|hdf/||" ${worksrcpath}/ni/src/ncl/FileSupport.c
</span><span class="cx"> reinplace "s| -lsz||g" ${worksrcpath}/Configure
</span><span class="cx"> reinplace "s| -lsz||g" ${worksrcpath}/config/Project
</span><span class="cx"> reinplace "s|g\\\\+\\\\+|${configure.cc}|" ${worksrcpath}/ni/src/ncl/yMakefile
</span><ins>+ reinplace "s|CC=cc|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile
</ins><span class="cx"> reinplace "s|INC=-I/usr/local/include|INC=${configure.cppflags} ${configure.cflags}|" ${workpath}/${g2clib_worksrcdir}/makefile
</span><span class="cx"> reinplace "s|CC=gcc -fPIC|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile
</span><span class="cx"> if {$build_arch eq "x86_64" || $build_arch eq "ppc64"} {
</span><span class="lines">@@ -93,11 +108,14 @@
</span><span class="cx"> foreach f {Darwin Darwin_Intel} {
</span><span class="cx"> if {[variant_isset g95]} {
</span><span class="cx"> reinplace "s|-lgfortran|-lf95|" ${worksrcpath}/config/${f}
</span><ins>+ reinplace "s|-fopenmp||" ${worksrcpath}/config/${f}
+ reinplace "s| -lquadmath||" ${worksrcpath}/config/${f}
</ins><span class="cx"> } else {
</span><span class="cx"> reinplace "s|-lgfortran|-lgfortran -lgomp|" ${worksrcpath}/config/${f}
</span><span class="cx"> }
</span><span class="cx"> reinplace "s| gfortran$| ${configure.fc}|" ${worksrcpath}/config/${f}
</span><span class="cx"> reinplace "s|gcc$|${configure.cc}|" ${worksrcpath}/config/${f}
</span><ins>+ reinplace "s|g++$|${configure.cxx}|" ${worksrcpath}/config/${f}
</ins><span class="cx"> reinplace "/CcOptions/d" ${worksrcpath}/config/${f}
</span><span class="cx"> reinplace "/ArchRecLibSearch/d" ${worksrcpath}/config/${f}
</span><span class="cx"> reinplace "/ArchRecIncSearch/d" ${worksrcpath}/config/${f}
</span><span class="lines">@@ -216,67 +234,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
- }
- append variant_line { {}}
-
- eval $variant_line
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
</del><ins>+if {![fortran_variant_isset]} {
+ default_variants-append +gcc48
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
</del><span class="cx"> if {[variant_isset g95]} {
</span><del>- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
- }
-}
-
-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- 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.compiler macports-gcc-${ver}
- }
-}
-
-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
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
-
</del><span class="cx"> configure.fflags-append -fno-second-underscore
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencencargfilespatchncarviewidtglobcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff (0 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ncarview-idt-glob.c.diff 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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;
</ins></span></pre></div>
<a id="trunkdportssciencencargfilespatchnilibhluCnTriMeshRenderercdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff (0 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ni-lib-hlu-CnTriMeshRenderer.c.diff 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+--- 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)
</ins></span></pre></div>
<a id="trunkdportssciencencargfilespatchnilibhluTransformcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff (0 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ni-lib-hlu-Transform.c.diff 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- 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,
</ins></span></pre></div>
<a id="trunkdportssciencencargfilespatchnilibnfpfortyMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff (0 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ni-lib-nfpfort-yMakefile.diff 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportssciencencargfilespatchninclNclDrivercdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff (0 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.c.diff 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- 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);
</ins></span></pre></div>
<a id="trunkdportssciencencargfilespatchninclNclDriverhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff (0 => 124269)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff (rev 0)
+++ trunk/dports/science/ncarg/files/patch-ni-ncl-NclDriver.h.diff 2014-08-22 05:01:55 UTC (rev 124269)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- 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>
</ins></span></pre>
</div>
</div>
</body>
</html>