8 files changed, 58 insertions, 53 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 92dbf25262ab..42e1be8519db 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	octave
-PORTVERSION=	2.1.39
+PORTVERSION=	2.1.48
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
+MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,7 +17,7 @@ COMMENT=	High-level interactive language for numerical computations
 USE_BZIP2=	yes
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS=    fftw.2:${PORTSDIR}/math/fftw
+LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
 
 .include <bsd.port.pre.mk>
 
@@ -32,6 +32,9 @@ PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-shared --with-fftw --host=${GNU_HOST}
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
 
 .if ${OSVERSION} < 400004
 CONFIGURE_ARGS+=	--with-f2c
@@ -41,7 +44,7 @@ CONFIGURE_ARGS+=	--with-f2c
 CONFIGURE_ARGS+=	--disable-readline
 .endif
 
-MAN1=		octave.1 octave-bug.1
+MAN1=		octave.1 octave-bug.1 mkoctfile.1 octave-config.1
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/interpreter/octave.info*
diff --git a/math/octave/distinfo b/math/octave/distinfo
index ba86dfaf1301..b6b1c9737c6c 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1 +1 @@
-MD5 (octave-2.1.39.tar.bz2) = ab7f7e4d1a0d1032d260eb85ca4c571e
+MD5 (octave-2.1.48.tar.bz2) = 9e5234e9f00216b087f1e2fb465ed0cd
diff --git a/math/octave/files/patch-aa b/math/octave/files/patch-aa
index 123b16c84f96..e1e8e37f36a1 100644
--- a/math/octave/files/patch-aa
+++ b/math/octave/files/patch-aa
@@ -1,6 +1,6 @@
---- doc/liboctave/Makefile.in.orig	Wed May 12 13:10:19 1999
-+++ doc/liboctave/Makefile.in	Wed May 12 13:04:51 1999
-@@ -42,7 +42,7 @@
+--- doc/liboctave/Makefile.in.orig	Wed Oct 30 10:04:00 2002
++++ doc/liboctave/Makefile.in	Tue Jun 10 01:25:22 2003
+@@ -43,7 +43,7 @@
  .PHONY: all
  
  liboctave.info: $(TEXINFO) ../conf.texi
@@ -8,4 +8,4 @@
 +	-makeinfo --force --no-split -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
  
  liboctave.dvi: $(TEXINFO) ../conf.texi
- 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave/files/patch-ab b/math/octave/files/patch-ab
index 10fb6b644c30..37667cf58d8c 100644
--- a/math/octave/files/patch-ab
+++ b/math/octave/files/patch-ab
@@ -1,12 +1,20 @@
---- configure.orig	Fri Jan 21 14:55:43 2000
-+++ configure	Fri Jan 21 14:56:25 2000
-@@ -6012,6 +6012,9 @@
- unwind-prot.o: unwind-prot.cc 
+--- configure.orig	Wed May  7 04:08:03 2003
++++ configure	Tue Jun 10 01:14:35 2003
+@@ -700,7 +700,6 @@
+ fi
+ 
+ ac_tool_prefix=
+-test -n "$host_alias" && ac_tool_prefix=$host_alias-
+ 
+ test "$silent" = yes && exec 6>/dev/null
+ 
+@@ -18767,6 +18766,9 @@
  	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
  
-+xdiv.o: xdiv.cc
+ unwind-prot.o: unwind-prot.cc
 +	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
 +
++xdiv.o: xdiv.cc
+ 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
+ 
  EOF
-   ;;
- esac
diff --git a/math/octave/files/patch-af b/math/octave/files/patch-af
deleted file mode 100644
index 8fe529297dda..000000000000
--- a/math/octave/files/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
---- liboctave/lo-ieee.cc.orig	Tue Dec 28 22:05:23 1999
-+++ liboctave/lo-ieee.cc	Tue Dec 28 22:06:07 1999
-@@ -68,7 +68,7 @@
- #if defined (SCO)
-   double tmp = 1.0;
-   octave_Inf = 1.0 / (tmp - tmp);
--#elif defined (__alpha__) && ! defined (linux)
-+#elif defined (__alpha__) && ! defined (linux) && ! defined (__FreeBSD__)
-   extern unsigned int DINFINITY[2];
-   octave_Inf =  (*((double *) (DINFINITY)));
- #elif defined (HAVE_INFINITY)
-@@ -89,7 +89,7 @@
- 
- #if defined (HAVE_ISNAN)
- 
--#if defined (__alpha__) && ! defined (linux)
-+#if defined (__alpha__) && ! defined (linux) && ! defined (__FreeBSD__)
-   extern unsigned int DQNAN[2];
-   octave_NaN = (*((double *) (DQNAN)));
- #elif defined (HAVE_QUIET_NAN)
diff --git a/math/octave/files/patch-ag b/math/octave/files/patch-ag
index 91182ab14eb2..dbabcbe42134 100644
--- a/math/octave/files/patch-ag
+++ b/math/octave/files/patch-ag
@@ -1,9 +1,9 @@
---- src/sysdep.cc.orig	Fri Feb 18 11:51:53 2000
-+++ src/sysdep.cc	Fri Feb 18 11:52:46 2000
-@@ -110,7 +110,11 @@
- {
- #if defined (HAVE_FLOATINGPOINT_H)
-   // Disable trapping on common exceptions.
+--- src/sysdep.cc.orig	Sat Jan  4 15:21:29 2003
++++ src/sysdep.cc	Tue Jun 10 01:23:09 2003
+@@ -98,7 +98,11 @@
+ #ifndef FP_X_DNML
+ #define FP_X_DNML 0
+ #endif
 +#if defined(__alpha__)
 +  fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_UFL|FP_X_IMP));
 +#else
