[22401] trunk/dports/math/octave

[source_changes at macosforge.org]

Revision: 22401
          http://trac.macosforge.org/projects/macports/changeset/22401
Author:   stechert at macports.org
Date:     2007-02-27 17:21:12 -0800 (Tue, 27 Feb 2007)

Log Message:
-----------
Resolving ticket #11450

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

Added Paths:
-----------
    trunk/dports/math/octave/files/patch-configure-3
    trunk/dports/math/octave/files/patch-glpk.m

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2007-02-28 00:11:07 UTC (rev 22400)
+++ trunk/dports/math/octave/Portfile	2007-02-28 01:21:12 UTC (rev 22401)
@@ -23,7 +23,8 @@
 checksums	md5 a76a6d88f414285472896a63e4282b7f
 
 patch.args	-p1
-patchfiles	patch-configure patch-dynamic-ld-cc patch-configure-2 patch-glpk
+patchfiles	patch-configure patch-configure-2 patch-configure-3 \
+		patch-dynamic-ld-cc patch-glpk patch-glpk.m
 
 depends_build   bin:texinfo:texinfo	\
 		bin:tex:teTeX \
@@ -34,11 +35,9 @@
 		port:fftw-3			\
 		port:SuiteSparse		\
 		port:pcre			\
-		port:curl			\
-		port:glpk
+		port:glpk			\
+		port:gnuplot
 
-depends_run	bin:gnuplot:gnuplot
-
 configure.env   F77="gfortran-dp-4.0"	\
 		CFLAGS="-O2"		\
 		CXXFLAGS="-O2"		\
@@ -55,8 +54,6 @@
 		--mandir=${prefix}/share/man \
 		--with-blas="-framework Accelerate"
  
-destroot.destdir	prefix=${destroot}${prefix}
-
 platform darwin 8 i386 {
 	depends_build-delete	port:gcc40
 	depends_build-append	port:gcc42

Added: trunk/dports/math/octave/files/patch-configure-3
===================================================================
--- trunk/dports/math/octave/files/patch-configure-3	                        (rev 0)
+++ trunk/dports/math/octave/files/patch-configure-3	2007-02-28 01:21:12 UTC (rev 22401)
@@ -0,0 +1,11 @@
+--- octave-2.9.9.orig/configure	2007-02-26 12:22:12.000000000 -0800
++++ octave-2.9.9/configure	2007-02-26 12:25:42.000000000 -0800
+@@ -30253,7 +30253,7 @@
+     fi
+     { echo "$as_me:$LINENO: checking to see if your gnuplot supports multiple plot windows" >&5
+ echo $ECHO_N "checking to see if your gnuplot supports multiple plot windows... $ECHO_C" >&6; }
+-    if test -z "`echo 'set term x11 2' | $GNUPLOT_BINARY 2>&1`"; then
++    if test -z "`echo 'set term aqua 2' | $GNUPLOT_BINARY 2>&1`"; then
+       { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+     else

Added: trunk/dports/math/octave/files/patch-glpk.m
===================================================================
--- trunk/dports/math/octave/files/patch-glpk.m	                        (rev 0)
+++ trunk/dports/math/octave/files/patch-glpk.m	2007-02-28 01:21:12 UTC (rev 22401)
@@ -0,0 +1,12 @@
+--- octave-2.9.9.orig/scripts/optimization/glpk.m	2007-02-26 13:30:39.000000000 -0800
++++ octave-2.9.9/scripts/optimization/glpk.m	2007-02-26 13:32:37.000000000 -0800
+@@ -361,7 +361,8 @@
+ ## @item time
+ ## Time (in seconds) used for solving LP/MIP problem.
+ ## @item mem
+-## Memory (in bytes) used for solving LP/MIP problem.
++## Memory (in bytes) used for solving LP/MIP problem (this is not 
++## available if the version of GLPK is 4.15 or later)
+ ## @end table
+ ## @end table
+ ## 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070227/30bb3b82/attachment.html