Index: audio/festvox-cmu_us_slt_arctic/Makefile
===================================================================
--- audio/festvox-cmu_us_slt_arctic/Makefile	(revision 402816)
+++ audio/festvox-cmu_us_slt_arctic/Makefile	(working copy)
@@ -1,15 +1,7 @@
-# Created by: ?
 # $FreeBSD$
 
 VOICE=	cmu_us_slt_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
-
-.include "${MASTERDIR}/Makefile.common"
+.include "./Makefile.common"
Index: audio/festvox-cmu_us_slt_arctic/Makefile.common
===================================================================
--- audio/festvox-cmu_us_slt_arctic/Makefile.common	(revision 402816)
+++ audio/festvox-cmu_us_slt_arctic/Makefile.common	(working copy)
@@ -8,16 +8,16 @@
 DIST_SUBDIR=	festival
 
 MAINTAINER=	mike.d.ft402@gmail.com
-COMMENT=	English (US) voice for festival
+COMMENT=	CMU US English voice for festival
 
-LICENSE=	cmu
-LICENSE_NAME=	cmu license
+LICENSE=	MIT-variant
+LICENSE_NAME=	MIT License (CMU variant)
 LICENSE_FILE=	${WRKSRC}/COPYING
-LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
 
 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
+	${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
 
@@ -26,15 +26,19 @@
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-FHOME=	${PREFIX}/share/festival/lib/voices/us/${VOICE}_clunits
+SUB_FILES=	pkg-message
+SUB_LIST+=	VOICE=${VOICE}
 
+DATADIR=	${PREFIX}/share/festival/lib/voices/us/${VOICE}_clunits
+PORTDATA=	* .time-stamp
+
+DESCR=  ${.CURDIR}/pkg-descr
+DISTINFO_FILE=  ${.CURDIR}/distinfo
+PLIST=  ${.CURDIR}/pkg-plist
+PKGMESSAGE=     ${.CURDIR}/pkg-message
+
 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}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	${FIND} ${STAGEDIR}${DATADIR} -type d -empty -delete
 
 .include <bsd.port.mk>
Index: audio/festvox-cmu_us_slt_arctic/files/pkg-message.in
===================================================================
--- audio/festvox-cmu_us_slt_arctic/files/pkg-message.in	(revision 402816)
+++ audio/festvox-cmu_us_slt_arctic/files/pkg-message.in	(working copy)
@@ -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
 ===============================================================================
Index: audio/festvox-cmu_us_slt_arctic/pkg-descr
===================================================================
--- audio/festvox-cmu_us_slt_arctic/pkg-descr	(revision 402816)
+++ audio/festvox-cmu_us_slt_arctic/pkg-descr	(working copy)
@@ -1,4 +1,7 @@
-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
Index: audio/festvox-cmu_us_slt_arctic/pkg-message
===================================================================
--- audio/festvox-cmu_us_slt_arctic/pkg-message	(revision 402816)
+++ audio/festvox-cmu_us_slt_arctic/pkg-message	(nonexistent)
@@ -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
-===============================================================================

Property changes on: audio/festvox-cmu_us_slt_arctic/pkg-message
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property