Ticket #32702: octave-devel.patch

(a) Portfile_orig vs. (b) Portfile

@@ -5 +5 @@
 
 name                octave-devel
 version             3.4.3
-revision            1
+revision            2
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
@@ -98 +98 @@
     patchfiles-append patch-src-display.cc.diff
 }
 
-variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc46 gcc45 gcc44 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 gcc46 gcc45 gcc43 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 gcc46 gcc44 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 gcc45 gcc44 gcc43 g95 {}
+variant gcc46 description {build with the macports gcc46 toolchain} conflicts gcc47 gcc45 gcc44 gcc43 g95 {}
 
-variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 {
+variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc46 gcc45 gcc44 gcc43 g95 {}
+
+variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 {
     depends_build-append    port:g95
     configure.f77           "${prefix}/bin/g95"
 }
@@ -117 +119 @@
 
 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"
+    configure.args-append   --with-blas="-ldotwrp -Wl,-framework -Wl,Accelerate"
+    configure.args-append   --with-lapack="-Wl,-framework -Wl,Accelerate"
 }
 
 if {[variant_isset g95]} {
@@ -133 +135 @@
 # check for setting 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] } {
     default_variants +gcc44
 }
 
 # 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] } {
     error "You cannot use the variant -gcc44 alone."
 }
 
@@ -153 +155 @@
     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} != ""} {