- Remove USE_AUTOCONF, which is a noop

- Use DATADIR

PR:		ports/114324
Submitted by:	gabor
Approved by:	maintainer timeout

2 files changed, 148 insertions, 150 deletions

diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index a19ff124889c..1fd99200364e 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -25,11 +25,9 @@ OPTIONS=	NAS "Enable Network Audio System (NAS) backend" on \
 DIST_SUBDIR=	festival
 
 CONFIGURE_WRKSRC=	${WRKDIR}/festival
-USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 SPEECHTOOLS=	${WRKSRC}/speech_tools
 FESTIVAL=	${WRKSRC}/festival
-FHOME=		${PREFIX}/share/festival
 MAKE_ENV+=	GCC="${CC}" \
 		GXX="${CXX}" \
 		EST_HOME=${SPEECHTOOLS} \
@@ -90,25 +88,25 @@ do-configure:
 		${LN} -s gcc_defaults.mak ${WRKDIR}/speech_tools/config/compilers/${CC}.mak
 
 do-install:
-	${MKDIR} ${FHOME}/lib/voices/english/
-	${MKDIR} ${FHOME}/lib/voices/spanish/
-	${MKDIR} ${FHOME}/lib/dicts
+	${MKDIR} ${DATADIR}/lib/voices/english/
+	${MKDIR} ${DATADIR}/lib/voices/spanish/
+	${MKDIR} ${DATADIR}/lib/dicts
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	${FIND} ${FESTIVAL}/lib -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	cd ${FESTIVAL} && ${CP} -pPR lib examples ${FHOME}
-	${RM} -rf ${FHOME}/lib/etc/Makefile ${FHOME}/lib/etc/*FreeBSD* \
-	    ${FHOME}/lib/etc/*unknown
+	cd ${FESTIVAL} && ${CP} -pPR lib examples ${DATADIR}
+	${RM} -rf ${DATADIR}/lib/etc/Makefile ${DATADIR}/lib/etc/*FreeBSD* \
+	    ${DATADIR}/lib/etc/*unknown
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/audsp ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked
 	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival_client ${PREFIX}/libexec/festival_client.naked
 	for n in festival.sh festival_client.sh sitevars.scm; \
 	do {\
-	  ${SED} "s%@PKG_FESTIVAL_LOCATION@%${FHOME}%; \
+	  ${SED} "s%@PKG_FESTIVAL_LOCATION@%${DATADIR}%; \
 	       s%@PKG_PREFIX@%${PREFIX}%" <${FILESDIR}/$$n > ${WRKDIR}/$$n ;} \
 	done
 	${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival
 	${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client
-	${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${FHOME}/lib/sitevars.scm
+	${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${DATADIR}/lib/sitevars.scm
 	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/man/man1/festival.1
 	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
 	${CAT} ${PKGMESSAGE}
diff --git a/audio/festival/pkg-plist b/audio/festival/pkg-plist
index 02a66d4a2b01..f3b8d86d811a 100644
--- a/audio/festival/pkg-plist
+++ b/audio/festival/pkg-plist
@@ -4,143 +4,143 @@ bin/festival_client
 libexec/audsp
 libexec/festival.naked
 libexec/festival_client.naked
-share/festival/examples/Makefile
-share/festival/examples/addr-mode.scm
-share/festival/examples/apml.dtd
-share/festival/examples/benchmark
-share/festival/examples/benchmark.text
-share/festival/examples/dumpfeats
-share/festival/examples/dumpfeats.sh
-share/festival/examples/durmeanstd
-share/festival/examples/durmeanstd.sh
-share/festival/examples/ex1.email
-share/festival/examples/ex1.ogi
-share/festival/examples/example.apml
-share/festival/examples/example.sable
-share/festival/examples/example.th
-share/festival/examples/example2.sable
-share/festival/examples/festival_client.c
-share/festival/examples/festival_client.h
-share/festival/examples/festival_client.pl
-share/festival/examples/intro.text
-share/festival/examples/latest
-share/festival/examples/latest.sh
-share/festival/examples/make_utts
-share/festival/examples/make_utts.sh
-share/festival/examples/powmeanstd
-share/festival/examples/powmeanstd.sh
-share/festival/examples/saytime
-share/festival/examples/saytime.sh
-share/festival/examples/scfg_parse_text
-share/festival/examples/scfg_parse_text.sh
-share/festival/examples/songs/Makefile
-share/festival/examples/songs/america1.xml
-share/festival/examples/songs/america2.xml
-share/festival/examples/songs/america3.xml
-share/festival/examples/songs/america4.xml
-share/festival/examples/songs/daisy.xml
-share/festival/examples/songs/doremi.xml
-share/festival/examples/songs/lochlomond.xml
-share/festival/examples/songs/spice1.xml
-share/festival/examples/songs/spice2.xml
-share/festival/examples/songs/spice3.xml
-share/festival/examples/songs/spice4.xml
-share/festival/examples/speech_pm_1.0.tar
-share/festival/examples/spintro.text
-share/festival/examples/text2pos
-share/festival/examples/text2pos.sh
-share/festival/examples/text2wave
-share/festival/examples/text2wave.sh
-share/festival/examples/th-mode.scm
-share/festival/examples/tobi.stml
-share/festival/examples/toksearch.scm
-share/festival/examples/webdemo.scm
-share/festival/lib/Makefile
-share/festival/lib/Sable.v0_2.dtd
-share/festival/lib/Singing.v0_1.dtd
-share/festival/lib/VCLocalRules
-share/festival/lib/apml.scm
-share/festival/lib/apml_f2bf0lr.scm
-share/festival/lib/apml_kaldurtreeZ.scm
-share/festival/lib/cart_aux.scm
-share/festival/lib/clunits.scm
-share/festival/lib/clunits_build.scm
-share/festival/lib/cmusphinx2_phones.scm
-share/festival/lib/cslush.scm
-share/festival/lib/cstr.scm
-share/festival/lib/darpa_phones.scm
-share/festival/lib/display.scm
-share/festival/lib/duration.scm
-share/festival/lib/email-mode.scm
-share/festival/lib/engmorph.scm
-share/festival/lib/engmorphsyn.scm
-share/festival/lib/etc/email_filter
-share/festival/lib/f2bdurtreeZ.scm
-share/festival/lib/f2bf0lr.scm
-share/festival/lib/festdoc.scm
-share/festival/lib/festival.el
-share/festival/lib/festival.scm
-share/festival/lib/festtest.scm
-share/festival/lib/fringe.scm
-share/festival/lib/gswdurtreeZ.scm
-share/festival/lib/holmes_phones.scm
-share/festival/lib/hts.scm
-share/festival/lib/init.scm
-share/festival/lib/intonation.scm
-share/festival/lib/java.scm
-share/festival/lib/klatt_durs.scm
-share/festival/lib/languages.scm
-share/festival/lib/lexicons.scm
-share/festival/lib/lts.scm
-share/festival/lib/lts_build.scm
-share/festival/lib/mbrola.scm
-share/festival/lib/mettree.scm
-share/festival/lib/module_description.scm
-share/festival/lib/mrpa_allophones.scm
-share/festival/lib/mrpa_durs.scm
-share/festival/lib/mrpa_phones.scm
-share/festival/lib/multisyn/Makefile
-share/festival/lib/multisyn/multisyn.scm
-share/festival/lib/multisyn/multisyn_pauses.scm
-share/festival/lib/multisyn/radio_phones_multisyn.scm
-share/festival/lib/multisyn/send_xwaves.scm
-share/festival/lib/multisyn/target_cost.scm
-share/festival/lib/ogimarkup-mode.scm
-share/festival/lib/pauses.scm
-share/festival/lib/phoneset.scm
-share/festival/lib/phrase.scm
-share/festival/lib/pos.scm
-share/festival/lib/postlex.scm
-share/festival/lib/radio_phones.scm
-share/festival/lib/sable-latin.ent
-share/festival/lib/sable-mode.scm
-share/festival/lib/scfg.scm
-share/festival/lib/scfg_wsj_wp20.gram
-share/festival/lib/sec.B.hept.ngrambin
-share/festival/lib/sec.ts20.quad.ngrambin
-share/festival/lib/singing-mode.scm
-share/festival/lib/siod.scm
-share/festival/lib/siteinit.scm
-share/festival/lib/sitevars.scm
-share/festival/lib/soleml-mode.scm
-share/festival/lib/speech.properties
-share/festival/lib/synthesis.scm
-share/festival/lib/tilt.scm
-share/festival/lib/tobi.scm
-share/festival/lib/tobi_rules.scm
-share/festival/lib/token.scm
-share/festival/lib/tokenpos.scm
-share/festival/lib/tts.scm
-share/festival/lib/unilex_phones.scm
-share/festival/lib/voices.scm
-share/festival/lib/web.scm
-@dirrmtry share/festival/lib/voices/spanish
-@dirrmtry share/festival/lib/voices/english
-@dirrmtry share/festival/lib/voices
-@dirrm share/festival/lib/multisyn
-@dirrm share/festival/lib/etc
-@dirrmtry share/festival/lib/dicts
-@dirrmtry share/festival/lib
-@dirrm share/festival/examples/songs
-@dirrm share/festival/examples
-@dirrmtry share/festival
+%%DATADIR%%/examples/Makefile
+%%DATADIR%%/examples/addr-mode.scm
+%%DATADIR%%/examples/apml.dtd
+%%DATADIR%%/examples/benchmark
+%%DATADIR%%/examples/benchmark.text
+%%DATADIR%%/examples/dumpfeats
+%%DATADIR%%/examples/dumpfeats.sh
+%%DATADIR%%/examples/durmeanstd
+%%DATADIR%%/examples/durmeanstd.sh
+%%DATADIR%%/examples/ex1.email
+%%DATADIR%%/examples/ex1.ogi
+%%DATADIR%%/examples/example.apml
+%%DATADIR%%/examples/example.sable
+%%DATADIR%%/examples/example.th
+%%DATADIR%%/examples/example2.sable
+%%DATADIR%%/examples/festival_client.c
+%%DATADIR%%/examples/festival_client.h
+%%DATADIR%%/examples/festival_client.pl
+%%DATADIR%%/examples/intro.text
+%%DATADIR%%/examples/latest
+%%DATADIR%%/examples/latest.sh
+%%DATADIR%%/examples/make_utts
+%%DATADIR%%/examples/make_utts.sh
+%%DATADIR%%/examples/powmeanstd
+%%DATADIR%%/examples/powmeanstd.sh
+%%DATADIR%%/examples/saytime
+%%DATADIR%%/examples/saytime.sh
+%%DATADIR%%/examples/scfg_parse_text
+%%DATADIR%%/examples/scfg_parse_text.sh
+%%DATADIR%%/examples/songs/Makefile
+%%DATADIR%%/examples/songs/america1.xml
+%%DATADIR%%/examples/songs/america2.xml
+%%DATADIR%%/examples/songs/america3.xml
+%%DATADIR%%/examples/songs/america4.xml
+%%DATADIR%%/examples/songs/daisy.xml
+%%DATADIR%%/examples/songs/doremi.xml
+%%DATADIR%%/examples/songs/lochlomond.xml
+%%DATADIR%%/examples/songs/spice1.xml
+%%DATADIR%%/examples/songs/spice2.xml
+%%DATADIR%%/examples/songs/spice3.xml
+%%DATADIR%%/examples/songs/spice4.xml
+%%DATADIR%%/examples/speech_pm_1.0.tar
+%%DATADIR%%/examples/spintro.text
+%%DATADIR%%/examples/text2pos
+%%DATADIR%%/examples/text2pos.sh
+%%DATADIR%%/examples/text2wave
+%%DATADIR%%/examples/text2wave.sh
+%%DATADIR%%/examples/th-mode.scm
+%%DATADIR%%/examples/tobi.stml
+%%DATADIR%%/examples/toksearch.scm
+%%DATADIR%%/examples/webdemo.scm
+%%DATADIR%%/lib/Makefile
+%%DATADIR%%/lib/Sable.v0_2.dtd
+%%DATADIR%%/lib/Singing.v0_1.dtd
+%%DATADIR%%/lib/VCLocalRules
+%%DATADIR%%/lib/apml.scm
+%%DATADIR%%/lib/apml_f2bf0lr.scm
+%%DATADIR%%/lib/apml_kaldurtreeZ.scm
+%%DATADIR%%/lib/cart_aux.scm
+%%DATADIR%%/lib/clunits.scm
+%%DATADIR%%/lib/clunits_build.scm
+%%DATADIR%%/lib/cmusphinx2_phones.scm
+%%DATADIR%%/lib/cslush.scm
+%%DATADIR%%/lib/cstr.scm
+%%DATADIR%%/lib/darpa_phones.scm
+%%DATADIR%%/lib/display.scm
+%%DATADIR%%/lib/duration.scm
+%%DATADIR%%/lib/email-mode.scm
+%%DATADIR%%/lib/engmorph.scm
+%%DATADIR%%/lib/engmorphsyn.scm
+%%DATADIR%%/lib/etc/email_filter
+%%DATADIR%%/lib/f2bdurtreeZ.scm
+%%DATADIR%%/lib/f2bf0lr.scm
+%%DATADIR%%/lib/festdoc.scm
+%%DATADIR%%/lib/festival.el
+%%DATADIR%%/lib/festival.scm
+%%DATADIR%%/lib/festtest.scm
+%%DATADIR%%/lib/fringe.scm
+%%DATADIR%%/lib/gswdurtreeZ.scm
+%%DATADIR%%/lib/holmes_phones.scm
+%%DATADIR%%/lib/hts.scm
+%%DATADIR%%/lib/init.scm
+%%DATADIR%%/lib/intonation.scm
+%%DATADIR%%/lib/java.scm
+%%DATADIR%%/lib/klatt_durs.scm
+%%DATADIR%%/lib/languages.scm
+%%DATADIR%%/lib/lexicons.scm
+%%DATADIR%%/lib/lts.scm
+%%DATADIR%%/lib/lts_build.scm
+%%DATADIR%%/lib/mbrola.scm
+%%DATADIR%%/lib/mettree.scm
+%%DATADIR%%/lib/module_description.scm
+%%DATADIR%%/lib/mrpa_allophones.scm
+%%DATADIR%%/lib/mrpa_durs.scm
+%%DATADIR%%/lib/mrpa_phones.scm
+%%DATADIR%%/lib/multisyn/Makefile
+%%DATADIR%%/lib/multisyn/multisyn.scm
+%%DATADIR%%/lib/multisyn/multisyn_pauses.scm
+%%DATADIR%%/lib/multisyn/radio_phones_multisyn.scm
+%%DATADIR%%/lib/multisyn/send_xwaves.scm
+%%DATADIR%%/lib/multisyn/target_cost.scm
+%%DATADIR%%/lib/ogimarkup-mode.scm
+%%DATADIR%%/lib/pauses.scm
+%%DATADIR%%/lib/phoneset.scm
+%%DATADIR%%/lib/phrase.scm
+%%DATADIR%%/lib/pos.scm
+%%DATADIR%%/lib/postlex.scm
+%%DATADIR%%/lib/radio_phones.scm
+%%DATADIR%%/lib/sable-latin.ent
+%%DATADIR%%/lib/sable-mode.scm
+%%DATADIR%%/lib/scfg.scm
+%%DATADIR%%/lib/scfg_wsj_wp20.gram
+%%DATADIR%%/lib/sec.B.hept.ngrambin
+%%DATADIR%%/lib/sec.ts20.quad.ngrambin
+%%DATADIR%%/lib/singing-mode.scm
+%%DATADIR%%/lib/siod.scm
+%%DATADIR%%/lib/siteinit.scm
+%%DATADIR%%/lib/sitevars.scm
+%%DATADIR%%/lib/soleml-mode.scm
+%%DATADIR%%/lib/speech.properties
+%%DATADIR%%/lib/synthesis.scm
+%%DATADIR%%/lib/tilt.scm
+%%DATADIR%%/lib/tobi.scm
+%%DATADIR%%/lib/tobi_rules.scm
+%%DATADIR%%/lib/token.scm
+%%DATADIR%%/lib/tokenpos.scm
+%%DATADIR%%/lib/tts.scm
+%%DATADIR%%/lib/unilex_phones.scm
+%%DATADIR%%/lib/voices.scm
+%%DATADIR%%/lib/web.scm
+@dirrmtry %%DATADIR%%/lib/voices/spanish
+@dirrmtry %%DATADIR%%/lib/voices/english
+@dirrmtry %%DATADIR%%/lib/voices
+@dirrm %%DATADIR%%/lib/multisyn
+@dirrm %%DATADIR%%/lib/etc
+@dirrmtry %%DATADIR%%/lib/dicts
+@dirrmtry %%DATADIR%%/lib
+@dirrm %%DATADIR%%/examples/songs
+@dirrm %%DATADIR%%/examples
+@dirrmtry %%DATADIR%%