Changes 2005-06-13:

* textread now returns cell arrays * use new gnuplot interface for functions * fix rand bug on non-intel architectures * more econometrics functions * new functions: randg, cellfun, cell2mat, bwarea, imresize, savepath * bug fixes and improvements (see ChangeLog for details)
author: adam <adam@pkgsrc.org> 2005-08-04 13:12:21 +0000
committer: adam <adam@pkgsrc.org> 2005-08-04 13:12:21 +0000
commit: 8fe3a2096662914e2f4feab7c8d6f5644b4bf90b (patch)
tree: 222becf3c467d7d48d8ffd8b5c104bcdcc2956c4 /math/octave-forge
parent: 8a840784d613869ab348dc86f16a8da38efcbf0c (diff)
download: pkgsrc-8fe3a2096662914e2f4feab7c8d6f5644b4bf90b.tar.gz
11 files changed, 80 insertions, 184 deletions
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 1ffaf729e0b..cfee039de0a 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/04 13:12:21 adam Exp $
 
-DISTNAME=	octave-forge-2004.11.16
-PKGREVISION=	1
+DISTNAME=	octave-forge-2005.06.13
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=octave/}
 
@@ -48,5 +47,4 @@ post-patch:
 .include "../../math/gsl/buildlink3.mk"
 .include "../../math/octave/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave-forge/PLIST b/math/octave-forge/PLIST
index 3d86bb0ab3d..e5b3043e22c 100644
--- a/math/octave-forge/PLIST
+++ b/math/octave-forge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/12/05 09:03:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/04 13:12:21 adam Exp $
 bin/mex
 man/man1/mex.1
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/PKG_ADD
@@ -26,6 +26,7 @@ share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/errorbar.
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/figure.m
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/hold.m
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/ishold.m
+share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/legend.m
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/mplot.m
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/multiplot.m
 share/octave/${OCT_VERSION}/site/octave-forge-alternatives/m/graceplot/oneplot.m
@@ -108,6 +109,8 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bwfill.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/bwlabel.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/cell2csv.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/celleval.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/cellfun.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/creadpdb.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/chol.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/clausen.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/conicalP_0.oct
@@ -237,6 +240,7 @@ ${OCT_LOCALVEROCTFILEDIR}/octave-forge/psi_1piy.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/psi_n.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/rand.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/rande.oct
+${OCT_LOCALVEROCTFILEDIR}/octave-forge/randg.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/randn.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/randp.oct
 ${OCT_LOCALVEROCTFILEDIR}/octave-forge/regexp.oct
