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

[michaelld at macports.org]

Revision: 75248
          http://trac.macports.org/changeset/75248
Author:   michaelld at macports.org
Date:     2011-01-18 14:34:53 -0800 (Tue, 18 Jan 2011)
Log Message:
-----------
octave-devel: bump to 3.3.55, take part maintainership, start FLTK variant (does not work yet).  Fixes ticket #27980.

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

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2011-01-18 21:20:51 UTC (rev 75247)
+++ trunk/dports/math/octave-devel/Portfile	2011-01-18 22:34:53 UTC (rev 75248)
@@ -4,11 +4,10 @@
 PortSystem 1.0
 
 name                octave-devel
-version             3.3.52
-revision            1
+version             3.3.55
 conflicts           octave
 categories          math science
-maintainers         nomaintainer
+maintainers         michaelld openmaintainer
 platforms           darwin
 description         a Matlab-like environment for numerical analysis
 long_description    Octave provides a convenient command line interface \
@@ -19,13 +18,13 @@
                     modules written in e.g. C++, C or Fortran.
 
 homepage            http://www.gnu.org/software/octave/
-master_sites        ftp://ftp.octave.org/pub/octave/bleeding-edge
+master_sites        ftp://alpha.gnu.org/gnu/octave
 distname            octave-${version}
 use_bzip2           yes
 
-checksums           md5     edb34f23a03b01e6667d7ef340b720f1 \
-                    sha1    d9c3868af2f40a1c06343bf43bcb6b0cb07b08a2 \
-                    rmd160  c9d1313543c34ca033da1ba43420181aa4d484c0
+checksums           md5     10506a43e80d7e46921b5a2520f5f15a \
+                    sha1    7a8fd21d2466e672d4f983c9e7f5c82ae0271006 \
+                    rmd160  2dc968bc96f27c12801ed9e64140f53937cc4aca
 
 depends_build       port:bison \
                     port:flex \
@@ -55,16 +54,10 @@
                     port:qrupdate \
                     port:SuiteSparse
 
-if {${build_arch} == "i386" || ${build_arch} == "ppc"} {
-    # FLTK is not 64-bit yet; use it only for 32-bit installs
-    depends_lib-append port:fltk
+# allow non-Apple compilers to work with FLTK by removing the -arch
+# flag, which means this port cannot easy compile as universal.
+patchfiles-append patch-configure.diff
 
-    # allow non-Apple compilers to work with FLTK by removing the
-    # -arch flag, which means this port cannot easy compile as
-    # universal.
-    patchfiles-append patch-configure.diff
-}
-
 platform darwin 10 {
     # for 10.6 only
     patchfiles-append patch-lo-specfun.cc.diff
@@ -72,15 +65,6 @@
 
 universal_variant   no
 
-post-patch {
-    # make sure to include the METIS library when using CHOLMOD
-    reinplace "s|-lcholmod|-lcholmod -lmetis|g" ${worksrcpath}/configure
-
-    # remove 'dirfd' from libgnu's dirent.in.h;
-    # it causes an error, and isn't used in this version of Octave.
-    reinplace "54,78d" ${worksrcpath}/libgnu/dirent.in.h
-}
-
 configure.args      --without-x \
                     --enable-shared \
                     --enable-dl \
@@ -90,10 +74,12 @@
 # do not build static libraries; just shared
 #                    --enable-static
 
-### the following are probably not necessary, but are included for
-### completion.  Ordering is the same as in './configure --help'.
+### the following are probably not necessary (except possibly the
+### 'cholmod' one), but are included for completion.  Ordering is the
+### same as in './configure --help'.
 configure.args-append \
                     --enable-readline \
+                    --enable-extra-warning-flags \
                     --with-qhull \
                     --with-z \
                     --with-hdf5 \
@@ -108,7 +94,7 @@
                     --with-camd \
                     --with-colamd \
                     --with-ccolamd \
-                    --with-cholmod \
+                    --with-cholmod="-lcholmod -lmetis" \
                     --with-cxsparse \
                     --with-umfpack \
                     --with-arpack
@@ -180,6 +166,14 @@
     configure.objcflags-append -g3 -O0
 }
 
+variant fltk description {Include FLTK option} {
+    depends_lib-append port:fltk-devel
+}
+
+if {![variant_isset fltk]} {
+    configure.env-append FLTK_CONFIG=
+}
+
 livecheck.type      regex
 livecheck.url       http://www.gnu.org/software/octave/news.html
 livecheck.regex     Version (\\d+(\\.\\d+)*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110118/1d2b2174/attachment.html>