[79770] trunk/dports/math/octave-devel
michaelld at macports.org
michaelld at macports.org
Sat Jun 25 02:44:46 PDT 2011
Revision: 79770
http://trac.macports.org/changeset/79770
Author: michaelld at macports.org
Date: 2011-06-25 02:44:44 -0700 (Sat, 25 Jun 2011)
Log Message:
-----------
octave-devel: Fixes ticket #29919. Update to 3.4.2; add in support for latest fltk-devel; remove cruft.
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-06-25 09:07:25 UTC (rev 79769)
+++ trunk/dports/math/octave-devel/Portfile 2011-06-25 09:44:44 UTC (rev 79770)
@@ -4,7 +4,7 @@
PortSystem 1.0
name octave-devel
-version 3.4.0
+version 3.4.2
conflicts octave
categories math science
maintainers michaelld openmaintainer
@@ -23,14 +23,15 @@
distname octave-${version}
use_bzip2 yes
-checksums md5 c8144cee1d37e645d3368a8e8a5f1856 \
- sha1 936a8fc962abd96e7568fb5909ec2a4d7997a1a8 \
- rmd160 8448fc8277e19dab8dbc5c0121e673e9198c74ec
+checksums md5 31c744ab4555a2bf04d5e644b93f9b51 \
+ sha1 12cac29ef7d1ab8374980e1e2fd14637b2f15ba5 \
+ rmd160 ad2222ad0b3e0f1dd6db1ff8ca93c0666b95e3a0
depends_build port:bison \
port:flex \
port:gawk \
port:gperf \
+ port:grep \
port:gsed \
path:bin/perl:perl5 \
port:texinfo
@@ -56,58 +57,29 @@
port:SuiteSparse
# allow non-Apple compilers to work with FLTK by removing the -arch
-# flag, which means this port cannot easy compile as universal.
+# flag, which means this port cannot easily compile as universal.
patchfiles-append patch-configure.diff
universal_variant no
-configure.args --without-x \
- --enable-shared \
- --enable-dl \
+configure.args --disable-dependency-tracking \
+ --without-x \
--disable-docs \
- --disable-openmp
+ --with-cholmod="-lcholmod -lmetis"
-# do not build static libraries; just shared
-# --enable-static
-
-### 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 \
- --with-fftw3 \
- --with-fftw3f \
- --with-glpk \
- --with-curl \
- --with-blas \
- --with-lapack \
- --with-qrupdate \
- --with-amd \
- --with-camd \
- --with-colamd \
- --with-ccolamd \
- --with-cholmod="-lcholmod -lmetis" \
- --with-cxsparse \
- --with-umfpack \
- --with-arpack
-
-### the following are probably not necessary, but are included for
-### 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. FLTK doesn't work as of 1.3.x-r7794,
-# so disable it entirely (via "no" here and a configure patch).
+# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the
+# MacPorts' versions. Python is not used if perl is available, so
+# clear it out. grep is checked for in 'configure', but not used
+# except inside that script; include it here for completion.
configure.perl ${prefix}/bin/perl
configure.python ' '
configure.awk ${prefix}/bin/gawk
-configure.env-append SED="${prefix}/bin/gsed" \
+configure.env-append GREP="${prefix}/bin/grep" \
+ FLTK_CONFIG=no \
+ SED="${prefix}/bin/gsed" \
TEXI2DVI="${prefix}/bin/texi2dvi" \
- TEXI2PDF="${prefix}/bin/texi2pdf" \
- FLTK_CONFIG=no
+ TEXI2PDF="${prefix}/bin/texi2pdf"
configure.cppflags
configure.ldflags
@@ -125,13 +97,16 @@
configure.f77 "${prefix}/bin/g95"
}
-# check for default variant
+# check for GCC / G95 variants. The default here must match the
+# default found in the 'arpack' and 'atlas' ports.
+
+# check for setting the default variant (gcc44)
if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
![variant_isset gcc45] && ![variant_isset g95] } {
default_variants +gcc44
}
-# check for just -gcc44
+# check if the user disabled just the default variant: -gcc44
if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
![variant_isset gcc45] && ![variant_isset g95] } {
error "You cannot use the variant -gcc44 alone."
@@ -177,19 +152,12 @@
configure.objcflags-append -g3 -O0
}
-#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/__init_fltk__.cc
-# }
-#}
+# FLTK does work as of 1.3.x-r8635, so allow it as an option
+variant fltk description {Include FLTK for graphical front-end} {
+ depends_lib-append port:fltk-devel
+ configure.env-delete FLTK_CONFIG=no
+}
-#if {![variant_isset fltk]} {
-# configure.env-append FLTK_CONFIG=no
-#}
-
livecheck.type regex
livecheck.url http://www.gnu.org/software/octave/news.html
livecheck.regex Version (\\d+(\\.\\d+)*)
Modified: trunk/dports/math/octave-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-configure.diff 2011-06-25 09:07:25 UTC (rev 79769)
+++ trunk/dports/math/octave-devel/files/patch-configure.diff 2011-06-25 09:44:44 UTC (rev 79770)
@@ -1,6 +1,6 @@
---- configure.orig 2011-01-15 04:08:46.000000000 -0500
-+++ configure 2011-01-19 10:06:38.000000000 -0500
-@@ -32346,6 +32346,21 @@
+--- configure.orig 2011-06-25 10:04:48.000000000 +0200
++++ configure 2011-06-25 10:05:19.000000000 +0200
+@@ -33171,6 +33171,21 @@
## fltk (www.fltk.org)
@@ -22,7 +22,7 @@
# Check whether --with-fltk-prefix was given.
if test "${with_fltk_prefix+set}" = set; then :
-@@ -32422,6 +32437,7 @@
+@@ -33247,6 +33262,7 @@
$as_echo "no" >&6; }
fi
@@ -30,7 +30,7 @@
warn_fltk_config=""
-@@ -32432,11 +32448,29 @@
+@@ -33257,11 +33273,29 @@
else
FLTK_CFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --cflags`"
FLTK_LDFLAGS="`$FLTK_CONFIG $fltkconf_args --use-gl --ldflags`"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110625/76a84b61/attachment.html>
More information about the macports-changes
mailing list