Changeset 31191


Ignore:
Timestamp:
Nov 18, 2007, 4:40:53 AM (10 years ago)
Author:
ryandesign@…
Message:

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

Location:
trunk/dports/math/octave
Files:
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave/Portfile

    r31183 r31191  
    33PortSystem 1.0
    44name            octave
    5 version         2.9.9
    6 revision        6
     5version         2.9.15
    76categories      math science
    87maintainers     stechert@macports.org
     
    2120
    2221use_bzip2       yes
    23 checksums       md5 a76a6d88f414285472896a63e4282b7f
     22checksums       md5 c7c0449a5e1418479bebbdd565eb9cc2
    2423
    2524patch.args      -p1
    26 patchfiles      patch-configure patch-configure-2 patch-configure-3 \
    27                 patch-dynamic-ld-cc patch-glpk patch-glpk.m
     25patchfiles      patch-configure \
     26                patch-configure-2 \
     27                patch-dynamic-ld-cc
    2828
    2929depends_build   bin:texinfo:texinfo     \
    30                 bin:tex:teTeX
     30                bin:tex:teTeX \
     31                port:gawk \
     32                port:gsed
    3133
    3234depends_lib     port:readline                   \
     
    4648                --without-mpi   \
    4749                --with-blas="-framework Accelerate"
     50
     51configure.env-append    AWK="${prefix}/bin/gawk" \
     52                        SED="${prefix}/bin/gnused"
     53build.env-append        AWK="${prefix}/bin/gawk" \
     54                        SED="${prefix}/bin/gnused"
    4855
    4956post-patch {
  • trunk/dports/math/octave/files/patch-configure

    r20572 r31191  
    1 --- octave-2.9.9.orig/configure 2006-10-02 13:04:13.000000000 -0700
    2 +++ octave-2.9.9/configure      2006-11-07 00:28:15.000000000 -0800
    3 @@ -17238,7 +17238,7 @@
     1diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
     2--- octave-2.9.15.orig/configure        2007-10-17 13:33:17.000000000 -0400
     3+++ octave-2.9.15/configure     2007-10-17 13:31:50.000000000 -0400
     4@@ -16134,7 +16134,7 @@
    45 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    56 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
     
    1011 else
    1112 
    12 @@ -17328,7 +17328,7 @@
     13@@ -16208,7 +16208,7 @@
    1314 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    1415 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
     
    1920 
    2021 fi
    21 @@ -17420,7 +17420,7 @@
     22@@ -16284,7 +16284,7 @@
    2223 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    2324 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
     
    2829 else
    2930 
    30 @@ -17510,7 +17510,7 @@
     31@@ -16358,7 +16358,7 @@
    3132 { echo "$as_me:$LINENO: result: $ac_cv_lib_cholmod_cholmod_start" >&5
    3233 echo "${ECHO_T}$ac_cv_lib_cholmod_cholmod_start" >&6; }
     
    3738 fi
    3839 
    39 @@ -17919,7 +17919,7 @@
     40@@ -16757,7 +16757,7 @@
    4041     RLD_FLAG='-Wl,-rpath -Wl,$(octlibdir)'
    4142   ;;
     
    4344-    DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)'
    4445+    DL_LDFLAGS='$(LDFLAGS) -bundle -bundle_loader $(TOPDIR)/src/octave'
    45      MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)'
     46     MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT'
    4647     SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)'
    4748     CXXPICFLAG=
    48 @@ -30652,9 +30652,6 @@
    49  
    50  
    51  case "$canonical_host_type" in
    52 -  *-*-darwin*)
    53 -    UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
    54 -  ;;
    55    *)
    56      UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
    57    ;;
  • trunk/dports/math/octave/files/patch-configure-2

    r22360 r31191  
    1 --- octave-2.9.9.orig/configure 2007-02-27 01:55:00.000000000 -0800
    2 +++ octave-2.9.9/configure      2007-02-27 01:55:37.000000000 -0800
    3 @@ -10788,9 +10788,9 @@
     1diff -uNr octave-2.9.15.orig/configure octave-2.9.15/configure
     2--- octave-2.9.15.orig/configure        2007-10-18 11:17:52.000000000 -0400
     3+++ octave-2.9.15/configure     2007-10-18 11:19:19.000000000 -0400
     4@@ -10242,9 +10242,9 @@
     5 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
     6 _ACEOF
    47 
    5  GLPK_LIBS=
    6  if test -n "$glpk_lib"; then
    7 -  as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
     8-    as_ac_Lib=`echo "ac_cv_lib_$glpk_lib''_glp_lpx_simplex" | $as_tr_sh`
    89-{ echo "$as_me:$LINENO: checking for glp_lpx_simplex in -l$glpk_lib" >&5
    910-echo $ECHO_N "checking for glp_lpx_simplex in -l$glpk_lib... $ECHO_C" >&6; }
     
    1415   echo $ECHO_N "(cached) $ECHO_C" >&6
    1516 else
    16 @@ -10809,11 +10809,11 @@
     17@@ -10263,11 +10263,11 @@
    1718 #ifdef __cplusplus
    1819 extern "C"
     
    2829   return 0;
    2930 }
     31@@ -10310,7 +10310,7 @@
     32       GLPK_LIBS="-l$glpk_lib"
     33 
     34 cat >>confdefs.h <<\_ACEOF
     35-#define GLPK_PRE_4_14 1
     36+#undef  GLPK_PRE_4_14
     37 _ACEOF
     38 
     39 else
  • trunk/dports/math/octave/files/patch-dynamic-ld-cc

    r22323 r31191  
    1 --- octave-2.9.9.orig/src/dynamic-ld.cc 2007-02-25 19:16:09.000000000 +0100
    2 +++ octave-2.9.9/src/dynamic-ld.cc      2007-02-25 18:44:29.000000000 +0100
    3 @@ -406,7 +406,11 @@
     1diff -uNr octave-2.9.15.orig/src/dynamic-ld.cc octave-2.9.15/src/dynamic-ld.cc
     2--- octave-2.9.15.orig/src/dynamic-ld.cc        2007-10-12 17:27:29.000000000 -0400
     3+++ octave-2.9.15/src/dynamic-ld.cc     2007-10-17 20:11:54.000000000 -0400
     4@@ -443,7 +443,11 @@
    45            {
    56              octave_mex_file_list::append (mex_file);
Note: See TracChangeset for help on using the changeset viewer.