1. remove BROKEN

2. utilize PORTDOCS and DOCSDIR
3. sort PLIST

8 files changed, 340 insertions, 246 deletions

diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index 489e2ce8cbbb..92dbf25262ab 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 
-BROKEN=		"Does not compile"
-
 USE_BZIP2=	yes
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
@@ -28,7 +26,7 @@ GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 .else
 GNU_HOST=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
-OCTAVE_VERSION=	2.1.30
+OCTAVE_VERSION=	${PORTVERSION}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 
 USE_GMAKE=	yes
@@ -45,22 +43,20 @@ CONFIGURE_ARGS+=	--disable-readline
 
 MAN1=		octave.1 octave-bug.1
 
-LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/interpreter/octave.info*
+	@${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info*
 
 post-install:
-.ifndef NOPORTDOCS
-	$(MKDIR) $(PREFIX)/share/octave/doc
-.for file in $(LIBOCTAVE-INFO)
-	$(INSTALL_DATA) $(WRKSRC)/doc/liboctave/$(file) $(PREFIX)/info
-.endfor
+	$(INSTALL_DATA) $(WRKSRC)/doc/liboctave/liboctave.info $(PREFIX)/info
 	install-info --entry='* Octave: (octave).	Interactive language for numerical computations.' $(PREFIX)/info/octave.info $(PREFIX)/info/dir
 	install-info --entry='* LibOctave: (liboctave).	C++ class library for Octave.' $(PREFIX)/info/liboctave.info $(PREFIX)/info/dir
-	$(INSTALL_DATA) $(WRKSRC)/doc/interpreter/octave.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/liboctave/liboctave.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/refcard/refcard-letter.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/refcard/refcard-legal.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/refcard/refcard-a4.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/faq/Octave-FAQ.ps $(PREFIX)/share/octave/doc
+.ifndef NOPORTDOCS
+	@${MKDIR} ${DOCSDIR}
+.for file in faq/Octave-FAQ.ps interpreter/octave.ps liboctave/liboctave.ps \
+	refcard/refcard-a4.ps refcard/refcard-legal.ps refcard/refcard-letter.ps
+	$(INSTALL_DATA) ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/octave-devel/files/patch-aa b/math/octave-devel/files/patch-aa
index 7a5a5b68fd28..123b16c84f96 100644
--- a/math/octave-devel/files/patch-aa
+++ b/math/octave-devel/files/patch-aa
@@ -5,7 +5,7 @@
  
  liboctave.info: $(TEXINFO) ../conf.texi
 -	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
-+	-makeinfo --force -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
++	-makeinfo --force --no-split -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
  
  liboctave.dvi: $(TEXINFO) ../conf.texi
  	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
diff --git a/math/octave-devel/files/patch-doc:interpreter:Makefile.in b/math/octave-devel/files/patch-doc:interpreter:Makefile.in
new file mode 100644
index 000000000000..b9f68c643734
--- /dev/null
+++ b/math/octave-devel/files/patch-doc:interpreter:Makefile.in
@@ -0,0 +1,11 @@
+--- 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 @@
+ 	@$(top_srcdir)/move-if-change $@.t $@
+ 
+ octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+-	-makeinfo -I$(srcdir) -I$(srcdir)/.. $<
++	-makeinfo --no-split -I$(srcdir) -I$(srcdir)/.. $<
+ 
+ octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave-devel/pkg-plist b/math/octave-devel/pkg-plist
index 3b04ece02f35..83404410da1a 100644
--- a/math/octave-devel/pkg-plist
+++ b/math/octave-devel/pkg-plist
@@ -4,6 +4,8 @@ bin/octave
 bin/octave-%%OCTAVE_VERSION%%
 bin/octave-bug
 bin/octave-bug-%%OCTAVE_VERSION%%
+bin/octave-config
+bin/octave-config-%%OCTAVE_VERSION%%
 include/octave-%%OCTAVE_VERSION%%/octave/Array-flags.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array-idx.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array.cc
@@ -14,13 +16,16 @@ include/octave-%%OCTAVE_VERSION%%/octave/Array2.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array3-idx.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array3.cc
 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/Cell.h
 include/octave-%%OCTAVE_VERSION%%/octave/CColVector.h
 include/octave-%%OCTAVE_VERSION%%/octave/CDiagMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/CMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/CRowVector.h
+include/octave-%%OCTAVE_VERSION%%/octave/Cell.h
 include/octave-%%OCTAVE_VERSION%%/octave/CmplxAEPBAL.h
 include/octave-%%OCTAVE_VERSION%%/octave/CmplxCHOL.h
 include/octave-%%OCTAVE_VERSION%%/octave/CmplxDET.h
@@ -33,6 +38,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/CmplxSVD.h
 include/octave-%%OCTAVE_VERSION%%/octave/CollocWt.h
 include/octave-%%OCTAVE_VERSION%%/octave/DAE.h
 include/octave-%%OCTAVE_VERSION%%/octave/DAEFunc.h
+include/octave-%%OCTAVE_VERSION%%/octave/DAERT.h
+include/octave-%%OCTAVE_VERSION%%/octave/DAERTFunc.h
+include/octave-%%OCTAVE_VERSION%%/octave/DASPK-opts.h
+include/octave-%%OCTAVE_VERSION%%/octave/DASPK.h
+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
@@ -41,6 +53,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/EIG.h
 include/octave-%%OCTAVE_VERSION%%/octave/FEGrid.h
 include/octave-%%OCTAVE_VERSION%%/octave/LP.h
 include/octave-%%OCTAVE_VERSION%%/octave/LPsolve.h
+include/octave-%%OCTAVE_VERSION%%/octave/LSODE-opts.h
 include/octave-%%OCTAVE_VERSION%%/octave/LSODE.h
 include/octave-%%OCTAVE_VERSION%%/octave/LinConst.h
 include/octave-%%OCTAVE_VERSION%%/octave/MArray-defs.h
@@ -53,19 +66,26 @@ 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
 include/octave-%%OCTAVE_VERSION%%/octave/NLEqn.h
 include/octave-%%OCTAVE_VERSION%%/octave/NLFunc.h
 include/octave-%%OCTAVE_VERSION%%/octave/NLP.h
 include/octave-%%OCTAVE_VERSION%%/octave/ODE.h
 include/octave-%%OCTAVE_VERSION%%/octave/ODEFunc.h
+include/octave-%%OCTAVE_VERSION%%/octave/ODES.h
+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-lu.cc
 include/octave-%%OCTAVE_VERSION%%/octave/base-lu.h
@@ -76,6 +96,8 @@ include/octave-%%OCTAVE_VERSION%%/octave/c-file-ptr-stream.h
 include/octave-%%OCTAVE_VERSION%%/octave/chMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/cmd-edit.h
 include/octave-%%OCTAVE_VERSION%%/octave/cmd-hist.h
+include/octave-%%OCTAVE_VERSION%%/octave/comment-list.h
+include/octave-%%OCTAVE_VERSION%%/octave/config.h
 include/octave-%%OCTAVE_VERSION%%/octave/dColVector.h
 include/octave-%%OCTAVE_VERSION%%/octave/dDiagMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/dMatrix.h
@@ -98,8 +120,28 @@ include/octave-%%OCTAVE_VERSION%%/octave/dir-ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/dirfns.h
 include/octave-%%OCTAVE_VERSION%%/octave/dynamic-ld.h
 include/octave-%%OCTAVE_VERSION%%/octave/error.h
+include/octave-%%OCTAVE_VERSION%%/octave/f77-fcn.h
+include/octave-%%OCTAVE_VERSION%%/octave/file-io.h
+include/octave-%%OCTAVE_VERSION%%/octave/file-ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/file-stat.h
+include/octave-%%OCTAVE_VERSION%%/octave/fn-cache.h
+include/octave-%%OCTAVE_VERSION%%/octave/getopt.h
+include/octave-%%OCTAVE_VERSION%%/octave/glob-match.h
+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/lex.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-error.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-ieee.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-mappers.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-specfun.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-sstream.h
 include/octave-%%OCTAVE_VERSION%%/octave/lo-sysdep.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-utils.h
+include/octave-%%OCTAVE_VERSION%%/octave/load-save.h
+include/octave-%%OCTAVE_VERSION%%/octave/mach-info.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-base.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cdm-cm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cdm-cs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cdm-dm.h
@@ -112,11 +154,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/mx-cm-s.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cs-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cs-dm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cs-m.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-defs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-cm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-cs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-m.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-s.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-ext.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-inlines.cc
 include/octave-%%OCTAVE_VERSION%%/octave/mx-m-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-m-cm.h
@@ -126,109 +170,61 @@ include/octave-%%OCTAVE_VERSION%%/octave/mx-op-defs.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
+include/octave-%%OCTAVE_VERSION%%/octave/oct-alloc.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-cmplx.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-conf.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-env.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-fftw.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-fstrm.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-getopt.h
+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-rl-edit.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-rl-hist.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-shlib.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-stdstrm.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-stream.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-strstrm.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-syscalls.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-time.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct.h
+include/octave-%%OCTAVE_VERSION%%/octave/octave.h
+include/octave-%%OCTAVE_VERSION%%/octave/ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-base-nd-array.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-scalar.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-base.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-bool-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-bool.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-builtin.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-cell.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-ch-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-colon.h
+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.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-file.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-list.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-mapper.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-usr-fcn.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-all.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-arg-list.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-assign.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-binop.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-cell.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-check.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-colon.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-decl.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-except.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-id.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-idx.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-indir.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-jump.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-loop.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-select.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-stmt.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-unop.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt.h
-include/octave-%%OCTAVE_VERSION%%/octave/siglist.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-cv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-s.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-rv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-s.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-cv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-rv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-ccv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-cs.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-crv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-cs.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-s-ccv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-s-crv.h
-include/octave-%%OCTAVE_VERSION%%/f77-fcn.h
-include/octave-%%OCTAVE_VERSION%%/config.h
-include/octave-%%OCTAVE_VERSION%%/octave/file-io.h
-include/octave-%%OCTAVE_VERSION%%/octave/file-ops.h
-include/octave-%%OCTAVE_VERSION%%/octave/fn-cache.h
-include/octave-%%OCTAVE_VERSION%%/octave/getopt.h
-include/octave-%%OCTAVE_VERSION%%/octave/glob-match.h
-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/lex.h
-include/octave-%%OCTAVE_VERSION%%/lo-error.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-ieee.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-mappers.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-specfun.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-utils.h
-include/octave-%%OCTAVE_VERSION%%/octave/load-save.h
-include/octave-%%OCTAVE_VERSION%%/octave/mach-info.h
-include/octave-%%OCTAVE_VERSION%%/octave/mx-base.h
-include/octave-%%OCTAVE_VERSION%%/octave/mx-defs.h
-include/octave-%%OCTAVE_VERSION%%/octave/mx-ext.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-alloc.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-cmplx.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-conf.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-fstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-gperf.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-hist.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-iostrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-map.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-obj.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-prcstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-procbuf.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-stdstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-stream.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-strstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct.h
-include/octave-%%OCTAVE_VERSION%%/octave/ops.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-base.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-ch-mat.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-colon.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-complex.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-cx-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-range.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-re-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-re-nd-array.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-scalar.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-str-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-struct.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-typeinfo.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-usr-fcn.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-va-args.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov.h
 include/octave-%%OCTAVE_VERSION%%/octave/pager.h
@@ -238,15 +234,34 @@ include/octave-%%OCTAVE_VERSION%%/octave/pathsearch.h
 include/octave-%%OCTAVE_VERSION%%/octave/pr-output.h
 include/octave-%%OCTAVE_VERSION%%/octave/procstream.h
 include/octave-%%OCTAVE_VERSION%%/octave/prog-args.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-all.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-arg-list.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-assign.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-binop.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-bp.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-cell.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-check.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-cmd.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-colon.h
 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-id.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-idx.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-jump.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-loop.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-misc.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-plot.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-pr-code.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-select.h
+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/sighandlers.h
+include/octave-%%OCTAVE_VERSION%%/octave/siglist.h
 include/octave-%%OCTAVE_VERSION%%/octave/statdefs.h
 include/octave-%%OCTAVE_VERSION%%/octave/str-vec.h
 include/octave-%%OCTAVE_VERSION%%/octave/sun-utils.h
@@ -261,6 +276,18 @@ include/octave-%%OCTAVE_VERSION%%/octave/unwind-prot.h
 include/octave-%%OCTAVE_VERSION%%/octave/utils.h
 include/octave-%%OCTAVE_VERSION%%/octave/variables.h
 include/octave-%%OCTAVE_VERSION%%/octave/version.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-cv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-s.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-rv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-s.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-cv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-rv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-ccv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-cs.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-crv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-cs.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-s-ccv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-s-crv.h
 include/octave-%%OCTAVE_VERSION%%/octave/xdiv.h
 include/octave-%%OCTAVE_VERSION%%/octave/xpow.h
 @exec /bin/ln -sf %D/include/octave-%%OCTAVE_VERSION%%/octave %D/include/octave
@@ -268,25 +295,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/xpow.h
 @unexec install-info --delete --entry='* Octave: (octave).    Interactive language for numerical computations.' %D/info/octave.info %D/info/dir
 @unexec install-info --delete --entry='* LibOctave: (liboctave).      C++ class library for Octave.' %D/info/liboctave.info %D/info/dir
 info/octave.info
-info/octave.info-1
-info/octave.info-2
-info/octave.info-3
-info/octave.info-4
-info/octave.info-5
-info/octave.info-6
-info/octave.info-7
-info/octave.info-8
-info/octave.info-9
-info/octave.info-10
-info/octave.info-11
-info/octave.info-12
-info/octave.info-13
-info/octave.info-14
-info/octave.info-15
 info/liboctave.info
-info/liboctave.info-1
-info/liboctave.info-2
-info/liboctave.info-3
 @exec install-info --entry='* Octave: (octave).    Interactive language for numerical computations.' %D/info/octave.info %D/info/dir
 @exec install-info --entry='* LibOctave: (liboctave).      C++ class library for Octave.' %D/info/liboctave.info %D/info/dir
 lib/octave-%%OCTAVE_VERSION%%/libcruft.a
@@ -320,6 +329,7 @@ share/octave/%%OCTAVE_VERSION%%/m/control/base/damp.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dare.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dcgain.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dgram.m
+share/octave/%%OCTAVE_VERSION%%/m/control/base/dkalman.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dlqe.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dlqr.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dlyap.m
@@ -453,6 +463,17 @@ share/octave/%%OCTAVE_VERSION%%/m/control/util/zgrownorm.m
 share/octave/%%OCTAVE_VERSION%%/m/control/util/zgscal.m
 share/octave/%%OCTAVE_VERSION%%/m/control/util/zgsgiv.m
 share/octave/%%OCTAVE_VERSION%%/m/control/util/zgshsr.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_bool.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_complex.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_global.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_list.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_matrix.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_scalar.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_square.m
+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/elfun/acot.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acoth.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acsc.m
@@ -477,6 +498,8 @@ share/octave/%%OCTAVE_VERSION%%/m/finance/pv.m
 share/octave/%%OCTAVE_VERSION%%/m/finance/pvl.m
 share/octave/%%OCTAVE_VERSION%%/m/finance/rate.m
 share/octave/%%OCTAVE_VERSION%%/m/finance/vol.m
+share/octave/%%OCTAVE_VERSION%%/m/general/cart2pol.m
+share/octave/%%OCTAVE_VERSION%%/m/general/cart2sph.m
 share/octave/%%OCTAVE_VERSION%%/m/general/columns.m
 share/octave/%%OCTAVE_VERSION%%/m/general/common_size.m
 share/octave/%%OCTAVE_VERSION%%/m/general/diff.m
@@ -484,30 +507,35 @@ share/octave/%%OCTAVE_VERSION%%/m/general/fliplr.m
 share/octave/%%OCTAVE_VERSION%%/m/general/flipud.m
 share/octave/%%OCTAVE_VERSION%%/m/general/int2str.m
 share/octave/%%OCTAVE_VERSION%%/m/general/is_duplicate_entry.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_scalar.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_square.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_symmetric.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_vector.m
+share/octave/%%OCTAVE_VERSION%%/m/general/isscalar.m
+share/octave/%%OCTAVE_VERSION%%/m/general/issquare.m
+share/octave/%%OCTAVE_VERSION%%/m/general/issymmetric.m
+share/octave/%%OCTAVE_VERSION%%/m/general/isvector.m
 share/octave/%%OCTAVE_VERSION%%/m/general/logical.m
 share/octave/%%OCTAVE_VERSION%%/m/general/logspace.m
+share/octave/%%OCTAVE_VERSION%%/m/general/mod.m
 share/octave/%%OCTAVE_VERSION%%/m/general/nargchk.m
 share/octave/%%OCTAVE_VERSION%%/m/general/nextpow2.m
 share/octave/%%OCTAVE_VERSION%%/m/general/num2str.m
 share/octave/%%OCTAVE_VERSION%%/m/general/perror.m
+share/octave/%%OCTAVE_VERSION%%/m/general/pol2cart.m
 share/octave/%%OCTAVE_VERSION%%/m/general/postpad.m
 share/octave/%%OCTAVE_VERSION%%/m/general/prepad.m
 share/octave/%%OCTAVE_VERSION%%/m/general/randperm.m
 share/octave/%%OCTAVE_VERSION%%/m/general/rem.m
+share/octave/%%OCTAVE_VERSION%%/m/general/repmat.m
 share/octave/%%OCTAVE_VERSION%%/m/general/reshape.m
 share/octave/%%OCTAVE_VERSION%%/m/general/rot90.m
 share/octave/%%OCTAVE_VERSION%%/m/general/rows.m
 share/octave/%%OCTAVE_VERSION%%/m/general/shift.m
+share/octave/%%OCTAVE_VERSION%%/m/general/sph2cart.m
 share/octave/%%OCTAVE_VERSION%%/m/general/strerror.m
 share/octave/%%OCTAVE_VERSION%%/m/general/tril.m
 share/octave/%%OCTAVE_VERSION%%/m/general/triu.m
 share/octave/%%OCTAVE_VERSION%%/m/image/colormap.m
 share/octave/%%OCTAVE_VERSION%%/m/image/gray.m
 share/octave/%%OCTAVE_VERSION%%/m/image/gray2ind.m
+share/octave/%%OCTAVE_VERSION%%/m/image/hsv2rgb.m
 share/octave/%%OCTAVE_VERSION%%/m/image/image.m
 share/octave/%%OCTAVE_VERSION%%/m/image/imagesc.m
 share/octave/%%OCTAVE_VERSION%%/m/image/imshow.m
@@ -516,6 +544,7 @@ share/octave/%%OCTAVE_VERSION%%/m/image/ind2rgb.m
 share/octave/%%OCTAVE_VERSION%%/m/image/loadimage.m
 share/octave/%%OCTAVE_VERSION%%/m/image/ntsc2rgb.m
 share/octave/%%OCTAVE_VERSION%%/m/image/ocean.m
+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
@@ -528,7 +557,6 @@ share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/dmult.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/dot.m
 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/kron.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/norm.m
@@ -560,6 +588,8 @@ 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/__axis_label__.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/__errcomm__.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/__errplot__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__plr1__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__plr2__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__plr__.m
@@ -577,10 +607,12 @@ 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/contour.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/errorbar.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/figure.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/grid.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/hist.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/loglog.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/loglogerr.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/mesh.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/meshdom.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/meshgrid.m
@@ -591,7 +623,9 @@ share/octave/%%OCTAVE_VERSION%%/m/plot/plot.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/plot_border.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/polar.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/semilogx.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/semilogxerr.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/semilogy.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/semilogyerr.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/shg.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/sombrero.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/stairs.m
@@ -648,6 +682,7 @@ share/octave/%%OCTAVE_VERSION%%/m/signal/fftfilt.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/fftshift.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/fractdiff.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/freqz.m
+share/octave/%%OCTAVE_VERSION%%/m/signal/freqz_plot.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/hamming.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/hanning.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/hurst.m
@@ -664,6 +699,7 @@ share/octave/%%OCTAVE_VERSION%%/m/signal/stft.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/synthesis.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/triangle_lw.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/triangle_sw.m
+share/octave/%%OCTAVE_VERSION%%/m/signal/unwrap.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/yulewalker.m
 share/octave/%%OCTAVE_VERSION%%/m/specfun/bessel.m
 share/octave/%%OCTAVE_VERSION%%/m/specfun/beta.m
@@ -752,10 +788,10 @@ share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/geometric_pdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/geometric_rnd.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_cdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_inv.m
-share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_cdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_pdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_rnd.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/kolmogorov_smirnov_cdf.m
+share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_cdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_inv.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_pdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_rnd.m
@@ -824,10 +860,12 @@ share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/welch_test.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/wilcoxon_test.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/z_test.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/z_test_2.m
+share/octave/%%OCTAVE_VERSION%%/m/strings/base2dec.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/bin2dec.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/blanks.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/com2str.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/deblank.m
+share/octave/%%OCTAVE_VERSION%%/m/strings/dec2base.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/dec2bin.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/dec2hex.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/findstr.m
@@ -841,6 +879,7 @@ share/octave/%%OCTAVE_VERSION%%/m/strings/str2mat.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/str2num.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/strcat.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/strcmp.m
+share/octave/%%OCTAVE_VERSION%%/m/strings/strjust.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/strrep.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/substr.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/upper.m
@@ -848,12 +887,6 @@ share/octave/%%OCTAVE_VERSION%%/m/time/asctime.m
 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/doc/Octave-FAQ.ps
-share/octave/doc/liboctave.ps
-share/octave/doc/octave.ps
-share/octave/doc/refcard-a4.ps
-share/octave/doc/refcard-legal.ps
-share/octave/doc/refcard-letter.ps
 share/octave/ls-R
 share/octave/site/m/startup/octaverc
 @dirrm include/octave-%%OCTAVE_VERSION%%/octave
@@ -881,6 +914,7 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/control/system
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/control/util
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/control
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/deprecated
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/elfun
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/finance
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/general
@@ -910,5 +944,11 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/site/m/startup
 @dirrm share/octave/site/m
 @dirrm share/octave/site
-@dirrm share/octave/doc
 @dirrm share/octave
+%%PORTDOCS%%%%DOCSDIR%%/Octave-FAQ.ps
+%%PORTDOCS%%%%DOCSDIR%%/liboctave.ps
+%%PORTDOCS%%%%DOCSDIR%%/octave.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard-a4.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard-legal.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard-letter.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 489e2ce8cbbb..92dbf25262ab 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-level interactive language for numerical computations
 
-BROKEN=		"Does not compile"
-
 USE_BZIP2=	yes
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
@@ -28,7 +26,7 @@ GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 .else
 GNU_HOST=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
-OCTAVE_VERSION=	2.1.30
+OCTAVE_VERSION=	${PORTVERSION}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 
 USE_GMAKE=	yes
@@ -45,22 +43,20 @@ CONFIGURE_ARGS+=	--disable-readline
 
 MAN1=		octave.1 octave-bug.1
 
-LIBOCTAVE-INFO= liboctave.info liboctave.info-1 liboctave.info-2 liboctave.info-3
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/interpreter/octave.info*
+	@${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info*
 
 post-install:
-.ifndef NOPORTDOCS
-	$(MKDIR) $(PREFIX)/share/octave/doc
-.for file in $(LIBOCTAVE-INFO)
-	$(INSTALL_DATA) $(WRKSRC)/doc/liboctave/$(file) $(PREFIX)/info
-.endfor
+	$(INSTALL_DATA) $(WRKSRC)/doc/liboctave/liboctave.info $(PREFIX)/info
 	install-info --entry='* Octave: (octave).	Interactive language for numerical computations.' $(PREFIX)/info/octave.info $(PREFIX)/info/dir
 	install-info --entry='* LibOctave: (liboctave).	C++ class library for Octave.' $(PREFIX)/info/liboctave.info $(PREFIX)/info/dir
-	$(INSTALL_DATA) $(WRKSRC)/doc/interpreter/octave.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/liboctave/liboctave.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/refcard/refcard-letter.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/refcard/refcard-legal.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/refcard/refcard-a4.ps $(PREFIX)/share/octave/doc
-	$(INSTALL_DATA) $(WRKSRC)/doc/faq/Octave-FAQ.ps $(PREFIX)/share/octave/doc
+.ifndef NOPORTDOCS
+	@${MKDIR} ${DOCSDIR}
+.for file in faq/Octave-FAQ.ps interpreter/octave.ps liboctave/liboctave.ps \
+	refcard/refcard-a4.ps refcard/refcard-legal.ps refcard/refcard-letter.ps
+	$(INSTALL_DATA) ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/octave/files/patch-aa b/math/octave/files/patch-aa
index 7a5a5b68fd28..123b16c84f96 100644
--- a/math/octave/files/patch-aa
+++ b/math/octave/files/patch-aa
@@ -5,7 +5,7 @@
  
  liboctave.info: $(TEXINFO) ../conf.texi
 -	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
-+	-makeinfo --force -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
++	-makeinfo --force --no-split -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
  
  liboctave.dvi: $(TEXINFO) ../conf.texi
  	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
diff --git a/math/octave/files/patch-doc:interpreter:Makefile.in b/math/octave/files/patch-doc:interpreter:Makefile.in
new file mode 100644
index 000000000000..b9f68c643734
--- /dev/null
+++ b/math/octave/files/patch-doc:interpreter:Makefile.in
@@ -0,0 +1,11 @@
+--- 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 @@
+ 	@$(top_srcdir)/move-if-change $@.t $@
+ 
+ octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+-	-makeinfo -I$(srcdir) -I$(srcdir)/.. $<
++	-makeinfo --no-split -I$(srcdir) -I$(srcdir)/.. $<
+ 
+ octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+ 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 3b04ece02f35..83404410da1a 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -4,6 +4,8 @@ bin/octave
 bin/octave-%%OCTAVE_VERSION%%
 bin/octave-bug
 bin/octave-bug-%%OCTAVE_VERSION%%
+bin/octave-config
+bin/octave-config-%%OCTAVE_VERSION%%
 include/octave-%%OCTAVE_VERSION%%/octave/Array-flags.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array-idx.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array.cc
@@ -14,13 +16,16 @@ include/octave-%%OCTAVE_VERSION%%/octave/Array2.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array3-idx.h
 include/octave-%%OCTAVE_VERSION%%/octave/Array3.cc
 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/Cell.h
 include/octave-%%OCTAVE_VERSION%%/octave/CColVector.h
 include/octave-%%OCTAVE_VERSION%%/octave/CDiagMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/CMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/CRowVector.h
+include/octave-%%OCTAVE_VERSION%%/octave/Cell.h
 include/octave-%%OCTAVE_VERSION%%/octave/CmplxAEPBAL.h
 include/octave-%%OCTAVE_VERSION%%/octave/CmplxCHOL.h
 include/octave-%%OCTAVE_VERSION%%/octave/CmplxDET.h
@@ -33,6 +38,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/CmplxSVD.h
 include/octave-%%OCTAVE_VERSION%%/octave/CollocWt.h
 include/octave-%%OCTAVE_VERSION%%/octave/DAE.h
 include/octave-%%OCTAVE_VERSION%%/octave/DAEFunc.h
+include/octave-%%OCTAVE_VERSION%%/octave/DAERT.h
+include/octave-%%OCTAVE_VERSION%%/octave/DAERTFunc.h
+include/octave-%%OCTAVE_VERSION%%/octave/DASPK-opts.h
+include/octave-%%OCTAVE_VERSION%%/octave/DASPK.h
+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
@@ -41,6 +53,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/EIG.h
 include/octave-%%OCTAVE_VERSION%%/octave/FEGrid.h
 include/octave-%%OCTAVE_VERSION%%/octave/LP.h
 include/octave-%%OCTAVE_VERSION%%/octave/LPsolve.h
+include/octave-%%OCTAVE_VERSION%%/octave/LSODE-opts.h
 include/octave-%%OCTAVE_VERSION%%/octave/LSODE.h
 include/octave-%%OCTAVE_VERSION%%/octave/LinConst.h
 include/octave-%%OCTAVE_VERSION%%/octave/MArray-defs.h
@@ -53,19 +66,26 @@ 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
 include/octave-%%OCTAVE_VERSION%%/octave/NLEqn.h
 include/octave-%%OCTAVE_VERSION%%/octave/NLFunc.h
 include/octave-%%OCTAVE_VERSION%%/octave/NLP.h
 include/octave-%%OCTAVE_VERSION%%/octave/ODE.h
 include/octave-%%OCTAVE_VERSION%%/octave/ODEFunc.h
+include/octave-%%OCTAVE_VERSION%%/octave/ODES.h
+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-lu.cc
 include/octave-%%OCTAVE_VERSION%%/octave/base-lu.h
@@ -76,6 +96,8 @@ include/octave-%%OCTAVE_VERSION%%/octave/c-file-ptr-stream.h
 include/octave-%%OCTAVE_VERSION%%/octave/chMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/cmd-edit.h
 include/octave-%%OCTAVE_VERSION%%/octave/cmd-hist.h
+include/octave-%%OCTAVE_VERSION%%/octave/comment-list.h
+include/octave-%%OCTAVE_VERSION%%/octave/config.h
 include/octave-%%OCTAVE_VERSION%%/octave/dColVector.h
 include/octave-%%OCTAVE_VERSION%%/octave/dDiagMatrix.h
 include/octave-%%OCTAVE_VERSION%%/octave/dMatrix.h
@@ -98,8 +120,28 @@ include/octave-%%OCTAVE_VERSION%%/octave/dir-ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/dirfns.h
 include/octave-%%OCTAVE_VERSION%%/octave/dynamic-ld.h
 include/octave-%%OCTAVE_VERSION%%/octave/error.h
+include/octave-%%OCTAVE_VERSION%%/octave/f77-fcn.h
+include/octave-%%OCTAVE_VERSION%%/octave/file-io.h
+include/octave-%%OCTAVE_VERSION%%/octave/file-ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/file-stat.h
+include/octave-%%OCTAVE_VERSION%%/octave/fn-cache.h
+include/octave-%%OCTAVE_VERSION%%/octave/getopt.h
+include/octave-%%OCTAVE_VERSION%%/octave/glob-match.h
+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/lex.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-error.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-ieee.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-mappers.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-specfun.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-sstream.h
 include/octave-%%OCTAVE_VERSION%%/octave/lo-sysdep.h
+include/octave-%%OCTAVE_VERSION%%/octave/lo-utils.h
+include/octave-%%OCTAVE_VERSION%%/octave/load-save.h
+include/octave-%%OCTAVE_VERSION%%/octave/mach-info.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-base.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cdm-cm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cdm-cs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cdm-dm.h
@@ -112,11 +154,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/mx-cm-s.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cs-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cs-dm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-cs-m.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-defs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-cm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-cs.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-m.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-dm-s.h
+include/octave-%%OCTAVE_VERSION%%/octave/mx-ext.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-inlines.cc
 include/octave-%%OCTAVE_VERSION%%/octave/mx-m-cdm.h
 include/octave-%%OCTAVE_VERSION%%/octave/mx-m-cm.h
@@ -126,109 +170,61 @@ include/octave-%%OCTAVE_VERSION%%/octave/mx-op-defs.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
+include/octave-%%OCTAVE_VERSION%%/octave/oct-alloc.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-cmplx.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-conf.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-env.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-fftw.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-fstrm.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-getopt.h
+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-rl-edit.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-rl-hist.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-shlib.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-stdstrm.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-stream.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct-strstrm.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-syscalls.h
 include/octave-%%OCTAVE_VERSION%%/octave/oct-time.h
+include/octave-%%OCTAVE_VERSION%%/octave/oct.h
+include/octave-%%OCTAVE_VERSION%%/octave/octave.h
+include/octave-%%OCTAVE_VERSION%%/octave/ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-base-nd-array.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-scalar.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-base.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-bool-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-bool.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-builtin.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-cell.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-ch-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-colon.h
+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.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-file.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-list.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-mapper.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-usr-fcn.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-all.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-arg-list.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-assign.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-binop.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-cell.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-check.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-colon.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-decl.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-except.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-id.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-idx.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-indir.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-jump.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-loop.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-select.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-stmt.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt-unop.h
-include/octave-%%OCTAVE_VERSION%%/octave/pt.h
-include/octave-%%OCTAVE_VERSION%%/octave/siglist.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-cv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-s.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-rv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-s.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-cv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-rv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-ccv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-cs.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-crv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-cs.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-s-ccv.h
-include/octave-%%OCTAVE_VERSION%%/octave/vx-s-crv.h
-include/octave-%%OCTAVE_VERSION%%/f77-fcn.h
-include/octave-%%OCTAVE_VERSION%%/config.h
-include/octave-%%OCTAVE_VERSION%%/octave/file-io.h
-include/octave-%%OCTAVE_VERSION%%/octave/file-ops.h
-include/octave-%%OCTAVE_VERSION%%/octave/fn-cache.h
-include/octave-%%OCTAVE_VERSION%%/octave/getopt.h
-include/octave-%%OCTAVE_VERSION%%/octave/glob-match.h
-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/lex.h
-include/octave-%%OCTAVE_VERSION%%/lo-error.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-ieee.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-mappers.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-specfun.h
-include/octave-%%OCTAVE_VERSION%%/octave/lo-utils.h
-include/octave-%%OCTAVE_VERSION%%/octave/load-save.h
-include/octave-%%OCTAVE_VERSION%%/octave/mach-info.h
-include/octave-%%OCTAVE_VERSION%%/octave/mx-base.h
-include/octave-%%OCTAVE_VERSION%%/octave/mx-defs.h
-include/octave-%%OCTAVE_VERSION%%/octave/mx-ext.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-alloc.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-cmplx.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-conf.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-fstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-gperf.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-hist.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-iostrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-map.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-obj.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-prcstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-procbuf.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-stdstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-stream.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct-strstrm.h
-include/octave-%%OCTAVE_VERSION%%/octave/oct.h
-include/octave-%%OCTAVE_VERSION%%/octave/ops.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-base.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-ch-mat.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-colon.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-complex.h
-include/octave-%%OCTAVE_VERSION%%/octave/ov-cx-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-range.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-re-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-re-nd-array.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-scalar.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-str-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-struct.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-typeinfo.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-usr-fcn.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-va-args.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov.h
 include/octave-%%OCTAVE_VERSION%%/octave/pager.h
@@ -238,15 +234,34 @@ include/octave-%%OCTAVE_VERSION%%/octave/pathsearch.h
 include/octave-%%OCTAVE_VERSION%%/octave/pr-output.h
 include/octave-%%OCTAVE_VERSION%%/octave/procstream.h
 include/octave-%%OCTAVE_VERSION%%/octave/prog-args.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-all.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-arg-list.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-assign.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-binop.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-bp.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-cell.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-check.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-cmd.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-colon.h
 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-id.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-idx.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-jump.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-loop.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-mat.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-misc.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-plot.h
 include/octave-%%OCTAVE_VERSION%%/octave/pt-pr-code.h
+include/octave-%%OCTAVE_VERSION%%/octave/pt-select.h
+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/sighandlers.h
+include/octave-%%OCTAVE_VERSION%%/octave/siglist.h
 include/octave-%%OCTAVE_VERSION%%/octave/statdefs.h
 include/octave-%%OCTAVE_VERSION%%/octave/str-vec.h
 include/octave-%%OCTAVE_VERSION%%/octave/sun-utils.h
@@ -261,6 +276,18 @@ include/octave-%%OCTAVE_VERSION%%/octave/unwind-prot.h
 include/octave-%%OCTAVE_VERSION%%/octave/utils.h
 include/octave-%%OCTAVE_VERSION%%/octave/variables.h
 include/octave-%%OCTAVE_VERSION%%/octave/version.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-cv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-ccv-s.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-rv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-crv-s.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-cv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cs-rv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-ccv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-cv-cs.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-crv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-rv-cs.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-s-ccv.h
+include/octave-%%OCTAVE_VERSION%%/octave/vx-s-crv.h
 include/octave-%%OCTAVE_VERSION%%/octave/xdiv.h
 include/octave-%%OCTAVE_VERSION%%/octave/xpow.h
 @exec /bin/ln -sf %D/include/octave-%%OCTAVE_VERSION%%/octave %D/include/octave
@@ -268,25 +295,7 @@ include/octave-%%OCTAVE_VERSION%%/octave/xpow.h
 @unexec install-info --delete --entry='* Octave: (octave).    Interactive language for numerical computations.' %D/info/octave.info %D/info/dir
 @unexec install-info --delete --entry='* LibOctave: (liboctave).      C++ class library for Octave.' %D/info/liboctave.info %D/info/dir
 info/octave.info
-info/octave.info-1
-info/octave.info-2
-info/octave.info-3
-info/octave.info-4
-info/octave.info-5
-info/octave.info-6
-info/octave.info-7
-info/octave.info-8
-info/octave.info-9
-info/octave.info-10
-info/octave.info-11
-info/octave.info-12
-info/octave.info-13
-info/octave.info-14
-info/octave.info-15
 info/liboctave.info
-info/liboctave.info-1
-info/liboctave.info-2
-info/liboctave.info-3
 @exec install-info --entry='* Octave: (octave).    Interactive language for numerical computations.' %D/info/octave.info %D/info/dir
 @exec install-info --entry='* LibOctave: (liboctave).      C++ class library for Octave.' %D/info/liboctave.info %D/info/dir
 lib/octave-%%OCTAVE_VERSION%%/libcruft.a
@@ -320,6 +329,7 @@ share/octave/%%OCTAVE_VERSION%%/m/control/base/damp.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dare.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dcgain.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dgram.m
+share/octave/%%OCTAVE_VERSION%%/m/control/base/dkalman.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dlqe.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dlqr.m
 share/octave/%%OCTAVE_VERSION%%/m/control/base/dlyap.m
@@ -453,6 +463,17 @@ share/octave/%%OCTAVE_VERSION%%/m/control/util/zgrownorm.m
 share/octave/%%OCTAVE_VERSION%%/m/control/util/zgscal.m
 share/octave/%%OCTAVE_VERSION%%/m/control/util/zgsgiv.m
 share/octave/%%OCTAVE_VERSION%%/m/control/util/zgshsr.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_bool.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_complex.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_global.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_list.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_matrix.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_scalar.m
+share/octave/%%OCTAVE_VERSION%%/m/deprecated/is_square.m
+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/elfun/acot.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acoth.m
 share/octave/%%OCTAVE_VERSION%%/m/elfun/acsc.m
@@ -477,6 +498,8 @@ share/octave/%%OCTAVE_VERSION%%/m/finance/pv.m
 share/octave/%%OCTAVE_VERSION%%/m/finance/pvl.m
 share/octave/%%OCTAVE_VERSION%%/m/finance/rate.m
 share/octave/%%OCTAVE_VERSION%%/m/finance/vol.m
+share/octave/%%OCTAVE_VERSION%%/m/general/cart2pol.m
+share/octave/%%OCTAVE_VERSION%%/m/general/cart2sph.m
 share/octave/%%OCTAVE_VERSION%%/m/general/columns.m
 share/octave/%%OCTAVE_VERSION%%/m/general/common_size.m
 share/octave/%%OCTAVE_VERSION%%/m/general/diff.m
@@ -484,30 +507,35 @@ share/octave/%%OCTAVE_VERSION%%/m/general/fliplr.m
 share/octave/%%OCTAVE_VERSION%%/m/general/flipud.m
 share/octave/%%OCTAVE_VERSION%%/m/general/int2str.m
 share/octave/%%OCTAVE_VERSION%%/m/general/is_duplicate_entry.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_scalar.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_square.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_symmetric.m
-share/octave/%%OCTAVE_VERSION%%/m/general/is_vector.m
+share/octave/%%OCTAVE_VERSION%%/m/general/isscalar.m
+share/octave/%%OCTAVE_VERSION%%/m/general/issquare.m
+share/octave/%%OCTAVE_VERSION%%/m/general/issymmetric.m
+share/octave/%%OCTAVE_VERSION%%/m/general/isvector.m
 share/octave/%%OCTAVE_VERSION%%/m/general/logical.m
 share/octave/%%OCTAVE_VERSION%%/m/general/logspace.m
+share/octave/%%OCTAVE_VERSION%%/m/general/mod.m
 share/octave/%%OCTAVE_VERSION%%/m/general/nargchk.m
 share/octave/%%OCTAVE_VERSION%%/m/general/nextpow2.m
 share/octave/%%OCTAVE_VERSION%%/m/general/num2str.m
 share/octave/%%OCTAVE_VERSION%%/m/general/perror.m
+share/octave/%%OCTAVE_VERSION%%/m/general/pol2cart.m
 share/octave/%%OCTAVE_VERSION%%/m/general/postpad.m
 share/octave/%%OCTAVE_VERSION%%/m/general/prepad.m
 share/octave/%%OCTAVE_VERSION%%/m/general/randperm.m
 share/octave/%%OCTAVE_VERSION%%/m/general/rem.m
+share/octave/%%OCTAVE_VERSION%%/m/general/repmat.m
 share/octave/%%OCTAVE_VERSION%%/m/general/reshape.m
 share/octave/%%OCTAVE_VERSION%%/m/general/rot90.m
 share/octave/%%OCTAVE_VERSION%%/m/general/rows.m
 share/octave/%%OCTAVE_VERSION%%/m/general/shift.m
+share/octave/%%OCTAVE_VERSION%%/m/general/sph2cart.m
 share/octave/%%OCTAVE_VERSION%%/m/general/strerror.m
 share/octave/%%OCTAVE_VERSION%%/m/general/tril.m
 share/octave/%%OCTAVE_VERSION%%/m/general/triu.m
 share/octave/%%OCTAVE_VERSION%%/m/image/colormap.m
 share/octave/%%OCTAVE_VERSION%%/m/image/gray.m
 share/octave/%%OCTAVE_VERSION%%/m/image/gray2ind.m
+share/octave/%%OCTAVE_VERSION%%/m/image/hsv2rgb.m
 share/octave/%%OCTAVE_VERSION%%/m/image/image.m
 share/octave/%%OCTAVE_VERSION%%/m/image/imagesc.m
 share/octave/%%OCTAVE_VERSION%%/m/image/imshow.m
@@ -516,6 +544,7 @@ share/octave/%%OCTAVE_VERSION%%/m/image/ind2rgb.m
 share/octave/%%OCTAVE_VERSION%%/m/image/loadimage.m
 share/octave/%%OCTAVE_VERSION%%/m/image/ntsc2rgb.m
 share/octave/%%OCTAVE_VERSION%%/m/image/ocean.m
+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
@@ -528,7 +557,6 @@ share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/dmult.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/dot.m
 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/kron.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/norm.m
@@ -560,6 +588,8 @@ 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/__axis_label__.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/__errcomm__.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/__errplot__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__plr1__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__plr2__.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/__plr__.m
@@ -577,10 +607,12 @@ 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/contour.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/errorbar.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/figure.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/grid.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/hist.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/loglog.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/loglogerr.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/mesh.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/meshdom.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/meshgrid.m
@@ -591,7 +623,9 @@ share/octave/%%OCTAVE_VERSION%%/m/plot/plot.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/plot_border.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/polar.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/semilogx.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/semilogxerr.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/semilogy.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/semilogyerr.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/shg.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/sombrero.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/stairs.m
@@ -648,6 +682,7 @@ share/octave/%%OCTAVE_VERSION%%/m/signal/fftfilt.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/fftshift.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/fractdiff.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/freqz.m
+share/octave/%%OCTAVE_VERSION%%/m/signal/freqz_plot.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/hamming.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/hanning.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/hurst.m
@@ -664,6 +699,7 @@ share/octave/%%OCTAVE_VERSION%%/m/signal/stft.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/synthesis.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/triangle_lw.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/triangle_sw.m
+share/octave/%%OCTAVE_VERSION%%/m/signal/unwrap.m
 share/octave/%%OCTAVE_VERSION%%/m/signal/yulewalker.m
 share/octave/%%OCTAVE_VERSION%%/m/specfun/bessel.m
 share/octave/%%OCTAVE_VERSION%%/m/specfun/beta.m
@@ -752,10 +788,10 @@ share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/geometric_pdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/geometric_rnd.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_cdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_inv.m
-share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_cdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_pdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/hypergeometric_rnd.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/kolmogorov_smirnov_cdf.m
+share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_cdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_inv.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_pdf.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions/laplace_rnd.m
@@ -824,10 +860,12 @@ share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/welch_test.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/wilcoxon_test.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/z_test.m
 share/octave/%%OCTAVE_VERSION%%/m/statistics/tests/z_test_2.m
+share/octave/%%OCTAVE_VERSION%%/m/strings/base2dec.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/bin2dec.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/blanks.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/com2str.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/deblank.m
+share/octave/%%OCTAVE_VERSION%%/m/strings/dec2base.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/dec2bin.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/dec2hex.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/findstr.m
@@ -841,6 +879,7 @@ share/octave/%%OCTAVE_VERSION%%/m/strings/str2mat.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/str2num.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/strcat.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/strcmp.m
+share/octave/%%OCTAVE_VERSION%%/m/strings/strjust.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/strrep.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/substr.m
 share/octave/%%OCTAVE_VERSION%%/m/strings/upper.m
@@ -848,12 +887,6 @@ share/octave/%%OCTAVE_VERSION%%/m/time/asctime.m
 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/doc/Octave-FAQ.ps
-share/octave/doc/liboctave.ps
-share/octave/doc/octave.ps
-share/octave/doc/refcard-a4.ps
-share/octave/doc/refcard-legal.ps
-share/octave/doc/refcard-letter.ps
 share/octave/ls-R
 share/octave/site/m/startup/octaverc
 @dirrm include/octave-%%OCTAVE_VERSION%%/octave
@@ -881,6 +914,7 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/control/system
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/control/util
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/control
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/deprecated
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/elfun
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/finance
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/general
@@ -910,5 +944,11 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/site/m/startup
 @dirrm share/octave/site/m
 @dirrm share/octave/site
-@dirrm share/octave/doc
 @dirrm share/octave
+%%PORTDOCS%%%%DOCSDIR%%/Octave-FAQ.ps
+%%PORTDOCS%%%%DOCSDIR%%/liboctave.ps
+%%PORTDOCS%%%%DOCSDIR%%/octave.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard-a4.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard-legal.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard-letter.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%