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
author: wiz <wiz@pkgsrc.org> 1999-12-25 22:38:54 +0000
committer: wiz <wiz@pkgsrc.org> 1999-12-25 22:38:54 +0000
commit: 20af2df540f6c87382d22afb3e04f33f1c14da15 (patch)
tree: c3de4cd2dbecd614ebc8bbbdce265ff17dd60475
parent: feac0bcd3bcf74682fcbeacf8f4168fb3a20804f (diff)
download: pkgsrc-20af2df540f6c87382d22afb3e04f33f1c14da15.tar.gz
33 files changed, 159 insertions, 398 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.
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index f9b2c974139..2cfea4dc64b 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 10:54:34 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:56 wiz Exp $
 
-DISTNAME=	festlex-ogi-2.0
+DISTNAME=	OGIlexicon-2.0
+PKGNAME=	festlex-ogi-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	OGIlexicon-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -19,11 +19,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/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index ec557399370..b0920bfebb5 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 10:32:57 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:56 wiz Exp $
 
-DISTNAME=	festlex-poslex-1.4.0
+DISTNAME=	festlex_POSLEX
+PKGNAME=	festlex-poslex-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festlex_POSLEX.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -16,11 +16,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/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>
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index fd2f73861b0..82f87e80ffa 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 00:48:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:57 wiz Exp $
 
-DISTNAME=	festvox-abc-2.0
+DISTNAME=	voice_abc_di-2.0
+PKGNAME=	festvox-abc-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_abc_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -21,13 +21,12 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
 	${RM} -f ${WRKSRC}/lib/voices/spanish/abc_diphone/group/hvslpcOGI16k.group
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
-
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 7da769724c4..07143626829 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 01:02:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:58 wiz Exp $
 
-DISTNAME=	festvox-aec-2.0
+DISTNAME=	voice_aec_di-2.0
+PKGNAME=	festvox-aec-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_aec_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -20,11 +20,11 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-don/Makefile b/audio/festvox-don/Makefile
index 2650081f381..17613f439ac 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 03:03:22 proff Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:58 wiz Exp $
 
-DISTNAME=	festvox-don-1.4.0
+DISTNAME=	festvox_don
+PKGNAME=	festvox-don-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_don.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -23,6 +23,6 @@ post-extract:
 
 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/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index a29737427e9..7e1735d8533 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 10:32:58 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:58 wiz Exp $
 
-DISTNAME=	festvox-el11-1.4.0
+DISTNAME=	festvox_ellpc11k
+PKGNAME=	festvox-el11-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_ellpc11k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -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/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index d8745a3d854..4cd901a4584 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/10/11 16:29:59 proff Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/25 22:38:58 wiz Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -23,11 +23,11 @@ FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/en1_mbrola
 
 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:
-	cd ${WRKSRC} && pax -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
 #ugh
 	ln -fs ../../../../../mbrola/voices/en1 ${MBROLA}
 	ln -fs ../../../../../mbrola/voices/en1/en1mrpa ${MBROLA}
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 619c6451bb5..e645116d25b 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 01:23:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:59 wiz Exp $
 
-DISTNAME=	festvox-hvs-2.0
+DISTNAME=	voice_hvs_di-2.0
+PKGNAME=	festvox-hvs-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_hvs_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -21,11 +21,11 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 15a867685b3..ae2edce69f0 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 01:27:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:38:59 wiz Exp $
 
-DISTNAME=	festvox-jph-2.0
+DISTNAME=	voice_jph_di-2.0
+PKGNAME=	festvox-jph-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_jph_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -20,11 +20,11 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index de10cc217ee..6b1b15a859c 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 10:32:58 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:38:59 wiz Exp $
 
