[1]:

  - Update to 2.1.71
  - Use ${INFO}

Moreover:
  - Polish the Makefile

PR:		ports/81482 [1]
Submitted by:	Johan van Selst <johans@stack.nl> [1]

9 files changed, 90 insertions, 138 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 9f8ab015b360..1035777d5287 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	octave
-PORTVERSION=	2.1.63
+PORTVERSION=	2.1.71
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/bleeding-edge/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
@@ -21,62 +21,48 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD 4.x"
-.else
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
+INFO=		octave liboctave
+MAN1=		octave.1 octave-bug.1 mkoctfile.1 octave-config.1
 
-.if ${PORTOBJFORMAT} == "elf"
-GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
-.else
-GNU_HOST=	${ARCH}-portbld-freebsdaout${OSREL}
-.endif
 OCTAVE_VERSION=	${PORTVERSION}
+GNU_HOST=	${ARCH}-portbld-freebsd${OSREL}
 PLIST_SUB=	OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST}
 
-BLAS_LIBS=	"-L${LOCALBASE}/lib -lf77blas -lcblas -latlas"
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-CONIGURE_ARGS=	--host=${GNU_HOST} --with-fftw --with-blas=${BLAS_LIBS} \
-		--with-lapack=-lalapack --enable-shared
+F77?=		f77
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		F77="${F77}" \
 		FFLAGS="${FFLAGS}"
+CONFIGURE_ARGS=	--host=${GNU_HOST} \
+		--with-blas="-L${LOCALBASE}/lib -lf77blas -lcblas -latlas" \
+		--with-lapack=-lalapack \
+		--enable-shared
+
+SUB_FILES=	octave
+SUB_LIST=	OCTAVE_VERSION="${OCTAVE_VERSION}"
+
+.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 400004
-CONFIGURE_ARGS+=	--with-f2c
+.if ${OSVERSION} < 500000
+BROKEN=		"Does not compile on FreeBSD 4.x"
 .endif
 
 .if ${OSVERSION} < 500000
 CONFIGURE_ARGS+=	--disable-readline
 .endif
 
-MAN1=		octave.1 octave-bug.1 mkoctfile.1 octave-config.1
-
-post-extract:
-	@${RM} -f ${WRKSRC}/doc/interpreter/octave.info*
-	@${RM} -f ${WRKSRC}/doc/liboctave/liboctave.info*
 post-install:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g ; \