@@ -295,6 +299,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/audio/wavwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/civil/__nlnewmark_fcn__.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/civil/newmark.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/civil/nlnewmark.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/cell/cell2mat.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm/PKG_ADD
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm/ademodce.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm/amodce.m
@@ -351,12 +356,19 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/gmm_variance_inefficient.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/mle_estimate.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/mle_example.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/mle_obj.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/mle_obj_nodes.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/mle_results.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/mle_variance.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/nls_estimate.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/nls_obj.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/nls_obj_nodes.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/parameterize.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/poisson.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/poisson_moments.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/prettyprint.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/prettyprint_c.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/scale_data.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/sum_moments_nodes.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/econometrics/unscale_parameters.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/blkdiag.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/general/char.m
@@ -410,6 +422,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/blkproc.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bmpwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bone.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/brighten.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwarea.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwborder.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bweuler.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/bwmorph.m
@@ -441,6 +454,8 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imhist.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imnoise.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/impad.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imread.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imresize.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imrotate_Fourier.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imrotate.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imshear.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/image/imtranslate.m
@@ -530,7 +545,6 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/mapping/rad2deg.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/mex/myfeval.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/OCTAVE_FORGE_VERSION.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/PKG_ADD
-${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/dispatch.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/edit.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/grep.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/miscellaneous/inputname.m
@@ -598,8 +612,10 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/wpolyfitdemo.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/optim/wsolve.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/path/addpath.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/path/rmpath.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/path/savepath.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/pdb/elements.mat
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/pdb/elements_struct.mat
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/pdb/plotpdb.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/pdb/read_pdb.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/pdb/strtoz.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/pdb/write_pdb.m
@@ -612,6 +628,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/dxfwrite.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/fill.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/fill3.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/fplot.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/get_graph_data.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/gget.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/ginput.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/plot/legend.m
@@ -655,6 +672,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/cheby2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/chirp.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/cohere.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/convmtx.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/cplxreal.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/csd.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/czt.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/dct.m
@@ -700,13 +718,17 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/resample.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sftrans.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sgolay.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sgolayfilt.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sos2tf.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/sos2zp.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/specgram.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/tf2sos.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/tfe.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/triang.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/tripuls.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/xcorr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/xcorr2.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/xcov.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/zp2sos.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/signal/zplane.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/PKG_ADD
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/sparse/fem_test.m
@@ -825,6 +847,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/testfun/speed.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/testfun/test.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/calendar.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datenum.m
+${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datesplit.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datestr.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/datevec.m
 ${OCT_LOCALVERFCNFILEDIR}/octave-forge/time/eomday.m
@@ -951,6 +974,7 @@ ${OCT_LOCALVERFCNFILEDIR}/octave-forge/vrml/vrml_transfo.m
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/control
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/comm
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/civil
+@dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/cell
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/audio
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/NaN
 @dirrm ${OCT_LOCALVERFCNFILEDIR}/octave-forge/FIXES
diff --git a/math/octave-forge/distinfo b/math/octave-forge/distinfo
index 636036852b7..4e7011f179e 100644
--- a/math/octave-forge/distinfo
+++ b/math/octave-forge/distinfo
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/03/19 20:47:46 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2005/08/04 13:12:21 adam Exp $
 
-SHA1 (octave-forge-2004.11.16.tar.gz) = a27dbccd1665eb99b1457d23c1ac6b75eb3a9800
-RMD160 (octave-forge-2004.11.16.tar.gz) = 9356864920a5a4d4a4c1786c3ea74be0ec1e760d
-Size (octave-forge-2004.11.16.tar.gz) = 3639093 bytes
-SHA1 (patch-aa) = d48898ade563f2ad62f1558f6b6ae98bf18b91ef
-SHA1 (patch-ab) = a9c46217e12f9278dfa9123707183c6d9e702070
-SHA1 (patch-ac) = fdd01692f5f762da42551a816972a80eb27a3819
-SHA1 (patch-ad) = 463f05f1061f4ff0e28f91f04be0aee348044ef8
-SHA1 (patch-ae) = 03a320acda082e968868795298de0424871d327b
+SHA1 (octave-forge-2005.06.13.tar.gz) = e2f1f4777e87017322f8b25789c2688402933805
+RMD160 (octave-forge-2005.06.13.tar.gz) = 4666543da2a542fd9a0f8b1c7c95be70824cff81
+Size (octave-forge-2005.06.13.tar.gz) = 3680082 bytes
 SHA1 (patch-af) = f3920b982014a06ecc5aac8d99e527918bf5e4c1
-SHA1 (patch-ag) = 3a9f2dede5f5b59b7997b76357707385806d7873
-SHA1 (patch-ah) = f772adbe28cacfb865f88a741797de117903d1cf
-SHA1 (patch-ai) = 6a6e49edd42115952203ebf33f0bd110e5e908a2
+SHA1 (patch-ag) = 2b9975da303c3a3a10af7f42fb9e8f943a8e5368
 SHA1 (patch-ak) = 49c63b4b2a92cb971410f325a077152d7b5ebcd8
 SHA1 (patch-al) = 716612d9cb33c4f384f1d40c5c48943e6f71b84e
diff --git a/math/octave-forge/patches/patch-aa b/math/octave-forge/patches/patch-aa
deleted file mode 100644
index ef69c601d03..00000000000
--- a/math/octave-forge/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/03/19 20:47:46 dmcmahill Exp $
-
---- main/gsl/replace_template.sh.orig	2004-05-04 15:49:42.000000000 +0000
-+++ main/gsl/replace_template.sh	2005-03-18 20:26:03.000000000 +0000
-@@ -1,8 +1,11 @@
- #!/bin/sh
- 
--csplit -f tmp_gsl $1 /DEFUN/ /GSL_FUNC_DOCSTRING/ /./ > /dev/null
-+awk '/DEFUN/ {exit} {print}' $1 > tmp_gsl00
-+awk '/DEFUN/ {state=1} /GSL_FUNC_DOCSTRING/ {if(state==1){exit}} state==1{print}' $1 > tmp_gsl01
-+awk '/DEFUN/ {state=1} /GSL_FUNC_DOCSTRING/ {if(state==1){print ; exit}}' $1 > tmp_gsl02
-+awk 'state==2{print} /DEFUN/ {state=1} /GSL_FUNC_DOCSTRING/ {if(state==1){state=2}}' $1 > tmp_gsl03
- 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
deleted file mode 100644
index 47a6781638f..00000000000
--- a/math/octave-forge/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/03/13 15:49:03 dmcmahill Exp $
-
---- Makefile.orig	2004-07-13 11:53:02.000000000 -0400
-+++ Makefile	2005-03-10 07:22:54.970353000 -0500
-@@ -88,5 +88,5 @@
- $(SUBMAKEDIRS):
- 	@echo Processing $@
--	@if cd $@ && ! $(MAKE) -k $(MAKECMDGOALS) 2>&1; then \
--	   echo "$@ not complete. See log for details" >>../build.fail ; \
--	fi | tee -a build.log
-+	@cd $@ &&  $(MAKE) -k $(MAKECMDGOALS) 2>&1 ||  \
-+	   echo "$@ not complete. See log for details" >>../build.fail  \
-+	| tee -a build.log
diff --git a/math/octave-forge/patches/patch-ac b/math/octave-forge/patches/patch-ac
deleted file mode 100644
index d45e326ba9c..00000000000
--- a/math/octave-forge/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $
-
---- FIXES/randmtzig.c.orig	2004-11-08 06:41:25.000000000 -0500
-+++ FIXES/randmtzig.c
-@@ -147,7 +147,7 @@
- 	unsigned long long uint64_t;
-    instead.
- */ 
--#include <stdint.h>
-+#include <sys/types.h>
- 
-    
- /* XXX FIXME XXX may want to suppress X86 if sizeof(long)>4 */
diff --git a/math/octave-forge/patches/patch-ad b/math/octave-forge/patches/patch-ad
deleted file mode 100644
index 857647e140a..00000000000
--- a/math/octave-forge/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/12/05 09:03:42 adam Exp $
-
---- main/sparse/Makefile.orig	2004-11-16 10:31:58.000000000 +0000
-+++ main/sparse/Makefile
-@@ -134,10 +134,10 @@ S_DOUBLE= $(DLUSRC) $(ALLAUX) $(DZLAUX) 
- all: $(NAME).oct $(OBJLINKS) sptest.m 
- 
- sptest.m: buildtests.sh
--	sh buildtests.sh preset
-+	${SHELL} buildtests.sh preset
- 
- sprandomtest.m: buildtests.sh
--	sh buildtests.sh random
-+	${SHELL} buildtests.sh random
- 
- $(S_DOUBLE):%.o:%.c
- 	$(CC) $(CFLAGS) $(CPICFLAG) $(S_INC) $(SUPERLU_DEFS) -c $< -o $@
diff --git a/math/octave-forge/patches/patch-ae b/math/octave-forge/patches/patch-ae
deleted file mode 100644
index 18255ecc937..00000000000
--- a/math/octave-forge/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $
-
---- Makeconf.base.orig	2004-11-16 05:31:57.000000000 -0500
-+++ Makeconf.base
-@@ -6,7 +6,7 @@
- 
- OCTAVE_FORGE = 1
- 
--SHELL = /bin/sh
-+SHELL = @SHELL@
- 
- canonical_host_type = @canonical_host_type@
- prefix = @prefix@
diff --git a/math/octave-forge/patches/patch-ag b/math/octave-forge/patches/patch-ag
index 80ab83673fd..2bdbcd2a1cd 100644
--- a/math/octave-forge/patches/patch-ag
+++ b/math/octave-forge/patches/patch-ag
@@ -1,18 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
+$NetBSD: patch-ag,v 1.4 2005/08/04 13:12:22 adam Exp $
 
---- configure.orig	2004-11-17 01:02:36.000000000 +0000
+--- configure.orig	2005-06-13 06:10:01.000000000 +0000
 +++ configure
-@@ -309,7 +309,8 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION TOPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MKOCTFILE ver subver mpath opath xpath altpath altmpath altopath CPICFLAG F77 FFLAGS FPICFLAG CXX CXXFLAGS CXXPICFLAG OCTAVE OCTAVE_VERSION canonical_host_type SHLEXT LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB COPY_FLAGS STRIP DEFHAVE_X X_LIBS X_CFLAGS CPP X_PRE_LIBS X_EXTRA_LIBS HAVE_DO_FORTRAN_INDEXING HAVE_PROPAGATE_EMPTY_MATRICES HAVE_OK_TO_LOSE_IMAGINARY_PART HAVE_ND_ARRAYS TYPEID_HAS_CLASS CLASS_HAS_LOAD_SAVE HAVE_OCTAVE_MAP_INDEX HAVE_OCTAVE_CONCAT HAVE_SWAP_BYTES HAVE_OCTAVE_UPLUS MAKEINFO TEXI2DVI TEXI2HTML DVIPDF DVIPS MKDOC MKTEXI HAVE_IEEE754_COMPLIANCE OCTAVE_FORGE_RELEASE EGREP DEFHAVE_LINUX_SOUNDCARD HAVE_RESIZE_AND_FILL HAVE_6ARG_MX_ND_RED OCTAVEFIXEDVERSION have_qhull need_qhull_version DEFHAVE_LIBGSL DEFHAVE_JPEG DEFHAVE_PNG MISCDEFS HAVE_LIB_TERMCAP HAVE_BUILTIN_STRUCT have_ginac DEFHAVE_GINAC LIBOBJS LTLIBOBJS'
-+# added AWK
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION TOPDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MKOCTFILE ver subver mpath opath xpath altpath altmpath altopath CPICFLAG F77 FFLAGS FPICFLAG CXX CXXFLAGS CXXPICFLAG OCTAVE OCTAVE_VERSION canonical_host_type SHLEXT LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB COPY_FLAGS STRIP DEFHAVE_X X_LIBS X_CFLAGS CPP X_PRE_LIBS X_EXTRA_LIBS HAVE_DO_FORTRAN_INDEXING HAVE_PROPAGATE_EMPTY_MATRICES HAVE_OK_TO_LOSE_IMAGINARY_PART HAVE_ND_ARRAYS TYPEID_HAS_CLASS CLASS_HAS_LOAD_SAVE HAVE_OCTAVE_MAP_INDEX HAVE_OCTAVE_CONCAT HAVE_SWAP_BYTES HAVE_OCTAVE_UPLUS MAKEINFO TEXI2DVI TEXI2HTML DVIPDF DVIPS MKDOC MKTEXI HAVE_IEEE754_COMPLIANCE OCTAVE_FORGE_RELEASE AWK EGREP DEFHAVE_LINUX_SOUNDCARD HAVE_RESIZE_AND_FILL HAVE_6ARG_MX_ND_RED OCTAVEFIXEDVERSION have_qhull need_qhull_version DEFHAVE_LIBGSL DEFHAVE_JPEG DEFHAVE_PNG MISCDEFS HAVE_LIB_TERMCAP HAVE_BUILTIN_STRUCT have_ginac DEFHAVE_GINAC LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -954,7 +955,7 @@ esac
+@@ -954,7 +954,7 @@ esac
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -21,7 +11,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    done
  fi
  
-@@ -1885,7 +1886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -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); } &&
@@ -31,7 +21,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -1943,7 +1945,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -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); } &&
@@ -41,7 +31,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2059,7 +2062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -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); } &&
@@ -51,7 +41,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2113,7 +2117,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -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); } &&
@@ -61,7 +51,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2158,7 +2163,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -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); } &&
@@ -71,7 +61,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2202,7 +2208,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -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); } &&
@@ -81,7 +71,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3077,12 +3084,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -3079,12 +3085,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -95,7 +85,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
-@@ -3175,7 +3179,7 @@ ac_x_header_dirs='
+@@ -3177,7 +3180,7 @@ ac_x_header_dirs='
  /usr/openwin/share/include'
  
  if test "$ac_x_includes" = no; then
