From f6213dce35827db37102c50caa1ea7db04933003 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 31 Jul 2015 13:15:33 -0400 Subject: [PATCH] flite: Get rid of the exotic PROVIDES* setup. I get that the author of this recipe was trying to be clever, but all it does is confuse both the people trying to maintain this recipe *and* the Kitchen's dependency tracker. --- app-accessibility/flite/flite-2.0.0.recipe | 121 ++++++++++----------- 1 file changed, 59 insertions(+), 62 deletions(-) diff --git a/app-accessibility/flite/flite-2.0.0.recipe b/app-accessibility/flite/flite-2.0.0.recipe index 69d1c195f..48488f099 100644 --- a/app-accessibility/flite/flite-2.0.0.recipe +++ b/app-accessibility/flite/flite-2.0.0.recipe @@ -3,21 +3,9 @@ DESCRIPTION="Flite is a text-to-speech engine developed by the Carnegie \ Mellon University. As a light-weight alternative to the Festival engine, it \ is desinged to fit into small embedded machines as well as large-scale \ servers. In addition to its native format flite supports voices generated by \ -the FestVox project as well. -" +the FestVox project as well." HOMEPAGE="http://www.festvox.org/flite/" -SOURCE_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2" -CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411" -SOURCE_DIR="flite-${portVersion}-release" -REVISION="1" - -# Although individually many files have different licenses, as a whole this -# license covers all the files. -LICENSE=" - Flite - " -COPYRIGHT=" - 1986 University of Toronto +COPYRIGHT="1986 University of Toronto 1992, 1995 Markus Mummert 1996-2004 University of Edinburgh, UK 1999-2014 Language Technologies Institute, Carnegie Mellon University @@ -25,61 +13,61 @@ COPYRIGHT=" 2001 Sun Microsystems, Inc. 2003-2004 Nagoya Institute of Technology 2003-2004 Nara Institute of Science and Technology - 2008-2012 University of Illinois at Urbana-Champaign - " + 2008-2012 University of Illinois at Urbana-Champaign" +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE="Flite" +SOURCE_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2" +CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411" +SOURCE_DIR="flite-${portVersion}-release" +PATCHES="flite-$portVersion.patchset" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" -EXTRA_CMD=" - cmu_time_awb - cmu_us_awb - cmu_us_kal - cmu_us_kal16 - cmu_us_rms - cmu_us_slt - " -EXTRA_LIBS=" - cmu_grapheme_lang - cmu_grapheme_lex - cmu_indic_lang - cmu_indic_lex - $EXTRA_CMD - cmulex - usenglish - " PROVIDES=" flite$secondaryArchSuffix = $portVersion - lib:libflite$secondaryArchSuffix = $portVersion compat >= 2 flite_tools = $portVersion cmd:flite$secondaryArchSuffix = $portVersion cmd:flite_time$secondaryArchSuffix = $portVersion + cmd:flite_cmu_time_awb = $portVersion + cmd:flite_cmu_us_awb = $portVersion + cmd:flite_cmu_us_kal = $portVersion + cmd:flite_cmu_us_kal16 = $portVersion + cmd:flite_cmu_us_rms = $portVersion + cmd:flite_cmu_us_slt = $portVersion + lib:libflite$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_grapheme_lang$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_grapheme_lex$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_indic_lang$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_indic_lex$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_time_awb$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_us_awb$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_us_kal$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_us_kal16$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_us_rms$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmu_us_slt$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_cmulex$secondaryArchSuffix = $portVersion compat >= 2 + lib:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2 " -DEVEL_LIBS="libflite" -for c in $EXTRA_CMD; do - PROVIDES=" - $PROVIDES - cmd:flite_${c} = $portVersion - " -done PROVIDES_devel=" flite${secondaryArchSuffix}_devel = $portVersion devel:libflite$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_grapheme_lang$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_grapheme_lex$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_indic_lang$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_indic_lex$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_time_awb$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_us_awb$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_us_kal$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_us_kal16$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_us_rms$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmu_us_slt$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_cmulex$secondaryArchSuffix = $portVersion compat >= 2 + devel:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2 " -for l in $EXTRA_LIBS; do - PROVIDES=" - $PROVIDES - lib:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 - " - PROVIDES_devel=" - $PROVIDES_devel - devel:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 - " - DEVEL_LIBS=" - $DEVEL_LIBS - libflite_${l} - " -done + REQUIRES=" haiku$secondaryArchSuffix " @@ -87,6 +75,7 @@ REQUIRES_devel=" haiku${secondaryArchSuffix}_devel flite$secondaryArchSuffix == $portVersion base " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -98,13 +87,10 @@ BUILD_PREREQUIRES=" cmd:make " -PATCHES="flite-${portVersion}.patchset" - BUILD() { autoconf - runConfigure ./configure \ - --enable-shared + runConfigure ./configure --enable-shared make $jobArgs } @@ -112,7 +98,18 @@ INSTALL() { make install prepareInstalledDevelLibs \ - $DEVEL_LIBS - packageEntries devel \ - $developDir + libflite \ + libflite_cmu_grapheme_lang \ + libflite_cmu_grapheme_lex \ + libflite_cmu_indic_lang \ + libflite_cmu_indic_lex \ + libflite_cmu_time_awb \ + libflite_cmu_us_awb \ + libflite_cmu_us_kal \ + libflite_cmu_us_kal16 \ + libflite_cmu_us_rms \ + libflite_cmu_us_slt \ + libflite_cmulex \ + libflite_usenglish + packageEntries devel $developDir }