install info files correctly, make binary package work

4 files changed, 28 insertions, 5 deletions

diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index fb00d779c8d..6cfd360606c 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/12/28 04:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/01/05 17:56:46 wiz Exp $
 
 DISTNAME=	festdoc-1.4.0.1
 PKGNAME=	festival-doc-1.4.0.1
@@ -12,11 +12,14 @@ NO_BUILD=	yes
 
 FDOC=		${PREFIX}/share/doc/festival
 
+INFO_FILES=	festival.info
+
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
 	${FIND} ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
 	${RM} ${WRKSRC}/festival/src-manual/c3750.htm~
 	${RM} ${WRKSRC}/speechtools/c16909.htm~
+	${RMDIR} ${WRKSRC}/festival/src-manual/images_gen
 
 do-install:
 	${INSTALL_DATA_DIR} ${FDOC}
@@ -24,6 +27,7 @@ do-install:
 	  ${CP} $$info ${PREFIX}/info && \
 	  ${CP} -r ${WRKSRC}/* ${FDOC} && \
 	  cd ${FDOC} && \
-	  ${RM} -f $$info
+	  ${RM} -f $$info && \
+	  ${RMDIR} festival/info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festdoc/files/patch-sum b/audio/festdoc/files/patch-sum
new file mode 100644
index 00000000000..554730685a5
--- /dev/null
+++ b/audio/festdoc/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 2000/01/05 17:56:48 wiz Exp $
+
+MD5 (patch-aa) = 49a8b4b83f6e67c3b2ff9925d091de60
diff --git a/audio/festdoc/patch-aa b/audio/festdoc/patch-aa
new file mode 100644
index 00000000000..3e1c38fa229
--- /dev/null
+++ b/audio/festdoc/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2000/01/05 17:56:47 wiz Exp $
+
+--- festival/info/festival.info.orig	Sat Jun 19 17:08:03 1999
++++ festival/info/festival.info	Wed Jan  5 16:36:08 2000
+@@ -1,6 +1,11 @@
+ This is Info file festival.info, produced by Makeinfo-1.63 from the
+ input file festival.texi.
+ 
++INFO-DIR-SECTION Speech Synthesis
++START-INFO-DIR-ENTRY
++* Festival: (festival).             A general text to speech system.
++END-INFO-DIR-ENTRY
++
+    This file documents the `Festival' Speech Synthesis System a general
+ text to speech system for making your computer talk and developing new
+ synthesis techniques.
diff --git a/audio/festdoc/pkg/PLIST b/audio/festdoc/pkg/PLIST
index 31aabbd37a5..98406cb2258 100644
--- a/audio/festdoc/pkg/PLIST
+++ b/audio/festdoc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1999/10/27 14:34:03 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/01/05 17:56:48 wiz Exp $
 share/doc/festival/speechtools/images_gen/docppimath_929959730_6.gif
 share/doc/festival/speechtools/images_gen/docppmath_929959728_2.gif
 share/doc/festival/speechtools/images_gen/docppmath_929959741_1.gif
@@ -140,6 +140,7 @@ share/doc/festival/speechtools/index.html
 share/doc/festival/speechtools/HTML.index
 share/doc/festival/speechtools/TeX.formulae
 @dirrm share/doc/festival/speechtools
+@unexec install-info --delete %D/info/festival.info %D/info/dir
 info/festival.info
 info/festival.info-9
 info/festival.info-8
@@ -151,7 +152,7 @@ info/festival.info-3
 info/festival.info-2
 info/festival.info-1
 info/festival.info-10
-@dirrm share/doc/festival/festival/info
+@exec install-info %D/info/festival.info %D/info/dir
 share/doc/festival/festival/user-manual/festival_35.html
 share/doc/festival/festival/user-manual/festival_1.html
 share/doc/festival/festival/user-manual/festival_2.html
@@ -192,7 +193,6 @@ share/doc/festival/festival/user-manual/festival_toc.html
 share/doc/festival/festival/src-manual/c3750.htm
 share/doc/festival/festival/src-manual/x3792.htm
 share/doc/festival/festival/src-manual/unisyn02.gif
-@dirrm share/doc/festival/festival/src-manual/images_gen
 @dirrm share/doc/festival/festival/src-manual
 share/doc/festival/festival/refcard.dvi
 share/doc/festival/festival/refcard.ps