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

2 files changed, 8 insertions, 84 deletions

diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index e59b3280f0f..4b9454e21c9 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:35 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:57 wiz Exp $
 
-DISTNAME=	festogi-spanish-2.0
+DISTNAME=	OGIspanish-2.0
+PKGNAME=	festogi-spanish-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	OGIspanish-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -18,11 +18,11 @@ NO_BUILD=	yes
 FHOME=		${PREFIX}/share/festival
 
 post-extract:
-	@ chmod -R a+r ${WRKSRC}
-	@ find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
+	@ ${CHMOD} -R a+r ${WRKSRC}
+	@ find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && pax -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festogi-spanish/pkg/DESCR b/audio/festogi-spanish/pkg/DESCR
index 4eb2091bd6d..a2bbe58d75e 100644
--- a/audio/festogi-spanish/pkg/DESCR
+++ b/audio/festogi-spanish/pkg/DESCR
@@ -1,21 +1,5 @@
-Festival Spanish (Mexican) language support routines (in scheme) from ogi.edu
-
-
-		     Mexican Spanish Synthesizer
-			    for OGIresLPC
-			     version 2.0
-			      June 1999
-
-	     http://www.pue.udlap.mx/~sistemas/tlatoa/tts
-		   http://cslu.cse.ogi.edu/tts
-
-	      Alejandro Barbosa <alex@mail.pue.udlap.mx>
-		   Andrew Cronk <cronk@cse.ogi.edu>
-		Horacio Meza <is093970@mail.udlap.mx>
-		    Mike Macon <macon@ee.ogi.edu>
-		
-DESCRIPTION
------------
+Festival Spanish (Mexican) language support routines (in scheme)
+from ogi.edu
 
 OGIspanish is an extension to the Festival TTS system
 (http://www.cstr.ed.ac.uk/projects/festival).  This version of
@@ -23,64 +7,4 @@ OGIspanish has been designed to work with Festival version 1.4.0
 released June 1999.  It provides Mexican Spanish voices created by OGI
 staff and Alejandro Barbosa from UDLA, Puebla, Mexico.
 
-The module is distributed in three chunks:
- 1) OGIspanish-2.0.tar.gz -- Scheme code
- 2) voice_hvs-2.0.tar.gz -- female voice
- 3) voice_abc-2.0.tar.gz -- male voice
-
-New in this release (2.0):
-	* works with Festival 1.4.0
-	
-	* intonation module accepts parameter that allows base f0 to be
-	  modified in the same manner as the English voices in the context
-	  of the CSLU Toolkit
-
-	* major improvements to the tokenization module
-		- accents 'vowel format abandoned
-		- now use vowel' to indicate accent on non-Spanish keyboard
-		- tilde can be entered as n~ or ny
-		- dieresis supported
-		- Spanish keyboard special characters supported
-		- a host of Abbreviations added
-		- improved processing of money, temperature, etc.
-
-	* intonation module: At the highest level of the intonation module 
-	  is a new stage to incorporate different phrase intonation models. 
-
-	* new syllabification function for Mexican Spanish. This function 
-          uses lexical rules to syllabify and accentuate in Spanish and 
-          solves both syllabification and stress prediction at word level.
-
-	* new function for duration prediction for Spanish that works at 
-	  the syllable level and differs a little from the duration 
-	  prediction modules offered by festival.
-
-Notes:
-
-1) Currently, the Mexican Spanish voice does not support Spanish
-characters such as tilded vowels, ˜ or dierisis. You must enter 
-them as follows: 
-
-tilded a	-	a'
-tilded e	-	e'
-tilded i	-	i'
-tilded o	-	o'
-tilded u	-	u'
-tilded n	-	n~
-
-
-LICENSE 
-------- 
-This module and accompanying data are freely available for
-non-commercial use only.  Please see the file "license_ogi_tts.txt"
-for information on usage and redistribution, and for a DISCLAIMER OF
-ALL WARRANTIES.
-
-
-BUGS and IMPROVEMENTS
----------------------
-Please contact us via email if you find bugs or have suggestions
-for improvements.  <cronk@cse.ogi.edu>
-
-
 -Julian Assange <proff@iq.org>