-DISTNAME=	festvox-kal16-1.4.0
+DISTNAME=	festvox_kallpc16k
+PKGNAME=	festvox-kal16-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_kallpc16k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -20,11 +20,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/festvox-kal16/pkg/COMMENT b/audio/festvox-kal16/pkg/COMMENT
index 9fc9dc87dd0..bd58659aa96 100644
--- a/audio/festvox-kal16/pkg/COMMENT
+++ b/audio/festvox-kal16/pkg/COMMENT
@@ -1 +1 @@
-16khz American English male voice for the festival
+16khz American English male voice for the festival speech synthesis system.
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 0ba8fa9f75b..703858d5e56 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 01:35:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:00 wiz Exp $
 
-DISTNAME=	festvox-kal8-1.4.0
+DISTNAME=	festvox_kallpc8k
+PKGNAME=	festvox-kal8-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_kallpc8k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -20,11 +20,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/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index d7b561b64b4..20afb9760ee 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 10:32:59 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:39:00 wiz Exp $
 
-DISTNAME=	festvox-ked16-1.4.0
+DISTNAME=	festvox_kedlpc16k
+PKGNAME=	festvox-ked16-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_kedlpc16k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -20,11 +20,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/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index ef67f1e8b5e..d9b370575fb 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1999/10/28 02:57:51 proff Exp $
+# $NetBSD: Makefile,v 1.9 1999/12/25 22:39:00 wiz Exp $
 
-DISTNAME=	festvox-ked8-1.4.0
+DISTNAME=	festvox_kedlpc8k
+PKGNAME=	festvox-ked8-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_kedlpc8k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -25,6 +25,6 @@ post-extract:
 
 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/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index 98931c5558a..814e360d3cd 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 01:46:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:00 wiz Exp $
 
-DISTNAME=	festvox-mwm-2.0
+DISTNAME=	voice_mwm_di-2.0
+PKGNAME=	festvox-mwm-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_mwm_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -20,11 +20,11 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 2db042188fd..bf91cf5030f 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 01:53:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:01 wiz Exp $
 
-DISTNAME=	festvox-ogirab-2.0
+DISTNAME=	voice_ogirab_di-2.0
+PKGNAME=	festvox-ogirab-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_ogirab_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -20,11 +20,11 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 3d04dd3e17d..d53c0f5ebb7 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1999/10/11 10:33:00 proff Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/25 22:39:01 wiz Exp $
 
-DISTNAME=	festvox-rab16-1.4.0
+DISTNAME=	festvox_rablpc16k
+PKGNAME=	festvox-rab16-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_rablpc16k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -20,11 +20,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/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index d626d3b95af..1a22ff3bc6f 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1999/10/28 01:57:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 1999/12/25 22:39:01 wiz Exp $
 
-DISTNAME=	festvox-rab8-1.4.0
+DISTNAME=	festvox_rablpc8k
+PKGNAME=	festvox-rab8-1.4.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.0/
-DISTFILES=	festvox_rablpc8k.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
@@ -20,11 +20,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/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index a3e5d2f5121..000a8939723 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 02:05:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/12/25 22:39:01 wiz Exp $
 
-DISTNAME=	festvox-tll-2.0
+DISTNAME=	voice_tll_di-2.0
+PKGNAME=	festvox-tll-2.0
 WRKSRC=		${WRKDIR}/festival
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
-DISTFILES=	voice_tll_di-2.0.tar.gz
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://cslu.cse.ogi.edu/tts
@@ -20,11 +20,11 @@ FHOME=		${PREFIX}/share/festival
 
 post-extract:
 	${CHMOD} -R a+r ${WRKSRC}
-	find ${WRKSRC} -type d -print0 | xargs -0 chmod 755
-	find ${WRKSRC} -type d -name CVS | xargs rm -fr
+	find ${WRKSRC} -type d -print0 | xargs -0 ${CHMOD} 755
+	find ${WRKSRC} -type d -name CVS | xargs ${RM} -fr
 
 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/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index cc43901248a..8abde364f15 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 16:00:02 proff Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:02 wiz Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -23,11 +23,11 @@ FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/us1_mbrola
 
 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:
