pkglint silencing:

o use DISTNAME and PKGNAME instead of DISTFILES
o replace rm by ${RM}, chmod by ${CHMOD}, pax by ${PAX}, echo by ${ECHO}
o reorder lines, remove unnecessary blank
o modify pkg/COMMENT and pkg/DESCR
o remove lines from files/patch-sum for files that aren't there

3 files changed, 14 insertions, 55 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 9525b3925ea..01a52e7dff9 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/10/25 22:56:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:54 wiz Exp $
 
 DISTNAME=	festival-1.4.0
 WRKSRC=		${WRKDIR}
@@ -9,7 +9,6 @@ DISTFILES=	${DISTNAME}.tar.gz \
 		speech_tools-1.2.0.tar.gz \
 		OGIresLPC-2.0.3.tar.gz \
 		OGIfestpatch-1.4.0.tar.gz
- 
 # note that OGIfestpatch above file must be extracted last. it is, however
 # this behavior not defined in pkgsrc at the time of writing
 
@@ -27,10 +26,10 @@ FHOME=		${PREFIX}/share/festival
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_COMPILER!=	case "`${CC} -v 2>&1`" in *2.6.*) echo gcc26;;\
-                                          *2.7.*) echo gcc27;;\
-                                          *2.8.*) echo gcc28;;\
-                                          *egcs*) echo egcs;;\
+PKG_COMPILER!=	case "`${CC} -v 2>&1`" in *2.6.*) ${ECHO} gcc26;;\
+                                          *2.7.*) ${ECHO} gcc27;;\
+                                          *2.8.*) ${ECHO} gcc28;;\
+                                          *egcs*) ${ECHO} egcs;;\
                                        esac
 
 MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS} \
@@ -65,7 +64,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	find ${FESTIVAL}/lib -type d -print0| xargs -0 ${CHMOD} 755
-	cd ${FESTIVAL} && pax -r -w lib examples ${FHOME}
+	cd ${FESTIVAL} && ${PAX} -r -w lib examples ${FHOME}
 	${RM} -f ${FHOME}/lib/etc/NetBSD/audsp
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/NetBSD/audsp ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked
diff --git a/audio/festival/files/patch-sum b/audio/festival/files/patch-sum
index eda1fee1938..d5a15324155 100644
--- a/audio/festival/files/patch-sum
+++ b/audio/festival/files/patch-sum
@@ -1,10 +1,8 @@
-$NetBSD: patch-sum,v 1.2 1999/10/11 14:13:49 proff Exp $
+$NetBSD: patch-sum,v 1.3 1999/12/25 22:38:56 wiz Exp $
 
 MD5 (patch-aa) = 0d4fab38dd5a45ac637f3196fa33e82d
-MD5 (patch-aa.~1~) = 16840f9d624ad6ea1cebeae3d1a90a90
 MD5 (patch-ab) = 9e0d5be3ad91d3c9a36843273f5880c3
 MD5 (patch-ac) = a1acd1785f37fed9969d27f55d0ebca4
 MD5 (patch-ad) = d6042f477cb331b05b0bd162c3cdaf56
 MD5 (patch-ae) = 3256017d1e235bc08729a2cd40213a51
 MD5 (patch-af) = 39ba57b0b3ce741c0d75d44afb072714
-MD5 (patch-af.~1~) = 7dedcd54e6abd8dff972a09b7a0d67ca
diff --git a/audio/festival/pkg/DESCR b/audio/festival/pkg/DESCR
index 8c482ccd7f5..902c994d5e0 100644
--- a/audio/festival/pkg/DESCR
+++ b/audio/festival/pkg/DESCR
@@ -1,51 +1,13 @@
-   Festival is an advanced multi-lingual speech synthesis system
-   developed at CSTR. It offers a full text to speech system with
-   various APIs, as well an environment for development and research
-   of speech synthesis techniques. It is written in C++ with a
-   Scheme-based command interpreter for general control.
+Festival is an advanced multi-lingual speech synthesis system
+developed at CSTR. It offers a full text to speech system with various
+APIs, as well an environment for development and research of speech
+synthesis techniques. It is written in C++ with a Scheme-based command
+interpreter for general control.
 
 You will also need to install at least one festvox-* (festival voice)
 package (infact, the festvox packages are dependent on this package).
 
-  festival --tts foo.bar will speak ASCII file foo.bar, 
-  (SayText "Oh Dad! We're ALL Devo!")
+festival --tts foo.bar will speak ASCII file foo.bar, (SayText "Oh
+Dad! We're ALL Devo!")
 
 -Julian Assange <proff@iq.org>
-
-Current version
-
-Version 1.4.0 (June 1999) is now available free for unrestricted use
-
-   o English (British and American), Spanish and Welsh text to speech
-   o Externally configurable language independent modules
-        o phonesets, lexicons, letter-to-sound rules, tokenizing, part
-	  of speech tagging, intonation and duration.
-
-Festival 1.4.0 has the following improvements over the previous release (1.3.1 January 1999)
-
-   o distributed under a free X11-type licence
-   o generalization of stats modules, ngram, CART, wfst with viterbi so they
-     can be shard more easily
-   o Tidy up of Utterance/Relation/Item architecture
-   o Initial JSAPI support
-   o Three new us voices using MBROLA databases
-   o Tilt code overhaul
-   o XML load for Relations
-   o Fringe graphic display (ALPHA) released seperately
-     http://www.cstr.ed.ac.uk/projects/fringe.html
-
-Previous (1.3.1) features:
-
-     * English (British and American), Spanish (mexican) and
-       Welsh text to speech
-     * Externally configurable language independent modules
-          + phonesets, lexicons, letter-to-sound rules, tokenizing,
-            part of speech tagging, intonation and duration.
-     * Waveform synthesizers:
-          + diphone based: residual excited LPC (and PSOLA not for
-            distribution)
-          + MBROLA database support.
-     * Portable (Unix) distribution.
-     * On-line documentation.
-     * SABLE markup, Emacs, client/server (including Java), scripting
-       interfaces.