[41630] trunk/dports/math/octave

[mcalhoun at macports.org]

Revision: 41630
          http://trac.macports.org/changeset/41630
Author:   mcalhoun at macports.org
Date:     2008-11-07 09:37:22 -0800 (Fri, 07 Nov 2008)
Log Message:
-----------
octave: version update 3.0.2 -> 3.0.3; fixes compatibility with SuiteSparse (r41628); fixes #17026 (maintainer timeout)

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

Added Paths:
-----------
    trunk/dports/math/octave/files/
    trunk/dports/math/octave/files/patch-sparse-util.cc.diff
    trunk/dports/math/octave/files/patch-sparse-util.h.diff

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2008-11-07 17:26:47 UTC (rev 41629)
+++ trunk/dports/math/octave/Portfile	2008-11-07 17:37:22 UTC (rev 41630)
@@ -4,10 +4,9 @@
 PortSystem 1.0
 
 name	octave
-version		3.0.2
-revision    1
+version		3.0.3
 categories	math science
-maintainers	stechert at macports.org alakazam at melix.net
+maintainers	stechert melix.net:alakazam
 platforms	darwin
 description	a Matlab-like environment for numerical analysis
 long_description	\
@@ -23,16 +22,18 @@
 
 use_bzip2	no
 checksums \
-	md5 791e19cc9a36f2c046b39ab0574306d8 \
-	sha1 9236c11e03dd177a8379d697e1b29a9884b32a8f \
-	rmd160 38a10f6380478b66f17feef05b55466dbcf988c9
+	md5 6b11065c9dbd3c9743d234c2f785fb7b \
+	sha1 86d1974b5947440ed4a1bbfe02fe292548c014e1 \
+	rmd160 b349e12a566c93f166c1136e35d564d735b1a1e7
 
+patchfiles  patch-sparse-util.cc.diff  patch-sparse-util.h.diff
+
 depends_build \
 	bin:tex:texlive \
 	port:ghostscript \
 	port:gawk \
 	port:gsed \
-	port:perl5.8 \
+	path:bin/perl:perl5 \
 	port:texinfo
 
 depends_lib \
@@ -67,11 +68,12 @@
 	--with-cholmod \
 	--with-cxsparse
 
+configure.perl ${prefix}/bin/perl
+configure.python ' '
+configure.awk ${prefix}/bin/gawk
+
 configure.env-append \
-	AWK="${prefix}/bin/gawk" \
 	SED="${prefix}/bin/gsed" \
-	PERL="${prefix}/bin/perl" \
-	PYTHON=' ' \
 	GHOSTSCRIPT="${prefix}/bin/gs" \
 	MAKEINFO="${prefix}/bin/makeinfo" \
 	TEXI2DVI="${prefix}/bin/texi2dvi" \
@@ -93,9 +95,7 @@
 }
 
 post-patch {
-    reinplace "s|glp_lpx_simplex|_glp_lpx_simplex|g" ${worksrcpath}/configure
     reinplace "s|-lcholmod|-lcholmod -lmetis|g" ${worksrcpath}/configure
-    reinplace "s|#define GLPK_PRE_4_14 1|#undef GLPK_PRE_4_14|g" ${worksrcpath}/configure
 }
 
 livecheck.check		regex

Added: trunk/dports/math/octave/files/patch-sparse-util.cc.diff
===================================================================
--- trunk/dports/math/octave/files/patch-sparse-util.cc.diff	                        (rev 0)
+++ trunk/dports/math/octave/files/patch-sparse-util.cc.diff	2008-11-07 17:37:22 UTC (rev 41630)
@@ -0,0 +1,11 @@
+--- liboctave/sparse-util.cc.orig	2008-10-22 11:42:15.000000000 -0400
++++ liboctave/sparse-util.cc	2008-10-22 11:42:42.000000000 -0400
+@@ -31,7 +31,7 @@
+ #include "sparse-util.h"
+ 
+ void
+-SparseCholError (int status, char *file, int line, char *message)
++SparseCholError (int status, const char *file, int line, const char *message)
+ {
+   (*current_liboctave_warning_handler)("warning %i, at line %i in file %s",
+ 				     status, line, file);

Added: trunk/dports/math/octave/files/patch-sparse-util.h.diff
===================================================================
--- trunk/dports/math/octave/files/patch-sparse-util.h.diff	                        (rev 0)
+++ trunk/dports/math/octave/files/patch-sparse-util.h.diff	2008-11-07 17:37:22 UTC (rev 41630)
@@ -0,0 +1,11 @@
+--- liboctave/sparse-util.h.orig	2008-10-22 11:42:08.000000000 -0400
++++ liboctave/sparse-util.h	2008-10-22 11:42:29.000000000 -0400
+@@ -24,7 +24,7 @@
+ #if !defined (octave_sparse_util_h)
+ #define octave_sparse_util_h 1
+ 
+-extern OCTAVE_API void SparseCholError (int status, char *file, int line, char *message);
++extern OCTAVE_API void SparseCholError (int status, const char *file, int line, const char *message);
+ extern OCTAVE_API int SparseCholPrint (const char *fmt, ...);
+ 
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081107/11d28209/attachment.html>