[87964] trunk/dports/math/octave-devel

[michaelld at macports.org]

Revision: 87964
          http://trac.macports.org/changeset/87964
Author:   michaelld at macports.org
Date:     2011-12-14 05:05:40 -0800 (Wed, 14 Dec 2011)
Log Message:
-----------
octave-devel: addresses tickets #30247, #32351, and #32378.  Remove dependency on port:arpack because it is now solely internal; remove configure mods for FLTK and -arch; include variants to use MacPorts' atlas or Apple's Accelerate; use llvm-gcc-4.2, not clang, for now; when using FLTK, add runtime dependencies on ports epstool, transfig, and pstoedit.

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile
    trunk/dports/math/octave-devel/files/patch-configure.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2011-12-14 08:35:43 UTC (rev 87963)
+++ trunk/dports/math/octave-devel/Portfile	2011-12-14 13:05:40 UTC (rev 87964)
@@ -5,6 +5,7 @@
 
 name                octave-devel
 version             3.4.3
+revision            1
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
@@ -36,9 +37,7 @@
                     path:bin/perl:perl5 \
                     port:texinfo
 
-depends_lib         port:arpack \
-                    port:atlas \
-                    port:curl \
+depends_lib         port:curl \
                     port:fftw-3 \
                     port:fftw-3-single \
                     port:ftgl \
@@ -56,12 +55,17 @@
                     port:qrupdate \
                     port:SuiteSparse
 
-# allow non-Apple compilers to work with FLTK by removing the -arch
-# flag, which means this port cannot easily compile as universal.
-patchfiles-append patch-configure.diff
+# allow us to disable checking for FLTK
+# via the environment variable "FLTK_CONFIG"
+patchfiles-append   patch-configure.diff
 
 universal_variant   no
 
+# do not use CLANG (yet)
+if {${configure.compiler} == "clang"} { 
+    configure.compiler llvm-gcc-4.2
+}
+
 configure.args      --disable-dependency-tracking \
                     --without-x \
                     --disable-docs \
@@ -100,8 +104,24 @@
     configure.f77           "${prefix}/bin/g95"
 }
 
+variant atlas description {use BLAS from ATLAS} conflicts accelerate {
+    depends_lib-append port:atlas
+}
+
+variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas {
+    depends_lib-append      port:dotwrp
+    configure.args-append   --with-blas="-ldotwrp -framework Accelerate"
+    configure.args-append   --with-lapack="-framework Accelerate"
+}
+
+if {[variant_isset g95]} {
+    default_variants +accelerate
+} elseif {![variant_isset accelerate]} {
+    default_variants +atlas
+}
+
 # check for GCC / G95 variants.  The default here must match the
-# default found in the 'arpack' and 'atlas' ports.
+# default found in the 'atlas' port (but, this is not checked for).
 
 # check for setting the default variant (gcc44)
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
@@ -159,9 +179,11 @@
     configure.objcflags-append -g3 -O0
 }
 
-# FLTK does work as of 1.3.x-r8635, so allow it as an option
 variant fltk description {Include FLTK for graphical front-end} {
     depends_lib-append port:fltk-devel
+    depends_run-append  port:epstool \
+                        port:transfig \
+                        port:pstoedit
     configure.env-delete FLTK_CONFIG=no
 }
 

Modified: trunk/dports/math/octave-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-configure.diff	2011-12-14 08:35:43 UTC (rev 87963)
+++ trunk/dports/math/octave-devel/files/patch-configure.diff	2011-12-14 13:05:40 UTC (rev 87964)
@@ -30,34 +30,3 @@
  
  
    warn_fltk_config=""
-@@ -33257,11 +33273,29 @@
-   else
-     FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`"
-     FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"
--
-     case "$canonical_host_type" in
-       *-*-mingw*)
-         FLTK_LDFLAGS="`echo $FLTK_LDFLAGS | sed -e 's/-mwindows//g'`"
-       ;;
-+      *-apple-darwin*)
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&5
-+		$as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&6; }
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&5
-+		$as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&6; }
-+        # see if computer version is 'apple' or not
-+	case `$CXX --version` in
-+	  *apple*|*Apple*) ;;
-+	  *)
-+            # not apple; remove '-arch' flag(s) from FLTK FLAGS
-+	    FLTK_CFLAGS=`echo $FLTK_CLFAGS | sed -e 's at -arch [^ ]*@@'`
-+	    FLTK_LDFLAGS=`echo $FLTK_LDFLAGS | sed -e 's at -arch [^ ]*@@'`
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&5
-+		$as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_CFLAGS" >&6; }
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&5
-+		$as_echo "$as_me:${as_lineno-$LINENO}: $FLTK_LDFLAGS" >&6; }
-+	    ;;
-+	esac
-+      ;;
-     esac
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support in FLTK" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111214/52ce9836/attachment-0001.html>