-	cd ${WRKSRC} && pax -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
 #ugh
 	ln -fs ../../../../../mbrola/voices/us1 ${MBROLA}
 	ln -fs ../../../../../mbrola/voices/us1/us1mrpa ${MBROLA}
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index 9d672bc3250..afaaf243db8 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 16:44:40 proff Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:02 wiz Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -23,11 +23,11 @@ FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/us2_mbrola
 
 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:
-	cd ${WRKSRC} && pax -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
 #ugh
 	ln -fs ../../../../../mbrola/voices/us2 ${MBROLA}
 	ln -fs ../../../../../mbrola/voices/us2/us2mrpa ${MBROLA}
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 31b6adf6c0a..6186beb1066 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 16:51:41 proff Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:02 wiz Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -23,11 +23,11 @@ FHOME=		${PREFIX}/share/festival
 MBROLA=		${FHOME}/lib/voices/english/us3_mbrola
 
 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:
-	cd ${WRKSRC} && pax -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
 #ugh
 	ln -fs ../../../../../mbrola/voices/us3 ${MBROLA}
 	ln -fs ../../../../../mbrola/voices/us3/us3mrpa ${MBROLA}
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index b0aad7676e2..756ae877a69 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1999/10/11 14:36:02 proff Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/25 22:39:03 wiz Exp $
 
-PKGNAME=	mbrolavox-en1-980910
 DISTNAME=	en1-980910
+PKGNAME=	mbrolavox-en1-980910
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/
@@ -10,9 +10,8 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
 
-DEPENDS+=	mbrola-301h:../mbrola
-
 BUILD_DEPENDS=	unzip:../../archivers/unzip
+DEPENDS+=	mbrola-301h:../mbrola
 
 LICENSE=	no-commercial-use
 
@@ -23,11 +22,11 @@ NO_BUILD=	yes
 MHOME=		${PREFIX}/share/mbrola/voices
 
 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} ${MHOME}
-	cd ${WRKSRC} && pax -r -w en1 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -r -w en1 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index de0ade61c4c..064b95e347c 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1999/10/11 17:22:14 proff Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/25 22:39:03 wiz Exp $
 
-PKGNAME=	mbrolavox-us1-980512
 DISTNAME=	us1-980512
+PKGNAME=	mbrolavox-us1-980512
 WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/
@@ -9,8 +9,8 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/
-DEPENDS+=	mbrola-301h:../mbrola
 
+DEPENDS+=	mbrola-301h:../mbrola
 BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 LICENSE=	no-commercial-use
@@ -22,11 +22,11 @@ NO_BUILD=	yes
 MHOME=		${PREFIX}/share/mbrola/voices
 
 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} ${MHOME}
-	cd ${WRKSRC} && pax -r -w us1 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -r -w us1 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index ce22908c657..5a7eae7759a 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 18:27:58 proff Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:03 wiz Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -11,7 +11,6 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola.html
 
 DEPENDS+=	mbrola-301h:../mbrola
-
 BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 LICENSE=	no-commercial-use
@@ -23,11 +22,11 @@ NO_BUILD=	yes
 MHOME=		${PREFIX}/share/mbrola/voices
 
 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} ${MHOME}
-	cd ${WRKSRC} && pax -r -w us2 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -r -w us2 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us2/pkg/DESCR b/audio/mbrolavox-us2/pkg/DESCR
index b031c3aa873..a8f0bb5d0d7 100644
--- a/audio/mbrolavox-us2/pkg/DESCR
+++ b/audio/mbrolavox-us2/pkg/DESCR
@@ -1,68 +1,3 @@
 American English male voice for MBROLA.
 
