Revision

70856

Author

michaelld@macports.org

Date

2010-08-23 11:43:13 -0700 (Mon, 23 Aug 2010)

Log Message

Added 'conflicts' to octave ports.

Added in x11 and debug variants to octave-devel, in case anyone wants
to test them out too.

Modified Paths

• trunk/dports/math/octave/Portfile
• trunk/dports/math/octave-devel/Portfile

Diff

--- trunk/dports/math/octave/Portfile	2010-08-23 18:38:34 UTC (rev 70855)
+++ trunk/dports/math/octave/Portfile	2010-08-23 18:43:13 UTC (rev 70856)
@@ -5,6 +5,7 @@
 
 name                octave
 version             3.2.4
+conflicts           octave-devel
 categories          math science
 maintainers         stechert
 platforms           darwin

--- trunk/dports/math/octave-devel/Portfile	2010-08-23 18:38:34 UTC (rev 70855)
+++ trunk/dports/math/octave-devel/Portfile	2010-08-23 18:43:13 UTC (rev 70856)
@@ -5,6 +5,7 @@
 
 name                octave-devel
 version             3.3.52
+conflicts           octave
 categories          math science
 maintainers         nomaintainer
 platforms           darwin
@@ -148,6 +149,18 @@
     configure.args-replace s|--disable-docs|--enable-docs|
 }
 
+variant x11 description {Enable use of X11} {
+    configure.args-replace s|--without-x|--with-x|
+    configure.args-append --x-includes=${prefix}
+}
+
+variant debug description {Produce debugging information in compiled code} {
+    configure.cflags-append    -g
+    configure.cxxflags-append  -g
+    configure.fflags-append    -g
+    configure.objcflags-append -g
+}
+
 livecheck.type      regex
 livecheck.url       http://www.gnu.org/software/octave/news.html
 livecheck.regex     Version (\\d+(\\.\\d+)*)