Changeset 31191

Timestamp:

2007-11-17 20:40:53 (12 months ago)

Author:

ryandesign@…

Message:

octave: update to 2.9.15. Maintainer timeout. See #12937.

Location:

trunk/dports/math/octave

Files:

• Portfile (modified) (3 diffs)
• files/patch-configure (modified) (6 diffs)
• files/patch-configure-2 (modified) (3 diffs)
• files/patch-configure-3 (deleted)
• files/patch-dynamic-ld-cc (modified) (1 diff)
• files/patch-glpk (deleted)
• files/patch-glpk.m (deleted)

trunk/dports/math/octave/Portfile

@@ -3 +3 @@
 PortSystem 1.0
 name            octave
-version         2.9.9
-revision        6
+version         2.9.15
 categories      math science
 maintainers     stechert@macports.org
@@ -21 +20 @@
 
 use_bzip2       yes
-checksums       md5 a76a6d88f414285472896a63e4282b7f
+checksums       md5 c7c0449a5e1418479bebbdd565eb9cc2
 
 patch.args      -p1
-patchfiles      patch-configure patch-configure-2 patch-configure-3 \
-                patch-dynamic-ld-cc patch-glpk patch-glpk.m
+patchfiles      patch-configure \
+                patch-configure-2 \
+                patch-dynamic-ld-cc
 
 depends_build   bin:texinfo:texinfo     \
-                bin:tex:teTeX
+                bin:tex:teTeX \
+                port:gawk \
+                port:gsed
 
 depends_lib     port:readline                   \
@@ -46 +48 @@
                 --without-mpi   \
                 --with-blas="-framework Accelerate"
+
+configure.env-append    AWK="${prefix}/bin/gawk" \
+                        SED="${prefix}/bin/gnused"
+build.env-append        AWK="${prefix}/bin/gawk" \
+                        SED="${prefix}/bin/gnused"
 
 post-patch {

trunk/dports/math/octave/files/patch-configure

@@ -1 @@
---- octave-2.9.9.orig/configure 2006-10-02 13:04:13.000000000 -0700
-+++ octave-2.9.9/configure      2006-11-07 00:28:15.000000000 -0800
-@@ -17238,7 +17238,7 @@
+diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
+--- octave-2.9.15.orig/configure        2007-10-17 13:33:17.000000000 -0400
++++ octave-2.9.15/configure     2007-10-17 13:31:50.000000000 -0400
+@@ -16134,7 +16134,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
  echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
@@ -10 +11 @@
  else
  
-@@ -17328,7 +17328,7 @@
+@@ -16208,7 +16208,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
  echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
@@ -19 +20 @@
  
  fi
-@@ -17420,7 +17420,7 @@
+@@ -16284,7 +16284,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
  echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
@@ -28 +29 @@
  else
  
-@@ -17510,7 +17510,7 @@
+@@ -16358,7 +16358,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
  echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
@@ -37 +38 @@
  fi
  
-@@ -17919,7 +17919,7 @@
+@@ -16757,7 +16757,7 @@
      RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
    ;;
@@ -43 +44 @@
 -    DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
 +    DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
-     MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
+     MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
      SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
      CXXPICFLAG=
-@@ -30652,9 +30652,6 @@
- 
- 
- case "$canonical_host_type" in
--  *-*-darwin*)
--    UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
--  ;;
-   *)
-     UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
-   ;;

trunk/dports/math/octave/files/patch-configure-2

@@ -1 @@
---- octave-2.9.9.orig/configure 2007-02-27 01:55:00.000000000 -0800
-+++ octave-2.9.9/configure      2007-02-27 01:55:37.000000000 -0800
-@@ -10788,9 +10788,9 @@
+diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
+--- octave-2.9.15.orig/configure        2007-10-18 11:17:52.000000000 -0400
++++ octave-2.9.15/configure     2007-10-18 11:19:19.000000000 -0400
+@@ -10242,9 +10242,9 @@
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
  
- GLPK_LIBS=
- if test -n "$glpk_lib"; then
--  as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
+-    as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
 -{ echo "$as_me:$LINENO: checking for glp_lpx_simplex in -l$glpk_lib" >&5
 -echo $ECHO_N "checking for glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
@@ -14 +15 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10809,11 +10809,11 @@
+@@ -10263,11 +10263,11 @@
  #ifdef __cplusplus
  extern "C"
@@ -28 +29 @@
    return 0;
  }
+@@ -10310,7 +10310,7 @@
+       GLPK_LIBS="-l$glpk_lib"
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define GLPK_PRE_4_14 1
++#undef  GLPK_PRE_4_14
+ _ACEOF
+ 
+ else

trunk/dports/math/octave/files/patch-dynamic-ld-cc

@@ -1 @@
---- octave-2.9.9.orig/src/dynamic-ld.cc 2007-02-25 19:16:09.000000000 +0100
-+++ octave-2.9.9/src/dynamic-ld.cc      2007-02-25 18:44:29.000000000 +0100
-@@ -406,7 +406,11 @@
+diff -uNr octave-2.9.15.orig/src/dynamic-ld.cc octave-2.9.15/src/dynamic-ld.cc
+--- octave-2.9.15.orig/src/dynamic-ld.cc        2007-10-12 17:27:29.000000000 -0400
++++ octave-2.9.15/src/dynamic-ld.cc     2007-10-17 20:11:54.000000000 -0400
+@@ -443,7 +443,11 @@
             {
               octave_mex_file_list::append (mex_file);