-US2   is a diphone database  for  american english, consisting of 2065
-diphones, male voice.
-
-The following  phoneme  symbols are  assumed in  our diphone  sets. It
-slightly differ  for the SAMPA alphabet since  american english is not
-british english.
-
-SYMBOL  PRONOUNCED LIKE IN
-p     drop proxy 
-p_h   pod (aspirated allophone of p)
-
-t     plot tromp
-t_h   top (aspirated allophone of t)
-4     later (flapped allophone of t)
-
-k     rock  crop
-k_h   cot (aspirated allophone of k)
-
-b     cob box
-d     nod dot
-g     jog gospel
-
-f     prof fox
-s     boss sonic
-S     wash shop
-tS    notch chop
-T     cloth thomp
-
-v     salve volley
-z     was zombie
-Z     garage jacques
-dZ    dodge jog
-D     clothe thy
-
-m     palm mambo
-n     john novel
-N     bong
-l     doll lockwood
-r     star roxanne
-j     yacht
-w     show womble
-h     harm
-r=    her urgent
-
-i     even
-A     arthur
-u     oodles
-I     illness
-E     else
-{     apple
-V     nut
-U     good
-@     about
-EI    able
-AI    island
-OI    oyster
-@U    over
-aU    out
-
-O     all
-Or Allophone of O in front of /r/ like in 'sort'
-
-The diphone matrix is square, no diphone lacking... of course diphone
-like t-N may not sound optimal :-)
-
 -Julian Assange <proff@iq.org>
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index 888313627dc..5957d274cb1 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/11 17:02:52 proff Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/25 22:39:04 wiz Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -9,8 +9,8 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://tcts.fpms.ac.be/synthesis/mbrola.html
-DEPENDS+=	mbrola-301h:../mbrola
 
+DEPENDS+=	mbrola-301h:../mbrola
 BUILD_DEPENDS=	unzip:../../archivers/unzip
 
 LICENSE=	no-commercial-use
@@ -22,11 +22,11 @@ NO_BUILD=	yes
 MHOME=		${PREFIX}/share/mbrola/voices
 
 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} ${MHOME}
-	cd ${WRKSRC} && pax -r -w us3 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -r -w us3 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us3/pkg/DESCR b/audio/mbrolavox-us3/pkg/DESCR
index 83abc0d68c9..a8f0bb5d0d7 100644
--- a/audio/mbrolavox-us3/pkg/DESCR
+++ b/audio/mbrolavox-us3/pkg/DESCR
@@ -1,57 +1,3 @@
-US3   is a diphone database  for  american english, consisting of 2065
-diphones, male voice.
-
-The following  phoneme  symbols are  assumed in the us3 diphone  sets. It
-slightly different than the SAMPA alphabet since  american english is not
-british english.
-
-SYMBOL  PRONOUNCED LIKE IN
-p     drop proxy 
-t     plot tromp
-4     later (flapped allophone of t)
-k     rock  crop
-
-b     cob box
-d     nod dot
-g     jog gospel
-
-f     prof fox
-s     boss sonic
-S     wash shop
-tS    notch chop
-T     cloth thomp
-
-v     salve volley
-z     was zombie
-Z     garage jacques
-dZ    dodge jog
-D     clothe thy
-
-m     palm mambo
-n     john novel
-N     bong
-l     doll lockwood
-l=    litle
-r     star roxanne
-j     yacht
-w     show womble
-h     harm
-r=    her urgent
-
-i     even
-A     arthur
-u     oodles
-I     illness
-E     else
-{     apple
-V     nut
-U     good
-@     about
-EI    able
-AI    island
-OI    oyster
-@U    over
-aU    out
-O     all
+American English male voice for MBROLA.
 
 -Julian Assange <proff@iq.org>
author	wiz <wiz@pkgsrc.org>	1999-12-25 22:38:54 +0000
committer	wiz <wiz@pkgsrc.org>	1999-12-25 22:38:54 +0000
commit	20af2df540f6c87382d22afb3e04f33f1c14da15 (patch)
tree	c3de4cd2dbecd614ebc8bbbdce265ff17dd60475
parent	feac0bcd3bcf74682fcbeacf8f4168fb3a20804f (diff)
download	pkgsrc-20af2df540f6c87382d22afb3e04f33f1c14da15.tar.gz