audio/festvox-cmu_us_*_arctic: Fixes as suggested by jbeich

Fixes as suggested in
  https://lists.freebsd.org/pipermail/svn-ports-all/2015-December/111077.html

PR:		204970
Submitted by:	Michael Danilov <mike.d.ft402@gmail.com> (maintainer)
Suggested by:	jbeich

23 files changed, 117 insertions, 129 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 3902886f8336..82cebb58fbf4 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -138,6 +138,7 @@
     SUBDIR += festvox-cmu_us_bdl_arctic
     SUBDIR += festvox-cmu_us_clb_arctic
     SUBDIR += festvox-cmu_us_jmk_arctic
+    SUBDIR += festvox-cmu_us_ksp_arctic
     SUBDIR += festvox-cmu_us_rms_arctic
     SUBDIR += festvox-cmu_us_slt_arctic
     SUBDIR += festvox-czech
diff --git a/audio/festvox-cmu_us_awb_arctic/Makefile b/audio/festvox-cmu_us_awb_arctic/Makefile
index 2f805dde56f0..525ef6aeef40 100644
--- a/audio/festvox-cmu_us_awb_arctic/Makefile
+++ b/audio/festvox-cmu_us_awb_arctic/Makefile
@@ -1,14 +1,9 @@
 # $FreeBSD$
 
 VOICE=	cmu_us_awb_arctic
-PORTREVISION=	0
 
-COMMENT=	English male voice for festival
+COMMENT=	CMU US English Scottish male voice for festival
 
 MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
-DESCR=	${.CURDIR}/pkg-descr
-DISTINFO_FILE=	${.CURDIR}/distinfo
-PLIST=	${.CURDIR}/pkg-plist
-PKGMESSAGE=	${.CURDIR}/pkg-message
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/festvox-cmu_us_awb_arctic/pkg-descr b/audio/festvox-cmu_us_awb_arctic/pkg-descr
index 2d7d54aa2bf5..6a67802958c6 100644
--- a/audio/festvox-cmu_us_awb_arctic/pkg-descr
+++ b/audio/festvox-cmu_us_awb_arctic/pkg-descr
@@ -1,4 +1,13 @@
-English male voice for festival.
+US English Scottish male voice by the Language Technologies Institute
+at Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+The speaker is very experienced in building synthetic voices and
+matched prompted US English, though his vowels are very different
+from US English vowels. Scottish English speakers will probably
+find synthesizers based on this voice strange.
+
 (voice_cmu_us_awb_arctic_clunits)
 
-WWW: http://www.speech.cs.cmu.edu/
+WWW: http://festvox.org/cmu_arctic/dbs_awb.html
diff --git a/audio/festvox-cmu_us_bdl_arctic/Makefile b/audio/festvox-cmu_us_bdl_arctic/Makefile
index 9ec3dc69c17d..45326cbe3c24 100644
--- a/audio/festvox-cmu_us_bdl_arctic/Makefile
+++ b/audio/festvox-cmu_us_bdl_arctic/Makefile
@@ -1,15 +1,9 @@
-# Created by: ?
 # $FreeBSD$
 
 VOICE=	cmu_us_bdl_arctic
-PORTREVISION=	0
 
-COMMENT=	English male voice for festival
+COMMENT=	CMU US English male voice for festival
 
 MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
-DESCR=	${.CURDIR}/pkg-descr
-DISTINFO_FILE=	${.CURDIR}/distinfo
-PLIST=	${.CURDIR}/pkg-plist
-PKGMESSAGE=	${.CURDIR}/pkg-message
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/festvox-cmu_us_bdl_arctic/pkg-descr b/audio/festvox-cmu_us_bdl_arctic/pkg-descr
index 03212f863077..1b61a5e27c1e 100644
--- a/audio/festvox-cmu_us_bdl_arctic/pkg-descr
+++ b/audio/festvox-cmu_us_bdl_arctic/pkg-descr
@@ -1,4 +1,8 @@
-English male voice for festival.
+US English male voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
 (voice_cmu_us_bdl_arctic_clunits)
 
