Ticket #11450: patch-octave-misc

File patch-octave-misc, 2.6 KB (added by davidm@…, 17 years ago)
Line 
1Index: dports/math/octave/files/patch-glpk.m
2===================================================================
3--- dports/math/octave/files/patch-glpk.m       (revision 0)
4+++ dports/math/octave/files/patch-glpk.m       (revision 0)
5@@ -0,0 +1,12 @@
6+--- octave-2.9.9.orig/scripts/optimization/glpk.m      2007-02-26 13:30:39.000000000 -0800
7++++ octave-2.9.9/scripts/optimization/glpk.m   2007-02-26 13:32:37.000000000 -0800
8+@@ -361,7 +361,8 @@
9+ ## @item time
10+ ## Time (in seconds) used for solving LP/MIP problem.
11+ ## @item mem
12+-## Memory (in bytes) used for solving LP/MIP problem.
13++## Memory (in bytes) used for solving LP/MIP problem (this is not
14++## available if the version of GLPK is 4.15 or later)
15+ ## @end table
16+ ## @end table
17+ ##
18Index: dports/math/octave/files/patch-configure-3
19===================================================================
20--- dports/math/octave/files/patch-configure-3  (revision 0)
21+++ dports/math/octave/files/patch-configure-3  (revision 0)
22@@ -0,0 +1,11 @@
23+--- octave-2.9.9.orig/configure        2007-02-26 12:22:12.000000000 -0800
24++++ octave-2.9.9/configure     2007-02-26 12:25:42.000000000 -0800
25+@@ -30253,7 +30253,7 @@
26+     fi
27+     { echo "$as_me:$LINENO: checking to see if your gnuplot supports multiple plot windows" >&5
28+ echo $ECHO_N "checking to see if your gnuplot supports multiple plot windows... $ECHO_C" >&6; }
29+-    if test -z "`echo 'set term x11 2' | $GNUPLOT_BINARY 2>&1`"; then
30++    if test -z "`echo 'set term aqua 2' | $GNUPLOT_BINARY 2>&1`"; then
31+       { echo "$as_me:$LINENO: result: yes" >&5
32+ echo "${ECHO_T}yes" >&6; }
33+     else
34Index: dports/math/octave/Portfile
35===================================================================
36--- dports/math/octave/Portfile (revision 22370)
37+++ dports/math/octave/Portfile (working copy)
38@@ -23,7 +23,8 @@
39 checksums      md5 a76a6d88f414285472896a63e4282b7f
40 
41 patch.args     -p1
42-patchfiles     patch-configure patch-dynamic-ld-cc patch-configure-2 patch-glpk
43+patchfiles     patch-configure patch-configure-2 patch-configure-3 \
44+               patch-dynamic-ld-cc patch-glpk patch-glpk.m
45 
46 depends_build   bin:texinfo:texinfo    \
47                bin:tex:teTeX \
48@@ -34,11 +35,9 @@
49                port:fftw-3                     \
50                port:SuiteSparse                \
51                port:pcre                       \
52-               port:curl                       \
53-               port:glpk
54+               port:glpk                       \
55+               port:gnuplot
56 
57-depends_run    bin:gnuplot:gnuplot
58-
59 configure.env   F77="gfortran-dp-4.0"  \
60                CFLAGS="-O2"            \
61                CXXFLAGS="-O2"          \
62@@ -55,8 +54,6 @@
63                --mandir=${prefix}/share/man \
64                --with-blas="-framework Accelerate"
65 
66-destroot.destdir       prefix=${destroot}${prefix}
67-
68 platform darwin 8 i386 {
69        depends_build-delete    port:gcc40
70        depends_build-append    port:gcc42