[75337] trunk/dports/science/ncarg/Portfile

takeshi at macports.org takeshi at macports.org
Sat Jan 22 01:23:02 PST 2011


Revision: 75337
          http://trac.macports.org/changeset/75337
Author:   takeshi at macports.org
Date:     2011-01-22 01:23:01 -0800 (Sat, 22 Jan 2011)
Log Message:
-----------
ncarg: addresses #28043

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

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2011-01-22 09:04:49 UTC (rev 75336)
+++ trunk/dports/science/ncarg/Portfile	2011-01-22 09:23:01 UTC (rev 75337)
@@ -5,6 +5,7 @@
 
 name                        ncarg
 version                     5.2.1
+revision                    1
 categories                  science
 maintainers                 takeshi
 description                 language for scientific data processing and visualization
@@ -66,6 +67,10 @@
             reinplace "s|-lgfortran|-L${prefix}/lib/gcc43 -lgfortran|" \
                 ${worksrcpath}/config/${f}
             reinplace "s| gfortran$| gfortran-mp-4.3|" ${worksrcpath}/config/${f}
+        } elseif {[variant_isset gcc45]} {
+            reinplace "s|-lgfortran|-L${prefix}/lib/gcc45 -lgfortran|" \
+                ${worksrcpath}/config/${f}
+            reinplace "s| gfortran$| gfortran-mp-4.5|" ${worksrcpath}/config/${f}
         } else {
             reinplace "s|-lgfortran|-L${prefix}/lib/gcc44 -lgfortran|" \
                 ${worksrcpath}/config/${f}
@@ -93,6 +98,7 @@
         reinplace "s|hdf\/||" ${worksrcpath}/${f}
     }
     reinplace "s|\$\(NCARGGKSCAIROLIB\) \$\(NCARGCLIB\)|\$(NCARGGKSCAIROLIB) \$(NCARGGKSLIB) \$(NCARGCLIB)|" ${worksrcpath}/config/Project
+    reinplace "s|int_p_NULL|(int*)NULL|g" ${worksrcpath}/ncarg2d/src/libncarg/ezmap/mapngb.c
 }
 #define NetCDF4lib -lnetcdf -lhdf5_hl -lhdf5 -lz -lsz -lmfhdf -ldf -lcurl -lidn -lssl -lcrypto|" ${worksrcpath}/config/${f}
 
@@ -135,19 +141,23 @@
 build.target                Build
 build.args-append           EXTRA_CCOPTIONS=\"${configure.cc_archflags}\"
 
-variant g95 conflicts gcc43 gcc44 description {compile with g95} {
+variant g95 conflicts gcc43 gcc44 gcc45 description {compile with g95} {
     depends_build-append    port:g95
 }
 
-variant gcc43 conflicts gcc44 g95 description {compile with gcc 4.3} {
+variant gcc43 conflicts gcc44 gcc45 g95 description {compile with gcc 4.3} {
     depends_build-append    port:gcc43
 }
 
-variant gcc44 conflicts gcc43 g95 description {compile with gcc 4.4} {
+variant gcc44 conflicts gcc43 gcc45 g95 description {compile with gcc 4.4} {
     depends_build-append    port:gcc44
 }
 
-if {![variant_isset gcc43] && ![variant_isset g95]} {
+variant gcc45 conflicts gcc43 gcc44 g95 description {compile with gcc 4.5} {
+    depends_build-append    port:gcc45
+}
+
+if {![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95]} {
     default_variants +gcc44
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110122/6835a317/attachment-0001.html>


More information about the macports-changes mailing list