-WWW: http://www.speech.cs.cmu.edu/
+WWW: http://festvox.org/cmu_arctic/dbs_bdl.html
diff --git a/audio/festvox-cmu_us_bdl_arctic/pkg-message b/audio/festvox-cmu_us_bdl_arctic/pkg-message
deleted file mode 100644
index 04d18d318465..000000000000
--- a/audio/festvox-cmu_us_bdl_arctic/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-===============================================================================
-For correct operation, please add cmu_us_bdl_arctic_clunits
-after "(defvar default-voice-priority-list"
-in ${PREFIX}/share/festival/lib/voices.scm
-===============================================================================
diff --git a/audio/festvox-cmu_us_clb_arctic/Makefile b/audio/festvox-cmu_us_clb_arctic/Makefile
index 1697c773292e..f671beec67f9 100644
--- a/audio/festvox-cmu_us_clb_arctic/Makefile
+++ b/audio/festvox-cmu_us_clb_arctic/Makefile
@@ -1,18 +1,14 @@
-# Created by: ?
 # $FreeBSD$
 
 VOICE=	cmu_us_clb_arctic
-PORTREVISION=	0
 
-COMMENT=	English female voice for festival
+COMMENT=	CMU US English female voice for festival
 
 MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
-DESCR=	${.CURDIR}/pkg-descr
-DISTINFO_FILE=	${.CURDIR}/distinfo
-PLIST=	${.CURDIR}/pkg-plist
-PKGMESSAGE=	${.CURDIR}/pkg-message
 
-NODIRS= cep dic emu/lab_hlb emu/pm_hlb emu f0 \
+PORTDATA=       *
+
+NODIRS=	cep dic emu/lab_hlb emu/pm_hlb emu f0 \
 	festival/accents festival/coeffs festival/disttabs \
 	festival/dur/bin festival/dur/data festival/dur/feats \
 	festival/dur/tree \
@@ -25,4 +21,4 @@ NODIRS= cep dic emu/lab_hlb emu/pm_hlb emu f0 \
 	group lar lpc pm_lab pm_unfilled prompt-cep prompt-lab prompt-utt \
 	prompt-wav recording scratch/lab scratch/wav scratch versions wrd
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/festvox-cmu_us_clb_arctic/pkg-descr b/audio/festvox-cmu_us_clb_arctic/pkg-descr
index 950b9e35845b..06ef1feef434 100644
--- a/audio/festvox-cmu_us_clb_arctic/pkg-descr
+++ b/audio/festvox-cmu_us_clb_arctic/pkg-descr
@@ -1,4 +1,8 @@
-English female voice for festival.
+US English female voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
 (voice_cmu_us_clb_arctic_clunits)
 
-WWW: http://www.speech.cs.cmu.edu/
+WWW: http://festvox.org/cmu_arctic/dbs_clb.html
diff --git a/audio/festvox-cmu_us_clb_arctic/pkg-message b/audio/festvox-cmu_us_clb_arctic/pkg-message
deleted file mode 100644
index 583f3f837bee..000000000000
--- a/audio/festvox-cmu_us_clb_arctic/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-===============================================================================
-For correct operation, please add cmu_us_clb_arctic_clunits
-after "(defvar default-voice-priority-list"
-in ${PREFIX}/share/festival/lib/voices.scm
-===============================================================================
diff --git a/audio/festvox-cmu_us_jmk_arctic/Makefile b/audio/festvox-cmu_us_jmk_arctic/Makefile
index adc63102c15b..7f769ffbb501 100644
--- a/audio/festvox-cmu_us_jmk_arctic/Makefile
+++ b/audio/festvox-cmu_us_jmk_arctic/Makefile
@@ -1,15 +1,9 @@
-# Created by: ?
 # $FreeBSD$
 
 VOICE=	cmu_us_jmk_arctic
