[22369] trunk/dports/math/octave

[source_changes at macosforge.org]

Revision: 22369
          http://trac.macosforge.org/projects/macports/changeset/22369
Author:   stechert at macports.org
Date:     2007-02-27 06:31:39 -0800 (Tue, 27 Feb 2007)

Log Message:
-----------
last fix for octave/glpk, all seems to be working now

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

Added Paths:
-----------
    trunk/dports/math/octave/files/patch-glpk

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2007-02-27 13:58:58 UTC (rev 22368)
+++ trunk/dports/math/octave/Portfile	2007-02-27 14:31:39 UTC (rev 22369)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		octave
 version		2.9.9
-revision	2
+revision	3
 categories	math science
 maintainers     andre at splunk.com
 platforms	darwin
@@ -23,7 +23,7 @@
 checksums	md5 a76a6d88f414285472896a63e4282b7f
 
 patch.args	-p1
-patchfiles	patch-configure patch-dynamic-ld-cc patch-configure-2
+patchfiles	patch-configure patch-dynamic-ld-cc patch-configure-2 patch-glpk
 
 depends_build   bin:texinfo:texinfo	\
 		bin:tex:teTeX \

Added: trunk/dports/math/octave/files/patch-glpk
===================================================================
--- trunk/dports/math/octave/files/patch-glpk	                        (rev 0)
+++ trunk/dports/math/octave/files/patch-glpk	2007-02-27 14:31:39 UTC (rev 22369)
@@ -0,0 +1,46 @@
+--- octave-2.9.9.orig/src/DLD-FUNCTIONS/__glpk__.cc	2007-02-27 03:47:14.000000000 -0800
++++ octave-2.9.9/src/DLD-FUNCTIONS/__glpk__.cc	2007-02-27 03:48:53.000000000 -0800
+@@ -38,8 +38,10 @@
+ 
+ #if defined (HAVE_GLPK)
+ 
+-extern "C" {
+ #include <glpk.h>
++extern "C" {
++  void _glp_lib_print_hook(int (*func)(void *info, char *buf), void *info);
++  void _glp_lib_fault_hook(int (*func)(void *info, char *buf), void *info); 
+ }
+ 
+ #define NIntP 17
+@@ -141,10 +143,10 @@
+ 
+   clock_t t_start = clock();
+ 
+-  lib_set_fault_hook (NULL, glpk_fault_hook);
++  _glp_lib_fault_hook (glpk_fault_hook, NULL);
+ 
+   if (lpxIntParam[0] > 1)
+-    lib_set_print_hook (NULL, glpk_print_hook);
++    _glp_lib_print_hook (glpk_print_hook, NULL);
+ 
+   LPX *lp = lpx_create_prob ();
+ 
+@@ -277,7 +279,7 @@
+       break;
+ 
+     default:
+-      insist (method != method);
++      glpk_fault_hook (NULL, "method != method");
+     }
+ 
+   /*  errnum assumes the following results:
+@@ -342,7 +344,8 @@
+ 	}
+ 
+       *time = (clock () - t_start) / CLOCKS_PER_SEC;
+-      *mem = (lib_env_ptr () -> mem_tpeak);
++      /* currently there is no way to determine memory usage */
++      *mem = 0;
+ 
+       lpx_delete_prob (lp);
+       return 0;

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