@@ -104,7 +94,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    # First, try using that file with no special directory specified.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3249,7 +3253,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3251,7 +3254,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -114,7 +104,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3309,15 +3314,10 @@ else
+@@ -3311,15 +3315,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"
@@ -132,7 +122,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
  if test "$no_x" = yes; then
    # Not all programs may use this symbol, but it does not hurt to define it.
  
-@@ -3365,7 +3365,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3367,7 +3366,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -142,7 +132,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3416,7 +3417,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3418,7 +3418,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -152,7 +142,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3492,7 +3494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3494,7 +3495,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -162,7 +152,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3547,7 +3550,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3549,7 +3551,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -172,7 +162,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3615,7 +3619,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3617,7 +3620,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -182,7 +172,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3723,7 +3728,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3725,7 +3729,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -192,7 +182,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3787,7 +3793,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3789,7 +3794,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -202,7 +192,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3855,7 +3862,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3857,7 +3863,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -212,7 +202,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3959,7 +3967,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -3961,7 +3968,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -222,7 +212,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4023,7 +4032,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4025,7 +4033,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -232,7 +222,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4120,7 +4130,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4122,7 +4131,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -242,7 +232,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4184,7 +4195,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4186,7 +4196,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -252,7 +242,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4281,7 +4293,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4283,7 +4294,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -262,7 +252,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4345,7 +4358,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4347,7 +4359,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -272,7 +262,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4424,7 +4438,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4426,7 +4439,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -282,9 +272,9 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5044,6 +5059,48 @@ OCTAVE_FORGE_RELEASE=`date +%Y.%m.%d`
+@@ -5089,6 +5103,48 @@ done
+ 
  