-PORTREVISION=	0
 
-COMMENT=	English male voice for festival
+COMMENT=	CMU US English Canadian male voice for festival
 
 MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
-DESCR=	${.CURDIR}/pkg-descr
-DISTINFO_FILE=	${.CURDIR}/distinfo
-PLIST=	${.CURDIR}/pkg-plist
-PKGMESSAGE=	${.CURDIR}/pkg-message
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/festvox-cmu_us_jmk_arctic/pkg-descr b/audio/festvox-cmu_us_jmk_arctic/pkg-descr
index 0eee6bc554f2..576784deac3d 100644
--- a/audio/festvox-cmu_us_jmk_arctic/pkg-descr
+++ b/audio/festvox-cmu_us_jmk_arctic/pkg-descr
@@ -1,4 +1,8 @@
-English male voice for festival.
+US English Canadian male voice by the Language Technologies Institute
+at Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
 (voice_cmu_us_jmk_arctic_clunits)
 
-WWW: http://www.speech.cs.cmu.edu/
+WWW: http://festvox.org/cmu_arctic/dbs_jmk.html
diff --git a/audio/festvox-cmu_us_jmk_arctic/pkg-message b/audio/festvox-cmu_us_jmk_arctic/pkg-message
deleted file mode 100644
index 1d2c21a315e0..000000000000
--- a/audio/festvox-cmu_us_jmk_arctic/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-===============================================================================
-For correct operation, please add cmu_us_jmk_arctic_clunits
-after "(defvar default-voice-priority-list"
-in ${PREFIX}/share/festival/lib/voices.scm
-===============================================================================
diff --git a/audio/festvox-cmu_us_ksp_arctic/Makefile b/audio/festvox-cmu_us_ksp_arctic/Makefile
new file mode 100644
index 000000000000..24397c5d5ab8
--- /dev/null
+++ b/audio/festvox-cmu_us_ksp_arctic/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+VOICE=	cmu_us_ksp_arctic
+
+COMMENT=	CMU US English Indian male voice for festival
+
+MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/festvox-cmu_us_ksp_arctic/distinfo b/audio/festvox-cmu_us_ksp_arctic/distinfo
new file mode 100644
index 000000000000..32fc6292c2d7
--- /dev/null
+++ b/audio/festvox-cmu_us_ksp_arctic/distinfo
@@ -0,0 +1,2 @@
+SHA256 (festival/cmu_us_ksp_arctic-0.95-release.tar.bz2) = a968b063012c3efcc4a3f0e93e0eda4765df8f92426a4b06bf470eba7ab574b0
+SIZE (festival/cmu_us_ksp_arctic-0.95-release.tar.bz2) = 119175914
diff --git a/audio/festvox-cmu_us_ksp_arctic/pkg-descr b/audio/festvox-cmu_us_ksp_arctic/pkg-descr
new file mode 100644
index 000000000000..5904bfdba8d6
--- /dev/null
+++ b/audio/festvox-cmu_us_ksp_arctic/pkg-descr
@@ -0,0 +1,8 @@
+US English Indian male voice by the Language Technologies Institute
+at Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
+(voice_cmu_us_ksp_arctic_clunits)
+
+WWW: http://festvox.org/cmu_arctic/dbs_ksp.html
diff --git a/audio/festvox-cmu_us_rms_arctic/Makefile b/audio/festvox-cmu_us_rms_arctic/Makefile
index 732d72e6f2b3..e7e7590c7d5d 100644
--- a/audio/festvox-cmu_us_rms_arctic/Makefile
+++ b/audio/festvox-cmu_us_rms_arctic/Makefile
@@ -1,16 +1,10 @@
-# Created by: ?
 # $FreeBSD$
 
 VOICE=	cmu_us_rms_arctic
-PORTREVISION=	0
 
