Changes 2.1.73:

* Bug fixes

4 files changed, 112 insertions, 114 deletions

diff --git a/math/octave/Makefile b/math/octave/Makefile
index 59ba87b4233..6bf3b2f302b 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2006/03/20 18:15:38 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2006/04/06 09:10:28 adam Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
-PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/octave/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/ \
@@ -17,7 +16,7 @@ BUILD_DEPENDS+=	bison>=1.875:../../devel/bison
 BUILD_DEPENDS+=	gperf>=2.7:../../devel/gperf
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-OCTAVE_VER=	2.1.72
+OCTAVE_VER=	2.1.73
 CONFLICTS+=	octave-current-*
 
 .if (${MACHINE_ARCH} == "arm32")
@@ -80,9 +79,9 @@ post-install:
 .for f in ${OCTAVE_DOC}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/octave/${OCTAVE_VER}/doc
 .endfor
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/octave
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/octave
 .for f in ${OCTAVE_HTML}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/html/octave
+	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/octave
 .endfor
 
 .include "../../audio/libsndfile/buildlink3.mk"
diff --git a/math/octave/PLIST b/math/octave/PLIST
index c0faf168dc1..d40ce9841fc 100644
--- a/math/octave/PLIST
+++ b/math/octave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/03/20 18:15:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/04/06 09:10:28 adam Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -636,107 +636,106 @@ man/man1/mkoctfile.1
 man/man1/octave-bug.1
 man/man1/octave-config.1
 man/man1/octave.1