- CONFIGURE_OUTPUTS="$CONFIGURE_OUTPUTS admin/RPM/octave-forge.spec"
  
 +for ac_prog in gawk mawk nawk awk
 +do
@@ -331,7 +321,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
  if test -e main/audio/NOINSTALL ; then
  
  		STATUS=noinstall
-@@ -5102,7 +5159,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5147,7 +5203,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -341,7 +331,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5272,7 +5330,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5317,7 +5374,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -351,7 +341,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5335,7 +5394,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5380,7 +5438,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -361,7 +351,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5585,7 +5645,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5630,7 +5689,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -371,7 +361,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5737,7 +5798,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5783,7 +5843,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -381,7 +371,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5866,7 +5928,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5916,7 +5977,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -391,7 +381,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5950,7 +6013,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5991,7 +6053,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -401,7 +391,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6102,7 +6166,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6069,7 +6132,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -411,7 +401,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6178,7 +6243,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6161,7 +6225,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -421,7 +411,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6330,7 +6396,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6314,7 +6379,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -431,7 +421,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6419,7 +6486,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6392,7 +6458,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -441,7 +431,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6507,7 +6575,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6545,7 +6612,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -451,7 +441,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6650,7 +6719,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6724,7 +6792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -461,7 +451,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6805,7 +6875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6867,7 +6936,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -471,7 +461,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6876,7 +6947,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -7023,7 +7093,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -481,15 +471,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7631,6 +7703,7 @@ s,@MKDOC@,$MKDOC,;t t
- s,@MKTEXI@,$MKTEXI,;t t
- s,@HAVE_IEEE754_COMPLIANCE@,$HAVE_IEEE754_COMPLIANCE,;t t
- s,@OCTAVE_FORGE_RELEASE@,$OCTAVE_FORGE_RELEASE,;t t
-+s,@AWK@,$AWK,;t t
- s,@EGREP@,$EGREP,;t t
- s,@DEFHAVE_LINUX_SOUNDCARD@,$DEFHAVE_LINUX_SOUNDCARD,;t t
- s,@HAVE_RESIZE_AND_FILL@,$HAVE_RESIZE_AND_FILL,;t t
-@@ -7814,6 +7887,11 @@ esac
+@@ -8321,6 +8392,11 @@ esac
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -501,7 +483,7 @@ $NetBSD: patch-ag,v 1.3 2004/12/05 09:03:42 adam Exp $
    # 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.  */