-COMMENT=	English male voice for festival
+COMMENT=	CMU US English male voice for festival
 
 MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
-DESCR=	${.CURDIR}/pkg-descr
-DISTINFO_FILE=	${.CURDIR}/distinfo
-PLIST=	${.CURDIR}/pkg-plist
-PKGMESSAGE=	${.CURDIR}/pkg-message
 
 NODIRS=	cep dic emu/lab_hlb emu/pm_hlb emu f0 \
 	festival/accents festival/coeffs festival/disttabs \
@@ -18,4 +12,4 @@ NODIRS=	cep dic emu/lab_hlb emu/pm_hlb emu f0 \
 	group lar lpc pm_lab prompt-cep prompt-lab prompt-utt \
 	prompt-wav recording scratch/lab scratch/wav scratch versions wrd
 
-.include "${MASTERDIR}/Makefile.common"
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/festvox-cmu_us_rms_arctic/pkg-descr b/audio/festvox-cmu_us_rms_arctic/pkg-descr
index 778715b68f7e..d7d85fe22e05 100644
--- a/audio/festvox-cmu_us_rms_arctic/pkg-descr
+++ b/audio/festvox-cmu_us_rms_arctic/pkg-descr
@@ -1,4 +1,8 @@
-English male voice for festival.
+US English male voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
 (voice_cmu_us_rms_arctic_clunits)
 
-WWW: http://www.speech.cs.cmu.edu/
+WWW: http://festvox.org/cmu_arctic/dbs_rms.html
diff --git a/audio/festvox-cmu_us_rms_arctic/pkg-message b/audio/festvox-cmu_us_rms_arctic/pkg-message
deleted file mode 100644
index 87bad19e1fcd..000000000000
--- a/audio/festvox-cmu_us_rms_arctic/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-===============================================================================
-For correct operation, please add cmu_us_rms_arctic_clunits
-after "(defvar default-voice-priority-list"
-in ${PREFIX}/share/festival/lib/voices.scm
-===============================================================================
diff --git a/audio/festvox-cmu_us_slt_arctic/Makefile b/audio/festvox-cmu_us_slt_arctic/Makefile
index 7d440352d300..778827dbf101 100644
--- a/audio/festvox-cmu_us_slt_arctic/Makefile
+++ b/audio/festvox-cmu_us_slt_arctic/Makefile
@@ -1,15 +1,46 @@
-# Created by: ?
 # $FreeBSD$
 
-VOICE=	cmu_us_slt_arctic
-PORTREVISION=	0
+PORTNAME=	festvox-${VOICE}
+PORTVERSION=	0.95
+CATEGORIES=	audio
+MASTER_SITES=	http://www.speech.cs.cmu.edu/cmu_arctic/packed/
+DISTNAME=	${VOICE}-${PORTVERSION}-release
+DIST_SUBDIR=	festival
 
-COMMENT=	English female voice for festival
+MAINTAINER=	mike.d.ft402@gmail.com
+COMMENT?=	CMU US English female voice for festival
 