diff --git a/math/octave/files/patch-doc:interpreter:Makefile.in b/math/octave/files/patch-doc:interpreter:Makefile.in
index b9f68c643734..476c0a918e5d 100644
--- a/math/octave/files/patch-doc:interpreter:Makefile.in
+++ b/math/octave/files/patch-doc:interpreter:Makefile.in
@@ -1,6 +1,6 @@
---- doc/interpreter/Makefile.in.orig	Sun Jun  8 17:34:05 2003
-+++ doc/interpreter/Makefile.in	Sun Jun  8 17:34:22 2003
-@@ -86,7 +86,7 @@
+--- doc/interpreter/Makefile.in.orig	Thu Feb 27 05:55:47 2003
++++ doc/interpreter/Makefile.in	Tue Jun 10 01:26:37 2003
+@@ -87,7 +87,7 @@
  	@$(top_srcdir)/move-if-change $@.t $@
  
  octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 83404410da1a..71b61d08bb2a 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -19,7 +19,6 @@ include/octave-%%OCTAVE_VERSION%%/octave/Array3.h
 include/octave-%%OCTAVE_VERSION%%/octave/ArrayN-idx.h
 include/octave-%%OCTAVE_VERSION%%/octave/ArrayN.cc
 include/octave-%%OCTAVE_VERSION%%/octave/ArrayN.h
-include/octave-%%OCTAVE_VERSION%%/octave/BaseSLList.h
 include/octave-%%OCTAVE_VERSION%%/octave/Bounds.h
 include/octave-%%OCTAVE_VERSION%%/octave/CColVector.h
 include/octave-%%OCTAVE_VERSION%%/octave/CDiagMatrix.h
@@ -46,7 +45,6 @@ include/octave-%%OCTAVE_VERSION%%/octave/DASRT-opts.h
 include/octave-%%OCTAVE_VERSION%%/octave/DASRT.h
 include/octave-%%OCTAVE_VERSION%%/octave/DASSL-opts.h
 include/octave-%%OCTAVE_VERSION%%/octave/DASSL.h
-include/octave-%%OCTAVE_VERSION%%/octave/DLList.h
 include/octave-%%OCTAVE_VERSION%%/octave/DiagArray2.cc
 include/octave-%%OCTAVE_VERSION%%/octave/DiagArray2.h
 include/octave-%%OCTAVE_VERSION%%/octave/EIG.h
@@ -63,7 +61,6 @@ include/octave-%%OCTAVE_VERSION%%/octave/MArray2.cc
 include/octave-%%OCTAVE_VERSION%%/octave/MArray2.h
 include/octave-%%OCTAVE_VERSION%%/octave/MDiagArray2.cc
 include/octave-%%OCTAVE_VERSION%%/octave/MDiagArray2.h
-include/octave-%%OCTAVE_VERSION%%/octave/Map.h
 include/octave-%%OCTAVE_VERSION%%/octave/Matrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/NLConst.h
 include/octave-%%OCTAVE_VERSION%%/octave/NLEqn-opts.h
@@ -77,16 +74,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/ODESFunc.h
 include/octave-%%OCTAVE_VERSION%%/octave/ODESSA-opts.h
 include/octave-%%OCTAVE_VERSION%%/octave/ODESSA.h
 include/octave-%%OCTAVE_VERSION%%/octave/Objective.h
-include/octave-%%OCTAVE_VERSION%%/octave/Pix.h
 include/octave-%%OCTAVE_VERSION%%/octave/QP.h
 include/octave-%%OCTAVE_VERSION%%/octave/Quad-opts.h
 include/octave-%%OCTAVE_VERSION%%/octave/Quad.h
 include/octave-%%OCTAVE_VERSION%%/octave/Range.h
-include/octave-%%OCTAVE_VERSION%%/octave/SLList.h
-include/octave-%%OCTAVE_VERSION%%/octave/SLStack.h
-include/octave-%%OCTAVE_VERSION%%/octave/Stack.h
 include/octave-%%OCTAVE_VERSION%%/octave/base-dae.h
 include/octave-%%OCTAVE_VERSION%%/octave/base-de.h
