First round of changes:

o add @exec/@unexecinstall-info directives to PLIST
o slightly change the path's for the documentation
    (share/doc/octave instead of share/octave/doc etc.)
o install html docs into share/doc/html/octave

2 files changed, 105 insertions, 96 deletions

diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index d425a552b61..037b94e4dcc 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+# $NetBSD: Makefile,v 1.2 2001/03/27 20:15:02 wennmach Exp $
 
 DISTNAME=	octave-2.1.33
 CATEGORIES=	math
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.che.wisc.edu/octave/
-COMMENT=	A high-level language, primarily intended for numerical computations
+COMMENT=	High-level language, primarily intended for numerical computations
 
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=	readline>=4.0:../../devel/readline
@@ -33,19 +33,23 @@ LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 INFO_FILES=	octave.info liboctave.info
 LIBOCTAVE_INFO=	liboctave.info liboctave.info-1 \
 		liboctave.info-2 liboctave.info-3
-OCTAVE_DOC=	faq/Octave-FAQ.ps faq/Octave-FAQ_toc.html \
-		interpreter/octave.ps interpreter/octave_*.html \
-		liboctave/liboctave.ps liboctave/liboctave_*.html \
-		refcard/refcard-a4.ps refcard/refcard-legal.ps \
-		refcard/refcard-letter.ps
+OCTAVE_DOC=	faq/Octave-FAQ.ps interpreter/octave.ps \
+		liboctave/liboctave.ps refcard/refcard-a4.ps \
+		refcard/refcard-legal.ps  refcard/refcard-letter.ps
+OCTAVE_HTML=	faq/Octave-FAQ_toc.html interpreter/octave_*.html \
+		liboctave/liboctave_*.html 
 
 post-install:
-	${MKDIR} ${PREFIX}/share/octave/doc
 .for file in ${LIBOCTAVE_INFO}
 	${INSTALL_DATA} ${WRKSRC}/doc/liboctave/${file} ${PREFIX}/info
 .endfor
+	${MKDIR} ${PREFIX}/share/doc/octave
 .for file in ${OCTAVE_DOC}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/octave/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/octave
+.endfor
+	${MKDIR} ${PREFIX}/share/doc/html/octave
+.for file in ${OCTAVE_HTML}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/html/octave
 .endfor
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/math/octave-current/pkg/PLIST b/math/octave-current/pkg/PLIST
index 91a118be9c3..6c3f67052e5 100644
--- a/math/octave-current/pkg/PLIST
+++ b/math/octave-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/27 12:06:55 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/27 20:15:03 wennmach Exp $
 bin/mkoctfile
 bin/mkoctfile-2.1.33
 bin/octave
@@ -271,6 +271,8 @@ include/${PKGNAME}/octave/vx-s-ccv.h
 include/${PKGNAME}/octave/vx-s-crv.h
 include/${PKGNAME}/octave/xdiv.h
 include/${PKGNAME}/octave/xpow.h
+@unexec install-info --delete %D/info/liboctave.info %D/info/dir
+@unexec install-info --delete %D/info/octave.info %D/info/dir
 info/liboctave.info
 info/liboctave.info-1
 info/liboctave.info-2
@@ -291,6 +293,8 @@ info/octave.info-6
 info/octave.info-7
 info/octave.info-8
 info/octave.info-9
+@exec install-info %D/info/liboctave.info %D/info/dir 
+@exec install-info %D/info/octave.info %D/info/dir 
 lib/libcruft.a
 lib/libcruft.la
 lib/libcruft.so.2.33
@@ -860,91 +864,91 @@ share/octave/2.1.33/m/time/asctime.m
 share/octave/2.1.33/m/time/clock.m
 share/octave/2.1.33/m/time/ctime.m
 share/octave/2.1.33/m/time/date.m
