Ticket #40930: Portfile.diff

Portfile

@@ -94 +94 @@
 # temporary patches; these are fixed upstream already.
 
 patchfiles-append \
+    patch-configure.diff \
     patch-liboctave-eigs-base.cc.diff \
     patch-liboctave-regexp.h.diff
 
+if {${os.platform}=="darwin" && ${os.version} > 10} {
+    # 10.7 or later requires an extra patch; this patch will break the build on
+    # 10.6 and prior, so apply it only under 10.7.
+    patchfiles-append patch-src-display.cc.diff
+}
+
 # Block compilers: Some older versions of CLANG do not honor the CPATH
 # environment variables, which is required for compiling this port
 # when using MacPorts.  The versions seem to be: MacPorts CLANG 2.9 or
@@ -107 +114 @@
 
 compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9
 
-platform darwin 11 {
-    # 10.7 requires an extra patch; this patch will break the build on
-    # 10.6 and prior, so apply it only under 10.7.
-
-    patchfiles-append patch-src-display.cc.diff
-}
-
-platform darwin 12 {
-    # In 10.8 patch is required as above, also
-    # the LANG environment variable needs to
+if {${os.platform} == "darwin" && ${os.version} > 11} {
+    # With 10.8 or later, 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.
 
-    patchfiles-append patch-src-display.cc.diff
     build.args-append LANG="C"
 }