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

[michaelld at macports.org]

Revision: 71264
          http://trac.macports.org/changeset/71264
Author:   michaelld at macports.org
Date:     2010-09-07 04:27:56 -0700 (Tue, 07 Sep 2010)
Log Message:
-----------
Re-added patch for 10.6 only.
Fixed g95 variant conflict.

Port now works (in some basic sense) on MacPorts 1.9.1, OSX 10.6.4
x86_64, XCode 3.2.3, +gcc44 (at least; possibly more).

Still does not work on 10.5 (or, possibly 10.6 pre XCode 3.2.3),
due to bugs in progress:

[1] < http://savannah.gnu.org/bugs/?30668 >
[2] < http://savannah.gnu.org/bugs/?30685 >

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

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2010-09-07 07:30:13 UTC (rev 71263)
+++ trunk/dports/math/octave-devel/Portfile	2010-09-07 11:27:56 UTC (rev 71264)
@@ -62,9 +62,14 @@
     # allow non-Apple compilers to work with FLTK by removing the
     # -arch flag, which means this port cannot easy compile as
     # universal.
-    patchfiles patch-configure.diff
+    patchfiles-append patch-configure.diff
 }
 
+platform darwin 10 {
+    # for 10.6 only
+    patchfiles-append patch-lo-specfun.cc.diff
+}
+
 universal_variant   no
 
 post-patch {
@@ -141,7 +146,7 @@
     configure.compiler      macports-gcc-4.5
 }
 
-variant g95 description {build with g95} conflicts gcc43 gcc44 {
+variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 {
     depends_build-append    port:g95
     configure.f77           "${prefix}/bin/g95"
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100907/7437a94c/attachment.html>