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

michaelld at macports.org michaelld at macports.org
Thu May 23 10:27:01 PDT 2013


Revision: 106365
          https://trac.macports.org/changeset/106365
Author:   michaelld at macports.org
Date:     2013-05-23 10:27:01 -0700 (Thu, 23 May 2013)
Log Message:
-----------
octave-devel:
* fix dependencies, per ticket #39201;
* whitespace;
* add gcc49 variant;
* fix livecheck to be faster.

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

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2013-05-23 16:40:16 UTC (rev 106364)
+++ trunk/dports/math/octave-devel/Portfile	2013-05-23 17:27:01 UTC (rev 106365)
@@ -5,7 +5,7 @@
 
 name                octave-devel
 version             3.6.4
-revision            3
+revision            4
 conflicts           octave
 categories          math science
 maintainers         michaelld openmaintainer
@@ -34,29 +34,37 @@
                     port:gawk \
                     port:gperf \
                     port:grep \
+                    port:gsed \
+                    port:less \
                     path:bin/perl:perl5 \
                     port:pkgconfig \
                     port:texinfo
 
-depends_lib         port:curl \
+depends_lib         port:arpack \
+                    port:curl \
                     port:fftw-3 \
                     port:fftw-3-single \
-                    port:ftgl \
-                    port:ghostscript \
+                    port:fontconfig \
+                    port:freetype \
                     port:glpk \
                     port:GraphicsMagick \
-                    port:gnuplot \
-                    port:gsed \
                     port:hdf5-18 \
-                    port:less \
                     port:metis \
                     port:ncurses \
                     port:pcre \
                     port:qhull \
                     port:qrupdate \
                     port:readline \
-                    port:SuiteSparse
+                    port:SuiteSparse \
+                    port:zlib
 
+depends_run-append  port:epstool \
+                    port:ghostscript \
+                    port:gnuplot \
+                    port:less \
+                    port:transfig \
+                    port:pstoedit
+
 # allow us to disable checking for FLTK
 # via the environment variable "FLTK_CONFIG"
 patchfiles-append   patch-configure.diff
@@ -121,20 +129,21 @@
     build.args-append LANG="C"
 }
 
+variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc49 gcc48 gcc47 gcc46 gcc45 gcc44 g95 {}
 
-variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc48 gcc47 gcc46 gcc45 gcc44 g95 {}
+variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc49 gcc48 gcc47 gcc46 gcc45 gcc43 g95 {}
 
-variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc48 gcc47 gcc46 gcc45 gcc43 g95 {}
+variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc49 gcc48 gcc47 gcc46 gcc44 gcc43 g95 {}
 
-variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc48 gcc47 gcc46 gcc44 gcc43 g95 {}
+variant gcc46 description {build with the macports gcc46 toolchain} conflicts gcc49 gcc48 gcc47 gcc45 gcc44 gcc43 g95 {}
 
-variant gcc46 description {build with the macports gcc46 toolchain} conflicts gcc48 gcc47 gcc45 gcc44 gcc43 g95 {}
+variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc49 gcc48 gcc46 gcc45 gcc44 gcc43 g95 {}
 
-variant gcc47 description {build with the macports gcc47 toolchain} conflicts gcc48 gcc46 gcc45 gcc44 gcc43 g95 {}
+variant gcc48 description {build with the macports gcc48 toolchain} conflicts gcc49 gcc47 gcc46 gcc45 gcc44 gcc43 g95 {}
 
-variant gcc48 description {build with the macports gcc48 toolchain} conflicts gcc47 gcc46 gcc45 gcc44 gcc43 g95 {}
+variant gcc49 description {build with the macports gcc49 toolchain} conflicts gcc48 gcc47 gcc46 gcc45 gcc44 gcc43 g95 {}
 
-variant g95 description {build with g95} conflicts gcc48 gcc47 gcc46 gcc45 gcc44 gcc43 {
+variant g95 description {build with g95} conflicts gcc49 gcc48 gcc47 gcc46 gcc45 gcc44 gcc43 {
     depends_build-append    port:g95
     configure.f77           "${prefix}/bin/g95"
 }
@@ -163,7 +172,7 @@
 if {     ![variant_isset gcc43] && ![variant_isset gcc44] && \
          ![variant_isset gcc45] && ![variant_isset gcc46] && \
          ![variant_isset gcc47] && ![variant_isset gcc48] && \
-         ![variant_isset g95] } {
+         ![variant_isset gcc49] && ![variant_isset g95] } {
     default_variants +gcc47
 }
 
@@ -172,7 +181,7 @@
 if {     ![variant_isset gcc43] && ![variant_isset gcc44] && \
          ![variant_isset gcc45] && ![variant_isset gcc46] && \
          ![variant_isset gcc47] && ![variant_isset gcc48] && \
-         ![variant_isset g95] } {
+         ![variant_isset gcc49] && ![variant_isset g95] } {
     pre-fetch {
         error "You must select one of the compiler variants."
     }
@@ -191,15 +200,16 @@
     set gcc_version "4.7"
 } elseif {[variant_isset gcc48]} {
     set gcc_version "4.8"
+} elseif {[variant_isset gcc49]} {
+    set gcc_version "4.9"
 }
 
 if {${gcc_version} != ""} {
     set gcc_version_join [join [split ${gcc_version} "."] ""]
-    configure.ldflags		"-L${prefix}/lib/gcc${gcc_version_join}"
-    configure.ldflags-append	-lstdc++ \
-				-lgfortran
-    depends_build-append port:gcc${gcc_version_join}
-    configure.compiler   macports-gcc-${gcc_version}
+    configure.ldflags		 "-L${prefix}/lib/gcc${gcc_version_join}"
+    configure.ldflags-append -lstdc++ -lgfortran
+    depends_build-append     port:gcc${gcc_version_join}
+    configure.compiler       macports-gcc-${gcc_version}
 }
 
 variant docs description {Enable creation and installation of documentation} {
@@ -216,12 +226,9 @@
 
 variant fltk description {Include FLTK for graphical front-end} {
     depends_lib-append  path:lib/libfltk.dylib:fltk
-    depends_run-append  port:epstool \
-                        port:transfig \
-                        port:pstoedit
     configure.env-delete FLTK_CONFIG=no
 }
 
 livecheck.type      regex
-livecheck.url       http://www.gnu.org/software/octave/news.html
-livecheck.regex     Version (\\d+(\\.\\d+)*)
+livecheck.url       http://www.gnu.org/software/octave/download.html
+livecheck.regex     GNU Octave (\[\^\ \]*) was
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130523/d421a29c/attachment-0001.html>


More information about the macports-changes mailing list