Revision: 122966 https://trac.macports.org/changeset/122966 Author: sean@macports.org Date: 2014-08-02 14:59:36 -0700 (Sat, 02 Aug 2014) Log Message: ----------- octave: enable docs with texinfo and replace hardcoded path; fixes #44342 Modified Paths: -------------- trunk/dports/math/octave/Portfile trunk/dports/math/octave/files/Octave Property Changed: ---------------- trunk/dports/math/octave/files/Octave Modified: trunk/dports/math/octave/Portfile =================================================================== --- trunk/dports/math/octave/Portfile 2014-08-02 21:59:31 UTC (rev 122965) +++ trunk/dports/math/octave/Portfile 2014-08-02 21:59:36 UTC (rev 122966) @@ -9,6 +9,7 @@ name octave version 3.8.1 +revision 1 #conflicts octave-devel categories math science maintainers michaelld openmaintainer @@ -61,7 +62,8 @@ port:qrupdate \ port:readline \ port:SuiteSparse \ - port:zlib + port:zlib \ + port:texinfo depends_run-append port:epstool \ port:ghostscript \ @@ -76,7 +78,8 @@ --with-umfpack="-lumfpack -lSuiteSparse" \ --disable-java \ --with-opengl \ - --with-framework-opengl + --with-framework-opengl \ + --enable-docs # octave uses a number of other ports to create sources from template: # perl, gawk, gsed, flex, bison, texinfo. Make sure these are the @@ -163,23 +166,6 @@ } -variant docs description {Enable creation and installation of \ - documentation including manpages} {} - -if {[variant_isset docs]} { - - depends_lib-append \ - port:texinfo \ - port:texlive-latex - - configure.args-append --enable-docs - -} else { - - configure.args-append --disable-docs - -} - variant x11 description {Enable use of X11} {} if {[variant_isset x11]} { @@ -196,7 +182,7 @@ if {[variant_isset gui]} { - depends_lib-append port:qt4-mac + depends_lib-append port:qscintilla configure.args-append --enable-gui } else { @@ -272,6 +258,7 @@ xinstall -m 755 ${filespath}/Octave ${appdir}/Contents/MacOS reinplace -W ${appdir}/Contents "s,@@VERSION@@,${version},g" Info.plist + reinplace -W ${appdir}/Contents/MacOS "s,@@PREFIX@@,${prefix},g" Octave } } Modified: trunk/dports/math/octave/files/Octave =================================================================== --- trunk/dports/math/octave/files/Octave 2014-08-02 21:59:31 UTC (rev 122965) +++ trunk/dports/math/octave/files/Octave 2014-08-02 21:59:36 UTC (rev 122966) @@ -1,3 +1,3 @@ #!/bin/sh -/opt/local/bin/octave --force-gui +@@PREFIX@@/bin/octave --force-gui