-share/doc/html/octave/Octave-FAQ_1.html
-share/doc/html/octave/Octave-FAQ_10.html
-share/doc/html/octave/Octave-FAQ_11.html
-share/doc/html/octave/Octave-FAQ_12.html
-share/doc/html/octave/Octave-FAQ_13.html
-share/doc/html/octave/Octave-FAQ_2.html
-share/doc/html/octave/Octave-FAQ_3.html
-share/doc/html/octave/Octave-FAQ_4.html
-share/doc/html/octave/Octave-FAQ_5.html
-share/doc/html/octave/Octave-FAQ_6.html
-share/doc/html/octave/Octave-FAQ_7.html
-share/doc/html/octave/Octave-FAQ_8.html
-share/doc/html/octave/Octave-FAQ_9.html
-share/doc/html/octave/Octave-FAQ_abt.html
-share/doc/html/octave/Octave-FAQ_fot.html
-share/doc/html/octave/Octave-FAQ_ovr.html
-share/doc/html/octave/Octave-FAQ_toc.html
-share/doc/html/octave/liboctave_1.html
-share/doc/html/octave/liboctave_10.html
-share/doc/html/octave/liboctave_11.html
-share/doc/html/octave/liboctave_12.html
-share/doc/html/octave/liboctave_13.html
-share/doc/html/octave/liboctave_14.html
-share/doc/html/octave/liboctave_15.html
-share/doc/html/octave/liboctave_16.html
-share/doc/html/octave/liboctave_17.html
-share/doc/html/octave/liboctave_18.html
-share/doc/html/octave/liboctave_19.html
-share/doc/html/octave/liboctave_2.html
-share/doc/html/octave/liboctave_20.html
-share/doc/html/octave/liboctave_21.html
-share/doc/html/octave/liboctave_22.html
-share/doc/html/octave/liboctave_23.html
-share/doc/html/octave/liboctave_3.html
-share/doc/html/octave/liboctave_4.html
-share/doc/html/octave/liboctave_5.html
-share/doc/html/octave/liboctave_6.html
-share/doc/html/octave/liboctave_7.html
-share/doc/html/octave/liboctave_8.html
-share/doc/html/octave/liboctave_9.html
-share/doc/html/octave/liboctave_abt.html
-share/doc/html/octave/liboctave_ovr.html
-share/doc/html/octave/liboctave_toc.html
-share/doc/html/octave/octave_1.html
-share/doc/html/octave/octave_10.html
-share/doc/html/octave/octave_11.html
-share/doc/html/octave/octave_12.html
-share/doc/html/octave/octave_13.html
-share/doc/html/octave/octave_14.html
-share/doc/html/octave/octave_15.html
-share/doc/html/octave/octave_16.html
-share/doc/html/octave/octave_17.html
-share/doc/html/octave/octave_18.html
-share/doc/html/octave/octave_19.html
-share/doc/html/octave/octave_2.html
-share/doc/html/octave/octave_20.html
-share/doc/html/octave/octave_21.html
-share/doc/html/octave/octave_22.html
-share/doc/html/octave/octave_23.html
-share/doc/html/octave/octave_24.html
-share/doc/html/octave/octave_25.html
-share/doc/html/octave/octave_26.html
-share/doc/html/octave/octave_27.html
-share/doc/html/octave/octave_28.html
-share/doc/html/octave/octave_29.html
-share/doc/html/octave/octave_3.html
-share/doc/html/octave/octave_30.html
-share/doc/html/octave/octave_31.html
-share/doc/html/octave/octave_32.html
-share/doc/html/octave/octave_33.html
-share/doc/html/octave/octave_34.html
-share/doc/html/octave/octave_35.html
-share/doc/html/octave/octave_36.html
-share/doc/html/octave/octave_37.html
-share/doc/html/octave/octave_38.html
-share/doc/html/octave/octave_39.html
-share/doc/html/octave/octave_4.html
-share/doc/html/octave/octave_40.html
-share/doc/html/octave/octave_41.html
-share/doc/html/octave/octave_42.html
-share/doc/html/octave/octave_43.html
-share/doc/html/octave/octave_44.html
-share/doc/html/octave/octave_45.html
-share/doc/html/octave/octave_46.html
-share/doc/html/octave/octave_47.html
-share/doc/html/octave/octave_48.html
-share/doc/html/octave/octave_49.html
-share/doc/html/octave/octave_5.html
-share/doc/html/octave/octave_50.html
-share/doc/html/octave/octave_51.html
-share/doc/html/octave/octave_52.html
-share/doc/html/octave/octave_53.html
-share/doc/html/octave/octave_54.html
-share/doc/html/octave/octave_6.html
-share/doc/html/octave/octave_7.html
-share/doc/html/octave/octave_8.html
-share/doc/html/octave/octave_9.html
-share/doc/html/octave/octave_abt.html
-share/doc/html/octave/octave_fot.html
-share/doc/html/octave/octave_ovr.html
-share/doc/html/octave/octave_toc.html
+share/doc/octave/Octave-FAQ_1.html
+share/doc/octave/Octave-FAQ_10.html
+share/doc/octave/Octave-FAQ_11.html
+share/doc/octave/Octave-FAQ_12.html
+share/doc/octave/Octave-FAQ_2.html
+share/doc/octave/Octave-FAQ_3.html
+share/doc/octave/Octave-FAQ_4.html
+share/doc/octave/Octave-FAQ_5.html
+share/doc/octave/Octave-FAQ_6.html
+share/doc/octave/Octave-FAQ_7.html
+share/doc/octave/Octave-FAQ_8.html
+share/doc/octave/Octave-FAQ_9.html
+share/doc/octave/Octave-FAQ_abt.html
+share/doc/octave/Octave-FAQ_fot.html
+share/doc/octave/Octave-FAQ_ovr.html
+share/doc/octave/Octave-FAQ_toc.html
+share/doc/octave/liboctave_1.html
+share/doc/octave/liboctave_10.html
+share/doc/octave/liboctave_11.html
+share/doc/octave/liboctave_12.html
+share/doc/octave/liboctave_13.html
+share/doc/octave/liboctave_14.html
+share/doc/octave/liboctave_15.html
+share/doc/octave/liboctave_16.html
+share/doc/octave/liboctave_17.html
+share/doc/octave/liboctave_18.html
+share/doc/octave/liboctave_19.html
+share/doc/octave/liboctave_2.html
+share/doc/octave/liboctave_20.html
+share/doc/octave/liboctave_21.html
+share/doc/octave/liboctave_22.html
+share/doc/octave/liboctave_23.html
+share/doc/octave/liboctave_3.html
+share/doc/octave/liboctave_4.html
+share/doc/octave/liboctave_5.html
+share/doc/octave/liboctave_6.html
+share/doc/octave/liboctave_7.html
+share/doc/octave/liboctave_8.html
+share/doc/octave/liboctave_9.html
+share/doc/octave/liboctave_abt.html
+share/doc/octave/liboctave_ovr.html
+share/doc/octave/liboctave_toc.html
+share/doc/octave/octave_1.html
+share/doc/octave/octave_10.html
+share/doc/octave/octave_11.html
+share/doc/octave/octave_12.html
+share/doc/octave/octave_13.html
+share/doc/octave/octave_14.html
+share/doc/octave/octave_15.html
+share/doc/octave/octave_16.html
+share/doc/octave/octave_17.html
+share/doc/octave/octave_18.html
+share/doc/octave/octave_19.html
+share/doc/octave/octave_2.html
+share/doc/octave/octave_20.html
+share/doc/octave/octave_21.html
+share/doc/octave/octave_22.html
+share/doc/octave/octave_23.html
+share/doc/octave/octave_24.html
+share/doc/octave/octave_25.html
+share/doc/octave/octave_26.html
+share/doc/octave/octave_27.html
+share/doc/octave/octave_28.html
+share/doc/octave/octave_29.html
+share/doc/octave/octave_3.html
+share/doc/octave/octave_30.html
+share/doc/octave/octave_31.html
+share/doc/octave/octave_32.html
+share/doc/octave/octave_33.html
+share/doc/octave/octave_34.html
+share/doc/octave/octave_35.html
+share/doc/octave/octave_36.html
+share/doc/octave/octave_37.html
+share/doc/octave/octave_38.html
+share/doc/octave/octave_39.html
+share/doc/octave/octave_4.html
+share/doc/octave/octave_40.html
+share/doc/octave/octave_41.html
+share/doc/octave/octave_42.html
+share/doc/octave/octave_43.html
+share/doc/octave/octave_44.html
+share/doc/octave/octave_45.html
+share/doc/octave/octave_46.html
+share/doc/octave/octave_47.html
+share/doc/octave/octave_48.html
+share/doc/octave/octave_49.html
+share/doc/octave/octave_5.html
+share/doc/octave/octave_50.html
+share/doc/octave/octave_51.html
+share/doc/octave/octave_52.html
+share/doc/octave/octave_53.html
+share/doc/octave/octave_54.html
+share/doc/octave/octave_6.html
+share/doc/octave/octave_7.html
+share/doc/octave/octave_8.html
+share/doc/octave/octave_9.html
+share/doc/octave/octave_abt.html
+share/doc/octave/octave_fot.html
+share/doc/octave/octave_ovr.html
+share/doc/octave/octave_toc.html
 share/octave/${PKGVERSION}/doc/Octave-FAQ.ps
 share/octave/${PKGVERSION}/doc/liboctave.ps
 share/octave/${PKGVERSION}/doc/octave.ps