+include/octave-%%OCTAVE_VERSION%%/octave/base-list.h
 include/octave-%%OCTAVE_VERSION%%/octave/base-lu.cc
 include/octave-%%OCTAVE_VERSION%%/octave/base-lu.h
 include/octave-%%OCTAVE_VERSION%%/octave/base-min.h
@@ -131,6 +125,8 @@ include/octave-%%OCTAVE_VERSION%%/octave/gripes.h
 include/octave-%%OCTAVE_VERSION%%/octave/help.h
 include/octave-%%OCTAVE_VERSION%%/octave/idx-vector.h
 include/octave-%%OCTAVE_VERSION%%/octave/input.h
+include/octave-%%OCTAVE_VERSION%%/octave/kpse-xfns.h
+include/octave-%%OCTAVE_VERSION%%/octave/kpse.cc
 include/octave-%%OCTAVE_VERSION%%/octave/lex.h
 include/octave-%%OCTAVE_VERSION%%/octave/lo-error.h
 include/octave-%%OCTAVE_VERSION%%/octave/lo-ieee.h
@@ -167,6 +163,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/mx-m-cm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-m-cs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-m-dm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-op-defs.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-s-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-s-cm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-s-dm.h
@@ -181,13 +178,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/oct-gperf.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-group.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-hist.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-iostrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-kpse.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-lvalue.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-map.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-obj.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-passwd.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-prcstrm.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-procbuf.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-rand.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-rl-edit.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-rl-hist.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-shlib.h
@@ -213,6 +210,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/ov-complex.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-cs-list.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-cx-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-dld-fcn.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-fcn-handle.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-fcn.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-file.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-list.h
@@ -247,6 +245,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/pt-const.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-decl.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-except.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-exp.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-fcn-handle.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-id.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-idx.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-jump.h
@@ -260,6 +259,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/pt-stmt.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-unop.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-walk.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt.h
+include/octave-%%OCTAVE_VERSION%%/octave/quit.h
 include/octave-%%OCTAVE_VERSION%%/octave/sighandlers.h
 include/octave-%%OCTAVE_VERSION%%/octave/siglist.h
 include/octave-%%OCTAVE_VERSION%%/octave/statdefs.h
@@ -474,6 +474,9 @@ share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_stream.m
 share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_struct.m
 share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_symmetric.m
 share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_vector.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/setstr.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/struct_contains.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/struct_elements.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acot.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acoth.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acsc.m
@@ -548,6 +551,7 @@ share/octave/%%OCTAVE_VERSION%%/m/image/rgb2hsv.m
 share/octave/%%OCTAVE_VERSION%%/m/image/rgb2ind.m
 share/octave/%%OCTAVE_VERSION%%/m/image/rgb2ntsc.m
 share/octave/%%OCTAVE_VERSION%%/m/image/saveimage.m
+share/octave/%%OCTAVE_VERSION%%/m/io/beep.m
 share/octave/%%OCTAVE_VERSION%%/m/io/printf.m
 share/octave/%%OCTAVE_VERSION%%/m/io/puts.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/commutation_matrix.m
@@ -559,6 +563,7 @@ share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/duplication_matrix.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/housh.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/krylov.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/krylovb.m
+share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/logm.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/norm.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/null.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/orth.m
@@ -573,7 +578,9 @@ share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/comma.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/cputime.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/dump_prefs.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/etime.m
+share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/fileparts.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/flops.m
+share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/fullfile.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/is_leap_year.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/list_primes.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/menu.m
@@ -582,11 +589,14 @@ share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/paren.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/path.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/popen2.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/semicolon.m
+share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/tempdir.m
+share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/tempname.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/texas_lotto.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/tic.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/toc.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/version.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/xor.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/PKG_ADD
 share/octave/%%OCTAVE_VERSION%%/m/plot/__axis_label__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__errcomm__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__errplot__.m
@@ -606,6 +616,7 @@ share/octave/%%OCTAVE_VERSION%%/m/plot/__pltopt__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/axis.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/bar.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/bottom_title.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/close.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/contour.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/errorbar.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/figure.m
@@ -888,6 +899,9 @@ share/octave/%%OCTAVE_VERSION%%/m/time/clock.m
 share/octave/%%OCTAVE_VERSION%%/m/time/ctime.m
 share/octave/%%OCTAVE_VERSION%%/m/time/date.m
 share/octave/ls-R
+share/octave/site/m/sndfile_load.m
+share/octave/site/m/sndfile_play.m
+share/octave/site/m/sndfile_save.m
 share/octave/site/m/startup/octaverc
 @dirrm include/octave-%%OCTAVE_VERSION%%/octave
 @dirrm include/octave-%%OCTAVE_VERSION%%