[60206] trunk/dports/science/ncarg

[takeshi at macports.org]

Revision: 60206
          http://trac.macports.org/changeset/60206
Author:   takeshi at macports.org
Date:     2009-11-04 23:17:21 -0800 (Wed, 04 Nov 2009)
Log Message:
-----------
ncarg: Fixed a build on x86_64 machines running Snow Leopard. Revision not incremented.

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

Added Paths:
-----------
    trunk/dports/science/ncarg/files/
    trunk/dports/science/ncarg/files/patch-config-ymake.diff

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2009-11-05 03:53:58 UTC (rev 60205)
+++ trunk/dports/science/ncarg/Portfile	2009-11-05 07:17:21 UTC (rev 60206)
@@ -39,7 +39,10 @@
                             port:openssl    \
                             port:curl       \
                             port:libxml2    \
-                            port:libnc-dap
+                            port:libnc-dap  \
+                            port:xorg-libXaw \
+                            port:xorg-libice \
+                            port:lesstif
 depends_build               port:gcc43      \
                             port:triangle
 
@@ -60,7 +63,10 @@
     depends_lib-delete      port:libnc-dap
 } 
 
-patch {
+if {$build_arch eq "x86_64"} {
+    patchfiles                  patch-config-ymake.diff
+}
+post-patch {
     foreach f {Darwin Darwin_Intel} {
         if {[variant_isset g95]} {
             reinplace "s|-lgfortran|-lf95|" ${worksrcpath}/config/${f}
@@ -76,8 +82,8 @@
 #define FOptimizeFlag ${configure.fflags}\\
 #define ManRoot ${destroot}${prefix}/share/man\\
 #define NetCDF4lib -lnetcdf|" ${worksrcpath}/config/${f}
-        reinplace "s|\/sw\/lib|${prefix}/lib|" ${worksrcpath}/config/${f}
-        reinplace "s|\/sw\/include|${prefix}/include|" ${worksrcpath}/config/${f}
+        reinplace "s|/sw/lib|${prefix}/lib|" ${worksrcpath}/config/${f}
+        reinplace "s|/sw/include|${prefix}/include|" ${worksrcpath}/config/${f}
     }
     if {[variant_isset g95]} {
         reinplace "s|-fno-range-check||" ${worksrcpath}/config/Darwin_Intel
@@ -100,10 +106,10 @@
 
 y
 ${destroot}${prefix}
+
 y
 y
 y
-y
 n
 y
 y
@@ -111,10 +117,10 @@
 y
 y
 ${usedap}
+${prefix}/lib
+${prefix}/include
 
 
-
-y
 EOF"
 }
 post-configure {

Added: trunk/dports/science/ncarg/files/patch-config-ymake.diff
===================================================================
--- trunk/dports/science/ncarg/files/patch-config-ymake.diff	                        (rev 0)
+++ trunk/dports/science/ncarg/files/patch-config-ymake.diff	2009-11-05 07:17:21 UTC (rev 60206)
@@ -0,0 +1,13 @@
+--- config/ymake.orig	2009-11-05 14:51:37.000000000 +0900
++++ config/ymake	2009-11-05 14:58:25.000000000 +0900
+@@ -415,8 +415,8 @@
+             set vendor  = Apple
+             breaksw
+         case    i386:
+-            set model   = $mach
+-            set arch    = $mach
++            set model   = x86_64
++            set arch    = x86_64
+             set sysincs = Darwin_Intel
+             set vendor  = Apple
+             breaksw
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091104/716fea0c/attachment.html>