-share/octave/doc/Octave-FAQ.ps
-share/octave/doc/Octave-FAQ_toc.html
-share/octave/doc/liboctave.ps
-share/octave/doc/liboctave_1.html
-share/octave/doc/liboctave_10.html
-share/octave/doc/liboctave_11.html
-share/octave/doc/liboctave_12.html
-share/octave/doc/liboctave_13.html
-share/octave/doc/liboctave_14.html
-share/octave/doc/liboctave_15.html
-share/octave/doc/liboctave_16.html
-share/octave/doc/liboctave_17.html
-share/octave/doc/liboctave_18.html
-share/octave/doc/liboctave_2.html
-share/octave/doc/liboctave_3.html
-share/octave/doc/liboctave_4.html
-share/octave/doc/liboctave_5.html
-share/octave/doc/liboctave_6.html
-share/octave/doc/liboctave_7.html
-share/octave/doc/liboctave_8.html
-share/octave/doc/liboctave_9.html
-share/octave/doc/liboctave_toc.html
-share/octave/doc/octave.ps
-share/octave/doc/octave_1.html
-share/octave/doc/octave_10.html
-share/octave/doc/octave_11.html
-share/octave/doc/octave_12.html
-share/octave/doc/octave_13.html
-share/octave/doc/octave_14.html
-share/octave/doc/octave_15.html
-share/octave/doc/octave_16.html
-share/octave/doc/octave_17.html
-share/octave/doc/octave_18.html
-share/octave/doc/octave_19.html
-share/octave/doc/octave_2.html
-share/octave/doc/octave_20.html
-share/octave/doc/octave_21.html
-share/octave/doc/octave_22.html
-share/octave/doc/octave_23.html
-share/octave/doc/octave_24.html
-share/octave/doc/octave_25.html
-share/octave/doc/octave_26.html
-share/octave/doc/octave_27.html
-share/octave/doc/octave_28.html
-share/octave/doc/octave_29.html
-share/octave/doc/octave_3.html
-share/octave/doc/octave_30.html
-share/octave/doc/octave_31.html
-share/octave/doc/octave_32.html
-share/octave/doc/octave_33.html
-share/octave/doc/octave_34.html
-share/octave/doc/octave_35.html
-share/octave/doc/octave_36.html
-share/octave/doc/octave_37.html
-share/octave/doc/octave_38.html
-share/octave/doc/octave_39.html
-share/octave/doc/octave_4.html
-share/octave/doc/octave_40.html
-share/octave/doc/octave_41.html
-share/octave/doc/octave_42.html
-share/octave/doc/octave_43.html
-share/octave/doc/octave_44.html
-share/octave/doc/octave_45.html
-share/octave/doc/octave_46.html
-share/octave/doc/octave_47.html
-share/octave/doc/octave_48.html
-share/octave/doc/octave_49.html
-share/octave/doc/octave_5.html
-share/octave/doc/octave_50.html
-share/octave/doc/octave_51.html
-share/octave/doc/octave_52.html
-share/octave/doc/octave_53.html
-share/octave/doc/octave_54.html
-share/octave/doc/octave_6.html
-share/octave/doc/octave_7.html
-share/octave/doc/octave_8.html
-share/octave/doc/octave_9.html
-share/octave/doc/octave_foot.html
-share/octave/doc/octave_toc.html
-share/octave/doc/octave_abt.html
-share/octave/doc/octave_fot.html
-share/octave/doc/octave_ovr.html
-share/octave/doc/refcard-a4.ps
-share/octave/doc/refcard-legal.ps
-share/octave/doc/refcard-letter.ps
+share/doc/octave/Octave-FAQ.ps
+share/doc/octave/liboctave.ps
+share/doc/octave/octave.ps
+share/doc/octave/refcard-a4.ps
+share/doc/octave/refcard-legal.ps
+share/doc/octave/refcard-letter.ps
+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_2.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_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_foot.html
+share/doc/html/octave/octave_toc.html
+share/doc/html/octave/octave_abt.html
+share/doc/html/octave/octave_fot.html
+share/doc/html/octave/octave_ovr.html
 share/octave/site/m/startup/octaverc
 share/octave/ls-R
 @dirrm include/${PKGNAME}/octave
@@ -1001,5 +1005,6 @@ share/octave/ls-R
 @dirrm share/octave/site/m/startup
 @dirrm share/octave/site/m
 @dirrm share/octave/site
-@dirrm share/octave/doc
 @dirrm share/octave
+@dirrm share/doc/html/octave
+@dirrm share/doc/octave