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

4 files changed, 49 insertions, 54 deletions

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_slt_arctic/pkg-message b/audio/festvox-cmu_us_slt_arctic/files/pkg-message.in
index 5828eac4fac7..7bdd9726679c 100644
--- a/audio/festvox-cmu_us_slt_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_slt_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