diff options
author | dmcmahill <dmcmahill> | 2004-08-14 13:29:54 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2004-08-14 13:29:54 +0000 |
commit | de188c843d7a53024c5701574712e6b7a470c705 (patch) | |
tree | 429e8f58dc8f4945f83e29e2d90de14374be3f49 /math/octave-forge/patches | |
parent | feded838b80394d33d8720a0f0d148efac465fad (diff) | |
download | pkgsrc-de188c843d7a53024c5701574712e6b7a470c705.tar.gz |
import octave-forge-2004.07.07
The octave-forge project contains functions for Octave which are not in
the main distribution. While the main Octave distribution is
conservative about accepting new functions and changes, octave-forge is
very open. As a result, be prepared for some lower quality code and
more rapidly changing interfaces to the functions in octave-forge.
Diffstat (limited to 'math/octave-forge/patches')
-rw-r--r-- | math/octave-forge/patches/patch-aa | 16 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ab | 24 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ac | 18 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ad | 132 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ae | 13 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-af | 12 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ag | 12 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ah | 506 | ||||
-rw-r--r-- | math/octave-forge/patches/patch-ai | 25 |
9 files changed, 758 insertions, 0 deletions
diff --git a/math/octave-forge/patches/patch-aa b/math/octave-forge/patches/patch-aa new file mode 100644 index 00000000000..ae6044bf8e6 --- /dev/null +++ b/math/octave-forge/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +--- main/gsl/replace_template.sh.orig Tue May 4 15:49:42 2004 ++++ main/gsl/replace_template.sh +@@ -1,8 +1,8 @@ + #!/bin/sh + +-csplit -f tmp_gsl $1 /DEFUN/ /GSL_FUNC_DOCSTRING/ /./ > /dev/null ++${CSPLIT} -f tmp_gsl $1 /DEFUN/ /GSL_FUNC_DOCSTRING/ /./ > /dev/null + cat tmp_gsl01 | sed "s/GSL_OCTAVE_NAME/$octave_name/g" + cat docstring.txt | sed 's/\\/\\\\/g' | sed 's/$/\\n\\/g' + cat tmp_gsl03 | sed "s/GSL_OCTAVE_NAME/$octave_name/g" | sed "s/GSL_FUNC_NAME/$funcname/g" + +-rm -f tmp_gsl* docstring.txt +\ No newline at end of file ++rm -f tmp_gsl* docstring.txt diff --git a/math/octave-forge/patches/patch-ab b/math/octave-forge/patches/patch-ab new file mode 100644 index 00000000000..cc2ba382780 --- /dev/null +++ b/math/octave-forge/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +--- main/miscellaneous/configure.add.orig Sun Dec 14 04:00:04 2003 ++++ main/miscellaneous/configure.add +@@ -45,14 +45,14 @@ else + AC_CHECK_HEADER(termcap.h, have_termcap=yes, have_termcap=no) + ;; + esac +- if test $have_term = yes; then +- MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H" +- STATUS=yes +- AC_CHECK_LIB(termcap, tgetnum, HAVE_LIB_TERMCAP=yes) +- elif test $have_termcap = yes; then ++ if test $have_termcap = yes; then + MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERMCAP_H" + AC_CHECK_LIB(termcap, tgetnum, HAVE_LIB_TERMCAP=yes) + STATUS=yes ++ elif test $have_term = yes; then ++ MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H" ++ STATUS=yes ++ AC_CHECK_LIB(termcap, tgetnum, HAVE_LIB_TERMCAP=yes) + else + STATUS=no + fi diff --git a/math/octave-forge/patches/patch-ac b/math/octave-forge/patches/patch-ac new file mode 100644 index 00000000000..2b42a108ceb --- /dev/null +++ b/math/octave-forge/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +--- configure.base.orig Mon Apr 12 01:47:27 2004 ++++ configure.base +@@ -283,10 +283,10 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + + dnl Use $(COPY_FLAGS) to set options for cp when installing .oct files. +-COPY_FLAGS="-fdp" ++COPY_FLAGS="-Rfp" + case "$canonical_host_type" in +- powerpc-apple-darwin*) +- COPY_FLAGS="-Rfp" ++ *-*-linux*) ++ COPY_FLAGS="-fdp" + ;; + esac + AC_SUBST(COPY_FLAGS) diff --git a/math/octave-forge/patches/patch-ad b/math/octave-forge/patches/patch-ad new file mode 100644 index 00000000000..25e7af12d27 --- /dev/null +++ b/math/octave-forge/patches/patch-ad @@ -0,0 +1,132 @@ +$NetBSD: patch-ad,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +get rid of bash-isms + +--- main/sparse/buildtests.sh.orig Wed Jul 7 15:25:45 2004 ++++ main/sparse/buildtests.sh +@@ -89,7 +89,7 @@ EOF + # ======================================================= + # Section separator + +-function gen_section { ++gen_section() { + cat >>$TESTS <<EOF + + # ============================================================== +@@ -104,7 +104,7 @@ EOF + # ======================================================= + # If a sparse operation yields zeros, then those elements + # of the returned sparse matrix should be eaten. +-function gen_eat_zeros { ++gen_eat_zeros() { + cat >>$TESTS <<EOF + %% Make sure newly introduced zeros get eaten + %!assert(nnz(sparse([bf,bf,1]).^realmax),1); +@@ -126,7 +126,7 @@ cat >>$TESTS <<EOF + EOF + } + +-function gen_specific { ++gen_specific() { + cat >>$TESTS <<EOF + + %!test # segfault test from edd@debian.org +@@ -158,7 +158,7 @@ EOF + } + + +-function gen_specific_tests { ++gen_specific_tests() { + gen_section + gen_specific + gen_section +@@ -184,7 +184,7 @@ EOF + # ======================================================= + # Main function definition + +-function gen_function { ++gen_function() { + if $preset; then + cat >>$TESTS <<EOF + ## +@@ -227,7 +227,7 @@ EOF + # matrix ops + + # test ordered comparisons: uses as,af,bx,bf +-function gen_ordering_tests { ++gen_ordering_tests() { + cat >>$TESTS <<EOF + %% real values can be ordered (uses as,af) + %!assert(as<=bx,af<=bf) +@@ -243,7 +243,7 @@ EOF + } + + # test element-wise binary operations: uses as,af,bx,bf +-function gen_elementop_tests { ++gen_elementop_tests() { + cat >>$TESTS <<EOF + %% Elementwise binary tests (uses as,af,bx,bf) + %!assert(as==bx,af==bf) +@@ -268,7 +268,7 @@ EOF + } + + # test matrix-matrix operations: uses as,af,bx,bf +-function gen_matrixop_tests { ++gen_matrixop_tests() { + cat >>$TESTS <<EOF + %% Matrix-matrix operators (uses af,as,bx,bf) + %!assert(as*bx',af*bf') +@@ -280,7 +280,7 @@ EOF + } + + # test matrix operations: uses as,af +-function gen_unaryop_tests { ++gen_unaryop_tests() { + cat >>$TESTS <<EOF + %% Unary matrix tests (uses af,as) + %!assert(is_sparse(as),1) +@@ -343,7 +343,7 @@ EOF + } + + # operations which require square matrices. +-function gen_square_tests { ++gen_square_tests() { + cat >>$TESTS <<EOF + %!test ;# permuted LU + %! [L,U] = splu(bx); +@@ -369,7 +369,7 @@ EOF + } + + # test scalar operations: uses af and real scalar bf; modifies as,bx +-function gen_scalar_tests { ++gen_scalar_tests() { + echo '%!test as=sparse(af);' >> $TESTS + echo '%!test bx=bf;' >> $TESTS + gen_elementop_tests +@@ -378,7 +378,7 @@ function gen_scalar_tests { + } + + # test matrix operations: uses af and bf; modifies as,bx +-function gen_rectangular_tests { ++gen_rectangular_tests() { + echo '%!test as=sparse(af);' >> $TESTS + echo '%!test bx=bf;' >>$TESTS + gen_unaryop_tests +@@ -393,7 +393,7 @@ function gen_rectangular_tests { + # ======================================================= + # sparse assembly tests + +-function gen_assembly_tests { ++gen_assembly_tests() { + echo >>$TESTS <<EOF + %%Assembly tests + %!test +@@ -422,7 +422,7 @@ EOF + # ======================================================= + # sparse selection tests + +-function gen_select_tests { ++gen_select_tests() { + cat >>$TESTS <<EOF + %!test as=sparse(af); + diff --git a/math/octave-forge/patches/patch-ae b/math/octave-forge/patches/patch-ae new file mode 100644 index 00000000000..98d669fa4ed --- /dev/null +++ b/math/octave-forge/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +--- extra/mex/Makefile.orig Fri Feb 6 17:05:11 2004 ++++ extra/mex/Makefile +@@ -58,7 +58,7 @@ endif + @if test -d $(bindir) ; then \ + echo installing mex/mex in $(bindir) ; \ + $(RM) $(bindir)/mex ; \ +- $(INSTALL_PROGRAM) mex $(bindir)/mex ; \ ++ $(INSTALL_SCRIPT) mex $(bindir)/mex ; \ + fi + + clean: ; $(RM) mex mex_* $(MEXLIB) *.o *.oct core octave-core *~ diff --git a/math/octave-forge/patches/patch-af b/math/octave-forge/patches/patch-af new file mode 100644 index 00000000000..0023634aeea --- /dev/null +++ b/math/octave-forge/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +--- Makeconf.base.orig Mon Apr 26 04:22:51 2004 ++++ Makeconf.base +@@ -19,6 +19,7 @@ infodir = @infodir@ + includedir = @includedir@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALLOCT=octinst.sh + diff --git a/math/octave-forge/patches/patch-ag b/math/octave-forge/patches/patch-ag new file mode 100644 index 00000000000..038471d9718 --- /dev/null +++ b/math/octave-forge/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1.1.1 2004/08/14 13:29:56 dmcmahill Exp $ + +--- Makeconf.in.orig Wed Jul 7 17:52:53 2004 ++++ Makeconf.in +@@ -19,6 +19,7 @@ infodir = @infodir@ + includedir = @includedir@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALLOCT=octinst.sh + diff --git a/math/octave-forge/patches/patch-ah b/math/octave-forge/patches/patch-ah new file mode 100644 index 00000000000..1a005d2064e --- /dev/null +++ b/math/octave-forge/patches/patch-ah @@ -0,0 +1,506 @@ +$NetBSD: patch-ah,v 1.1.1.1 2004/08/14 13:29:57 dmcmahill Exp $ + +--- configure.orig Wed Jul 7 17:52:52 2004 ++++ configure +@@ -954,7 +954,7 @@ esac + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd "$ac_popdir" ++ cd $ac_popdir + done + fi + +@@ -1885,7 +1885,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -1943,7 +1944,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2059,7 +2061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2113,7 +2116,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2158,7 +2162,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2202,7 +2207,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2783,10 +2789,10 @@ else + fi + + +-COPY_FLAGS="-fdp" ++COPY_FLAGS="-Rfp" + case "$canonical_host_type" in +- powerpc-apple-darwin*) +- COPY_FLAGS="-Rfp" ++ *-*-linux*) ++ COPY_FLAGS="-fdp" + ;; + esac + +@@ -3077,12 +3083,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +- +-if test "x$ac_path_x_has_been_run" != xyes; then +- echo "$as_me:$LINENO: checking for X" >&5 ++echo "$as_me:$LINENO: checking for X" >&5 + echo $ECHO_N "checking for X... $ECHO_C" >&6 + +-ac_path_x_has_been_run=yes + + # Check whether --with-x or --without-x was given. + if test "${with_x+set}" = set; then +@@ -3175,7 +3178,7 @@ ac_x_header_dirs=' + /usr/openwin/share/include' + + if test "$ac_x_includes" = no; then +- # Guess where to find include files, by looking for a specified header file. ++ # Guess where to find include files, by looking for Intrinsic.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -3249,7 +3252,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3309,15 +3313,10 @@ else + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- # It might be that x_includes is empty (headers are found in the +- # standard search path. Then output the corresponding message +- ac_out_x_includes=$x_includes +- test "x$x_includes" = x && ac_out_x_includes="in standard search path" +- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 ++ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + fi + +-fi + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +@@ -3365,7 +3364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3416,7 +3416,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3492,7 +3493,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3547,7 +3549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3615,7 +3618,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3723,7 +3727,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3787,7 +3792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3855,7 +3861,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3959,7 +3966,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4023,7 +4031,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4120,7 +4129,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4184,7 +4194,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4281,7 +4292,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4345,7 +4357,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4424,7 +4437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5004,7 +5018,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5174,7 +5189,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5237,7 +5253,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5487,7 +5504,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5639,7 +5657,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5768,7 +5787,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5832,7 +5852,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5920,7 +5941,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6072,7 +6094,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6148,7 +6171,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6300,7 +6324,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6389,7 +6414,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6477,7 +6503,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6620,7 +6647,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6735,9 +6763,8 @@ fi + + ;; + esac +- if test $have_term = yes; then +- MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H" +- STATUS=yes ++ if test $have_termcap = yes; then ++ MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERMCAP_H" + echo "$as_me:$LINENO: checking for tgetnum in -ltermcap" >&5 + echo $ECHO_N "checking for tgetnum in -ltermcap... $ECHO_C" >&6 + if test "${ac_cv_lib_termcap_tgetnum+set}" = set; then +@@ -6776,7 +6803,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6805,8 +6833,10 @@ if test $ac_cv_lib_termcap_tgetnum = yes + HAVE_LIB_TERMCAP=yes + fi + +- elif test $have_termcap = yes; then +- MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERMCAP_H" ++ STATUS=yes ++ elif test $have_term = yes; then ++ MISCDEFS="$MISCDEFS -DUSE_TERM -DHAVE_TERM_H" ++ STATUS=yes + echo "$as_me:$LINENO: checking for tgetnum in -ltermcap" >&5 + echo $ECHO_N "checking for tgetnum in -ltermcap... $ECHO_C" >&6 + if test "${ac_cv_lib_termcap_tgetnum+set}" = set; then +@@ -6845,7 +6875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6874,7 +6905,6 @@ if test $ac_cv_lib_termcap_tgetnum = yes + HAVE_LIB_TERMCAP=yes + fi + +- STATUS=yes + else + STATUS=no + fi +@@ -7773,6 +7803,11 @@ esac + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -7811,12 +7846,6 @@ echo "$as_me: error: cannot find input f + fi;; + esac + done` || { (exit 1); exit 1; } +- +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub diff --git a/math/octave-forge/patches/patch-ai b/math/octave-forge/patches/patch-ai new file mode 100644 index 00000000000..88ffc75f752 --- /dev/null +++ b/math/octave-forge/patches/patch-ai @@ -0,0 +1,25 @@ +$NetBSD: patch-ai,v 1.1.1.1 2004/08/14 13:29:57 dmcmahill Exp $ + +--- octinst.sh.in.orig Wed Feb 25 05:48:03 2004 ++++ octinst.sh.in +@@ -23,6 +23,7 @@ if test $# -ge 1; then altopath=$1; shif + INSTALL="@INSTALL@" + INSTALL_DATA="@INSTALL_DATA@" + INSTALL_PROGRAM="@INSTALL_PROGRAM@" ++INSTALL_SCRIPT="@INSTALL_SCRIPT@" + MKPKGADD="@TOPDIR@/admin/mkpkgadd" + COPY_FLAGS="@COPY_FLAGS@" + +@@ -86,5 +87,12 @@ files=`echo $source/bin/* | sed -e "s/[^ + if test "$files" != "$source/bin/*" ; then + $INSTALL -d $xpath + $INSTALL_PROGRAM $files $xpath ++fi ++ ++# grab the executable files, skipping the CVS directory ++files=`echo $source/scripts/* | sed -e "s/[^ ]*CVS//"` ++if test "$files" != "$source/scripts/*" ; then ++ $INSTALL -d $xpath ++ $INSTALL_SCRIPT $files $xpath + fi + |