-MASTERDIR=	${.CURDIR}/../festvox-cmu_us_slt_arctic
-DESCR=	${.CURDIR}/pkg-descr
+LICENSE=	MIT-variant
+LICENSE_NAME=	MIT License (CMU variant)
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
+
+RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
+	${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu \
+	${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex
+
+USES=	tar:bzip2
+
+WRKSRC=	${WRKDIR}/${VOICE}
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST+=	VOICE=${VOICE}
+
+DATADIR=	${PREFIX}/share/festival/lib/voices/us/${VOICE}_clunits
+PORTDATA?=	*
+
+VOICE?=	cmu_us_slt_arctic
+
+DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
-PLIST=	${.CURDIR}/pkg-plist
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
-.include "${MASTERDIR}/Makefile.common"
+do-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	${RM} ${STAGEDIR}${DATADIR}/.time-stamp
+	${FIND} ${STAGEDIR}${DATADIR} -type d -empty -delete
+
+.include <bsd.port.mk>
diff --git a/audio/festvox-cmu_us_slt_arctic/Makefile.common b/audio/festvox-cmu_us_slt_arctic/Makefile.common
deleted file mode 100644
index d85527adfe3f..000000000000
--- a/audio/festvox-cmu_us_slt_arctic/Makefile.common
+++ /dev/null
@@ -1,40 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	festvox-${VOICE}
-PORTVERSION=	0.95
-CATEGORIES=	audio
-MASTER_SITES=	http://www.speech.cs.cmu.edu/cmu_arctic/packed/
-DISTNAME=	${VOICE}-${PORTVERSION}-release
-DIST_SUBDIR=	festival
-
-MAINTAINER=	mike.d.ft402@gmail.com
-COMMENT=	English (US) voice for festival
-
-LICENSE=	cmu
-LICENSE_NAME=	cmu license
-LICENSE_FILE=	${WRKSRC}/COPYING
-LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
-
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
-	${PREFIX}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu \
-	${PREFIX}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex
-
-USES=	tar:bzip2
-
-WRKSRC=	${WRKDIR}/${VOICE}
-
-NO_BUILD=	yes
-NO_ARCH=	yes
-
-FHOME=	${PREFIX}/share/festival/lib/voices/us/${VOICE}_clunits
-
-do-install:
-	${MKDIR} ${STAGEDIR}${FHOME}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FHOME}
-.for dir in ${NODIRS}
-	${RMDIR} ${STAGEDIR}${FHOME}/${dir}
-.endfor
-	( cd ${STAGEDIR}${PREFIX} && ${FIND} . -type f ) | ${SORT} | \
-	${SED} -e 's|^\.\/||' >> ${TMPPLIST}
-
-.include <bsd.port.mk>
diff --git a/audio/festvox-cmu_us_awb_arctic/pkg-message b/audio/festvox-cmu_us_slt_arctic/files/pkg-message.in
index dce2efb0d859..7bdd9726679c 100644
--- a/audio/festvox-cmu_us_awb_arctic/pkg-message
+++ b/audio/festvox-cmu_us_slt_arctic/files/pkg-message.in
@@ -1,5 +1,5 @@
-===============================================================================
-For correct operation, please add cmu_us_awb_arctic_clunits
+==========================================================================
+For correct operation, please add %%VOICE%%_clunits
 after "(defvar default-voice-priority-list"
-in ${PREFIX}/share/festival/lib/voices.scm
-===============================================================================
+in %%PREFIX%%/share/festival/lib/voices.scm
+==========================================================================
diff --git a/audio/festvox-cmu_us_slt_arctic/pkg-descr b/audio/festvox-cmu_us_slt_arctic/pkg-descr
index 9500cb18df08..cae5220b4292 100644
--- a/audio/festvox-cmu_us_slt_arctic/pkg-descr
+++ b/audio/festvox-cmu_us_slt_arctic/pkg-descr
@@ -1,4 +1,8 @@
-English female voice for festival.
+US English female voice by the Language Technologies Institute at
+Carnegie Mellon University constructed from phonetically balanced,
+US English single speaker database designed for unit selection
+speech synthesis research.
+
 (voice_cmu_us_slt_arctic_clunits)
 
-WWW: http://www.speech.cs.cmu.edu/
+WWW: http://festvox.org/cmu_arctic/dbs_slt.html
diff --git a/audio/festvox-cmu_us_slt_arctic/pkg-message b/audio/festvox-cmu_us_slt_arctic/pkg-message
deleted file mode 100644
index 5828eac4fac7..000000000000
--- a/audio/festvox-cmu_us_slt_arctic/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-===============================================================================
-For correct operation, please add cmu_us_slt_arctic_clunits
-after "(defvar default-voice-priority-list"
-in ${PREFIX}/share/festival/lib/voices.scm
-===============================================================================