@@ -1401,7 +1400,7 @@ share/octave/site/m/startup/octaverc
 @dirrm share/octave/${PKGVERSION}/imagelib
 @dirrm share/octave/${PKGVERSION}/doc
 @dirrm share/octave/${PKGVERSION}
-@dirrm share/doc/html/octave
+@dirrm share/doc/octave
 @dirrm libexec/octave/site/oct/api-v13/${GNU_PLATFORM_DIR}
 @dirrm libexec/octave/site/oct/api-v13
 @dirrm libexec/octave/site/oct/${GNU_PLATFORM_DIR}
diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk
index 835b3363186..19f431445cd 100644
--- a/math/octave/buildlink3.mk
+++ b/math/octave/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/06 06:22:21 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 09:10:28 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OCTAVE_BUILDLINK3_MK:=	${OCTAVE_BUILDLINK3_MK}+
@@ -29,4 +29,4 @@ BUILDLINK_PKGSRCDIR.octave?=	../../math/octave
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 1ee1be43670..b39a1e820e9 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/11/29 13:11:05 adam Exp $
+$NetBSD: distinfo,v 1.13 2006/04/06 09:10:28 adam Exp $
 
-SHA1 (octave-2.1.72.tar.bz2) = a696c65667a4a99d55279103065d1d0af5a5fb09
-RMD160 (octave-2.1.72.tar.bz2) = b9a1056a98a524591b0f497f3c11ccc436a18eec
-Size (octave-2.1.72.tar.bz2) = 5808544 bytes
+SHA1 (octave-2.1.73.tar.bz2) = 58221aa15fcefd66b03531ac0ae9b1d2356e7555
+RMD160 (octave-2.1.73.tar.bz2) = d34c6ecd8f84c728ad7687d9568b9d69ade6f5db
+Size (octave-2.1.73.tar.bz2) = 5790133 bytes
 SHA1 (patch-aa) = ea72cbdcc89f81a52ade5166855461774d6187b1
 SHA1 (patch-ac) = 13ea6b2076a2b0325e3cf66230db55d0580b584f
 SHA1 (patch-ad) = d162862a0e45ddf15de438d8e7b0386ccfe7390e