[97159] trunk/dports/math/octave-devel/Portfile

[michaelld at macports.org]

Revision: 97159
          https://trac.macports.org/changeset/97159
Author:   michaelld at macports.org
Date:     2012-08-28 07:30:14 -0700 (Tue, 28 Aug 2012)
Log Message:
-----------
octave-devel: Bump to 3.6.2 (finally) and fix functionality with 10.8; add new gccXY variants and also fix the LDFLAGS for those.  Addresses tickets #35434 and #30737.

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2012-08-28 14:01:36 UTC (rev 97158)
+++ trunk/dports/math/octave-devel/Portfile	2012-08-28 14:30:14 UTC (rev 97159)
@@ -4,8 +4,7 @@
 PortSystem 1.0
 
 name                octave-devel
-version             3.4.3
-revision            3
+version             3.6.2
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
@@ -24,9 +23,8 @@
 distname            octave-${version}
 use_bzip2           yes
 
-checksums           md5     185b08f4e4a7b646d76e4d33b77fa87e \
-                    sha1    fe622c28a38f8730c59e46211bc7b18e7f51a679 \
-                    rmd160  d6f43fca9097b40f163c140db853d8ac1383ab39
+checksums           rmd160  1bf26b238d2bba461c5902d091088533c733439b \
+                    sha256  0bb69b93d0bee872308a7944f1ebbe948f55cd4ae55beab38f05950e1b45c4ae
 
 depends_build       port:bison \
                     port:flex \
@@ -62,14 +60,13 @@
 universal_variant   no
 
 # do not use CLANG (yet)
-if {${configure.compiler} == "clang"} { 
-    configure.compiler llvm-gcc-4.2
-}
+compiler.blacklist  clang
 
 configure.args      --disable-dependency-tracking \
                     --without-x \
                     --disable-docs \
-                    --with-cholmod="-lcholmod -lmetis"
+                    --with-cholmod="-lcholmod -lmetis" \
+                    --with-umfpack="-lumfpack -lSuiteSparse"
 
 #                    --without-framework-carbon
 
@@ -98,14 +95,28 @@
     patchfiles-append patch-src-display.cc.diff
 }
 
-variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc46 gcc45 gcc44 g95 {}
+platform darwin 12 {
+    # In 10.8 patch is required as above, also
+    # the LANG environment variable needs to
+    # be set to "C" otherwise /usr/bin/sed
+    # fails with an error, if you installed gsed
+    # with default name this should have no effect.
 
-variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc46 gcc45 gcc43 g95 {}
+    patchfiles-append patch-src-display.cc.diff
+    build.args-append LANG="C"
+}
 
-variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc46 gcc44 gcc43 g95 {}
 
-variant gcc46 description {build with the macports gcc45 toolchain} conflicts gcc45 gcc44 gcc43 g95 {}
+variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc47 gcc46 gcc45 gcc44 g95 {}
 
+variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc47 gcc46 gcc45 gcc43 g95 {}
+
+variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc47 gcc46 gcc44 gcc43 g95 {}
+
+variant gcc46 description {build with the macports gcc45 toolchain} conflicts gcc47 gcc45 gcc44 gcc43 g95 {}
+
+variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc45 gcc46 gcc44 gcc43 g95 {}
+
 variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 {
     depends_build-append    port:g95
     configure.f77           "${prefix}/bin/g95"
@@ -132,14 +143,14 @@
 
 # check for setting the default variant (gcc44)
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
-         ![variant_isset gcc46] && ![variant_isset g95] } {
+         ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset g95] } {
     default_variants +gcc45
 }
 
 # check if the user disabled just the default variant: -gcc44
 if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
          ![variant_isset gcc45] && ![variant_isset gcc46] && \
-         ![variant_isset g95] } {
+         ![variant_isset gcc47] && ![variant_isset g95] } {
     pre-fetch {
         error "You must select one of the compiler variants."
     }
@@ -154,11 +165,15 @@
     set gcc_version "4.5"
 } elseif {[variant_isset gcc46]} {
     set gcc_version "4.6"
+} elseif {[variant_isset gcc47]} {
+    set gcc_version "4.7"
 }
 
 if {${gcc_version} != ""} {
     set gcc_version_join [join [split ${gcc_version} "."] ""]
-    configure.ldflags    "${prefix}/lib/gcc${gcc_version_join}/libstdc++.6.dylib"
+    configure.ldflags		"-L${prefix}/lib/gcc${gcc_version_join}"
+    configure.ldflags-append	-lstdc++ \
+				-lgfortran
     depends_build-append port:gcc${gcc_version_join}
     configure.compiler   macports-gcc-${gcc_version}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120828/624adcf5/attachment.html>