-		    s,%%OCTAVE_VERSION%%,${OCTAVE_VERSION},g' \
-		${FILESDIR}/octave > ${WRKDIR}/octave
-	${RM} ${PREFIX}/bin/octave
 	${INSTALL_SCRIPT} ${WRKDIR}/octave ${PREFIX}/bin
 	${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
-.ifndef NOPORTDOCS
+.if !defined(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}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 2fc19eaf319d..6e4cad02efa8 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,2 +1,2 @@
-MD5 (octave-2.1.63.tar.bz2) = 3f6322b30edb79ee26659dbebefdfcfc
-SIZE (octave-2.1.63.tar.bz2) = 4339124
+MD5 (octave-2.1.71.tar.bz2) = 2ab06912017c833549035111f0ab592f
+SIZE (octave-2.1.71.tar.bz2) = 5784751
diff --git a/math/octave/files/octave b/math/octave/files/octave.in
index 5910ee467fee..a954e720d141 100644
--- a/math/octave/files/octave
+++ b/math/octave/files/octave.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/math/octave/files/Attic/octave.in,v 1.1 2005-05-26 17:32:40 jylefort Exp $
 
 OCTAVE_EXEC=%%PREFIX%%/bin/octave-%%OCTAVE_VERSION%%
 LD_LIBRARY_PATH=%%PREFIX%%/lib/octave-%%OCTAVE_VERSION%%; export LD_LIBRARY_PATH
diff --git a/math/octave/files/patch-aa b/math/octave/files/patch-aa
index e1e8e37f36a1..2e4bfbb01073 100644
--- a/math/octave/files/patch-aa
+++ b/math/octave/files/patch-aa
@@ -1,11 +1,11 @@
---- doc/liboctave/Makefile.in.orig	Wed Oct 30 10:04:00 2002
-+++ doc/liboctave/Makefile.in	Tue Jun 10 01:25:22 2003
+--- doc/liboctave/Makefile.in.orig	Wed May 25 22:19:58 2005
++++ doc/liboctave/Makefile.in	Wed May 25 22:52:46 2005
 @@ -43,7 +43,7 @@
  .PHONY: all
  
  liboctave.info: $(TEXINFO) ../conf.texi
--	-makeinfo -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
-+	-makeinfo --force --no-split -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
+-	-$(MAKEINFO) -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
index 476c0a918e5d..f5e55d53ac7f 100644
--- a/math/octave/files/patch-doc:interpreter:Makefile.in
+++ b/math/octave/files/patch-doc:interpreter:Makefile.in
@@ -1,11 +1,11 @@
---- 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 @@
+--- doc/interpreter/Makefile.in.orig	Wed May 25 22:21:11 2005
++++ doc/interpreter/Makefile.in	Wed May 25 22:21:04 2005
+@@ -89,7 +89,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)/.. $<
+-	-$(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/files/patch-glob.h b/math/octave/files/patch-glob.h
deleted file mode 100644
index a5946bc37fc7..000000000000
--- a/math/octave/files/patch-glob.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- glob/glob.h.orig	Sun Nov 10 15:32:00 2002
-+++ glob/glob.h	Sun Nov 10 15:32:49 2002
-@@ -48,7 +48,11 @@
- /* We need `size_t' for the following definitions.  */
- #ifndef __size_t
- # if defined __GNUC__ && __GNUC__ >= 2
-+#if (__FreeBSD__ <= 4)
- typedef __SIZE_TYPE__ __size_t;
-+#else
-+#include <sys/types.h>
-+#endif
- # else
- /* This is a guess.  */
- /*hb
diff --git a/math/octave/files/patch-glob::Makefile.in b/math/octave/files/patch-glob::Makefile.in
deleted file mode 100644
index 8a80c4b52029..000000000000
--- a/math/octave/files/patch-glob::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glob/Makefile.in.orig	Wed Feb  9 14:43:01 2005
-+++ glob/Makefile.in	Wed Feb  9 14:43:13 2005
-@@ -25,7 +25,7 @@
- 
- CC = @CC@
- CPPFLAGS = @CPPFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- 
- # Information determined by configure.
- DEFS = @DEFS@
diff --git a/math/octave/files/patch-mkoctfile.in b/math/octave/files/patch-mkoctfile.in
index 0eb4c4c552b4..23a1315142df 100644
--- a/math/octave/files/patch-mkoctfile.in
+++ b/math/octave/files/patch-mkoctfile.in
@@ -1,11 +1,11 @@
---- mkoctfile.in.orig	Thu Jan  2 22:55:47 2003
-+++ mkoctfile.in	Wed Oct 22 10:04:01 2003
-@@ -182,7 +182,7 @@
+--- mkoctfile.in.orig	Sun Mar 27 14:13:29 2005
++++ mkoctfile.in	Wed May 25 23:00:43 2005
+@@ -184,7 +184,7 @@
      -D*)
        defs="$defs $1"
      ;;
--    -[lL]*)
-+    -[lL]* | -pthread)
+-    -[lLR]*)
++    -[lLR]* | -pthread)
        ldflags="$ldflags $1"
      ;;
      -M | --depend)
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 819b35b772c4..e63135c13941 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -70,8 +70,6 @@ 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/QP.h
 include/octave-%%OCTAVE_VERSION%%/octave/Quad-opts.h
@@ -440,7 +438,9 @@ include/octave-%%OCTAVE_VERSION%%/octave/ops.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-int.cc
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-int.h
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-mat.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-base-mat.cc
 include/octave-%%OCTAVE_VERSION%%/octave/ov-base-scalar.h
+include/octave-%%OCTAVE_VERSION%%/octave/ov-base-scalar.cc
 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
@@ -549,13 +549,6 @@ 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
-
-@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/liboctave.info
-@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
 lib/octave-%%OCTAVE_VERSION%%/libcruft.so
 lib/octave-%%OCTAVE_VERSION%%/libcruft.so.%%OCTAVE_VERSION%%
@@ -565,8 +558,8 @@ lib/octave-%%OCTAVE_VERSION%%/liboctave.so.%%OCTAVE_VERSION%%
 lib/octave-%%OCTAVE_VERSION%%/liboctinterp.a
 lib/octave-%%OCTAVE_VERSION%%/liboctinterp.so
 lib/octave-%%OCTAVE_VERSION%%/liboctinterp.so.%%OCTAVE_VERSION%%
-@unexec /bin/rm -f %D/lib/octave
-@exec /bin/ln -sf octave-%%OCTAVE_VERSION%% %D/lib/octave
+@unexec rm -f %D/lib/octave
+@exec ln -sf octave-%%OCTAVE_VERSION%% %D/lib/octave
 libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/info-emacs-info
 libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/info-emacs-octave-help
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/airy.oct
@@ -626,8 +619,6 @@ libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/max.oct
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/min.oct
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/minmax.oct
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/mktime.oct
-libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/odessa.oct
-libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/odessa_options.oct
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/pinv.oct
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/qr.oct
 libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/quad.oct
@@ -652,7 +643,7 @@ libexec/octave/ls-R
 %%PORTDOCS%%%%DOCSDIR%%/refcard-a4.ps
 %%PORTDOCS%%%%DOCSDIR%%/refcard-legal.ps
 %%PORTDOCS%%%%DOCSDIR%%/refcard-letter.ps
-share/octave/%%OCTAVE_VERSION%%/imagelib/default.img
+share/octave/site/m/startup/octaverc
 share/octave/%%OCTAVE_VERSION%%/m/audio/lin2mu.m
 share/octave/%%OCTAVE_VERSION%%/m/audio/loadaudio.m
 share/octave/%%OCTAVE_VERSION%%/m/audio/mu2lin.m
@@ -877,8 +868,8 @@ 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/logspace.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
@@ -934,7 +925,6 @@ share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/rank.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/trace.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/vec.m
 share/octave/%%OCTAVE_VERSION%%/m/linear-algebra/vech.m
-share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/PKG_ADD
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/bincoeff.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/bug_report.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/comma.m
@@ -966,7 +956,7 @@ share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/toc.m
 share/octave/%%OCTAVE_VERSION%%/m/miscellaneous/unix.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/miscellaneous/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
@@ -1017,6 +1007,7 @@ share/octave/%%OCTAVE_VERSION%%/m/plot/top_title.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/xlabel.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/ylabel.m
 share/octave/%%OCTAVE_VERSION%%/m/plot/zlabel.m
+share/octave/%%OCTAVE_VERSION%%/m/plot/PKG_ADD
 share/octave/%%OCTAVE_VERSION%%/m/polynomial/compan.m
 share/octave/%%OCTAVE_VERSION%%/m/polynomial/conv.m
 share/octave/%%OCTAVE_VERSION%%/m/polynomial/deconv.m
@@ -1169,10 +1160,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
@@ -1267,67 +1258,67 @@ 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/%%OCTAVE_VERSION%%/imagelib/default.img
 share/octave/ls-R
-share/octave/site/m/startup/octaverc
-@dirrm share/octave/site/api-v12/m
-@dirrm share/octave/site/api-v12
 @dirrm share/octave/site/m/startup
 @dirrm share/octave/site/m
+@dirrm share/octave/site/api-v13/m
+@dirrm share/octave/site/api-v13
 @dirrm share/octave/site
-@dirrm share/octave/%%OCTAVE_VERSION%%/site/m
-@dirrm share/octave/%%OCTAVE_VERSION%%/site
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/audio
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/base
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/hinf
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/obsolete
+@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
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/time
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/strings
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/tests
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/models
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/image
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/io
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/linear-algebra
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/miscellaneous
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/plot
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/polynomial
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/quaternion
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/set
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/signal
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/specfun
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/special-matrix
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/startup
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/base
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/distributions
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/models
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics/tests
 @dirrm share/octave/%%OCTAVE_VERSION%%/m/statistics
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/startup
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/special-matrix
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/specfun
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/signal
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/set
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/quaternion
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/polynomial
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/plot
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/miscellaneous
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/linear-algebra
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/io
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/image
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/finance
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/elfun
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/util
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/system
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/obsolete
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/hinf
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/base
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/control
-@dirrm share/octave/%%OCTAVE_VERSION%%/m/audio
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/strings
+@dirrm share/octave/%%OCTAVE_VERSION%%/m/time
 @dirrm share/octave/%%OCTAVE_VERSION%%/m
+@dirrm share/octave/%%OCTAVE_VERSION%%/site/m
+@dirrm share/octave/%%OCTAVE_VERSION%%/site
 @dirrm share/octave/%%OCTAVE_VERSION%%/imagelib
 @dirrm share/octave/%%OCTAVE_VERSION%%
 @dirrm share/octave
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/octave/site/oct/api-v12/%%GNU_HOST%%
-@dirrm libexec/octave/site/oct/api-v12
-@dirrm libexec/octave/site/oct/%%GNU_HOST%%
-@dirrm libexec/octave/site/oct
-@dirrm libexec/octave/site/exec/%%GNU_HOST%%
-@dirrm libexec/octave/site/exec
-@dirrm libexec/octave/site
+@dirrm libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%
+@dirrm libexec/octave/%%OCTAVE_VERSION%%/oct
+@dirrm libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%
+@dirrm libexec/octave/%%OCTAVE_VERSION%%/exec
 @dirrm libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
 @dirrm libexec/octave/%%OCTAVE_VERSION%%/site/exec
 @dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%
 @dirrm libexec/octave/%%OCTAVE_VERSION%%/site/oct
 @dirrm libexec/octave/%%OCTAVE_VERSION%%/site
-@dirrm libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%
-@dirrm libexec/octave/%%OCTAVE_VERSION%%/oct
-@dirrm libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%
-@dirrm libexec/octave/%%OCTAVE_VERSION%%/exec
 @dirrm libexec/octave/%%OCTAVE_VERSION%%
+@dirrm libexec/octave/site/exec/%%GNU_HOST%%
+@dirrm libexec/octave/site/exec
+@dirrm libexec/octave/site/oct/api-v13/%%GNU_HOST%%
+@dirrm libexec/octave/site/oct/api-v13
+@dirrm libexec/octave/site/oct/%%GNU_HOST%%
+@dirrm libexec/octave/site/oct
+@dirrm libexec/octave/site
 @dirrm libexec/octave
 @dirrm lib/octave-%%OCTAVE_VERSION%%
 @dirrm include/octave-%%OCTAVE_VERSION%%/octave