Revision: 75278 http://trac.macports.org/changeset/75278 Author: michaelld@macports.org Date: 2011-01-19 08:45:31 -0800 (Wed, 19 Jan 2011) Log Message: ----------- octave-devel: disable use of FLTK for now; fix 'configure' script to honor this disabling correctly. Modified Paths: -------------- trunk/dports/math/octave-devel/Portfile trunk/dports/math/octave-devel/files/patch-configure.diff Modified: trunk/dports/math/octave-devel/Portfile =================================================================== --- trunk/dports/math/octave-devel/Portfile 2011-01-19 16:38:42 UTC (rev 75277) +++ trunk/dports/math/octave-devel/Portfile 2011-01-19 16:45:31 UTC (rev 75278) @@ -103,13 +103,15 @@ ### completion. # octave uses a number of other ports to create sources from template: # perl, gawk, gsed, flex, bison, texinfo. python is not used if perl -# is available, so clear it out. +# is available, so clear it out. FLTK doesn't work as of 1.3.x-r7794, +# so disable it entirely (via "no" here and a configure patch). configure.perl ${prefix}/bin/perl configure.python ' ' configure.awk ${prefix}/bin/gawk configure.env-append SED="${prefix}/bin/gsed" \ TEXI2DVI="${prefix}/bin/texi2dvi" \ - TEXI2PDF="${prefix}/bin/texi2pdf" + TEXI2PDF="${prefix}/bin/texi2pdf" \ + FLTK_CONFIG=no ### parallel build is supposed to work now # use_parallel_build no @@ -166,13 +168,18 @@ configure.objcflags-append -g3 -O0 } -variant fltk description {Include FLTK option} { - depends_lib-append port:fltk-devel -} +#variant fltk description {Include FLTK option} { +# depends_lib-append port:fltk-devel +# post-patch + # fix use of #include Fl -> FL +# reinplace "/include/s,Fl/,FL/,g" +# ${worksrcpath}/src/DLD-FUNCTIONS/fltk_backend.cc +# } +#} -if {![variant_isset fltk]} { - configure.env-append FLTK_CONFIG= -} +#if {![variant_isset fltk]} { +# configure.env-append FLTK_CONFIG=no +#} livecheck.type regex livecheck.url http://www.gnu.org/software/octave/news.html Modified: trunk/dports/math/octave-devel/files/patch-configure.diff =================================================================== --- trunk/dports/math/octave-devel/files/patch-configure.diff 2011-01-19 16:38:42 UTC (rev 75277) +++ trunk/dports/math/octave-devel/files/patch-configure.diff 2011-01-19 16:45:31 UTC (rev 75278) @@ -1,6 +1,36 @@ ---- configure_orig 2010-08-01 12:16:40.000000000 -0400 -+++ configure 2010-08-16 22:45:16.000000000 -0400 -@@ -30759,11 +30759,29 @@ +--- configure.orig 2011-01-15 04:08:46.000000000 -0500 ++++ configure 2011-01-19 10:06:38.000000000 -0500 +@@ -32346,6 +32346,21 @@ + + ## fltk (www.fltk.org) + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fltk..." >&5 ++$as_echo_n "checking for fltk... " >&6; } ++ ++# Check whether FLTK_CONFIG is set and equal to "no" ++use_fltk="auto detect" ++if test "${FLTK_CONFIG+set}" = set ; then ++ if test "${FLTK_CONFIG}" = "no" ; then ++ use_fltk="disabled" ++ fi ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${use_fltk}" >&5 ++$as_echo "${use_fltk}" >&6; } ++ ++if test "${use_fltk}" != "disabled"; then + + # Check whether --with-fltk-prefix was given. + if test "${with_fltk_prefix+set}" = set; then : +@@ -32422,6 +32437,7 @@ + $as_echo "no" >&6; } + fi + ++fi + + + warn_fltk_config="" +@@ -32432,11 +32448,29 @@ else FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`" FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"