-@@ -7852,12 +7930,6 @@ echo "$as_me: error: cannot find input f
+@@ -8359,12 +8435,6 @@ echo "$as_me: error: cannot find input f
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
diff --git a/math/octave-forge/patches/patch-ah b/math/octave-forge/patches/patch-ah
deleted file mode 100644
index fdb4a2cb499..00000000000
--- a/math/octave-forge/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $
-
---- main/gsl/Makefile.orig	2004-07-14 15:59:13.000000000 -0400
-+++ main/gsl/Makefile
-@@ -21,7 +21,7 @@ endif
- $(PROGS): Makefile
- 
- gsl_sf.cc: $(SF_BUILDSCRIPT)
--	/bin/sh $(SF_BUILDSCRIPT)
-+	${SHELL} $(SF_BUILDSCRIPT)
- 
- $(SF_LINKS):
- 	-$(RM) -f $@
diff --git a/math/octave-forge/patches/patch-ai b/math/octave-forge/patches/patch-ai
deleted file mode 100644
index 3b668deb28a..00000000000
--- a/math/octave-forge/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2005/03/14 04:08:42 dmcmahill Exp $
-
---- Makeconf.in.orig	2004-11-16 20:02:36.000000000 -0500
-+++ Makeconf.in
-@@ -6,7 +6,7 @@
- 
- OCTAVE_FORGE = 1
- 
--SHELL = /bin/sh
-+SHELL = @SHELL@
- 
- canonical_host_type = @canonical_host_type@
- prefix = @prefix@
author	adam <adam@pkgsrc.org>	2005-08-04 13:12:21 +0000
committer	adam <adam@pkgsrc.org>	2005-08-04 13:12:21 +0000
commit	8fe3a2096662914e2f4feab7c8d6f5644b4bf90b (patch)
tree	222becf3c467d7d48d8ffd8b5c104bcdcc2956c4 /math/octave-forge
parent	8a840784d613869ab348dc86f16a8da38efcbf0c (diff)
download	pkgsrc-8fe3a2096662914e2f4feab7c8d6f5644b4bf90b.tar.gz