Date: Saturday, June 18, 2011 @ 20:11:13
  Author: eric
Revision: 127865

upgpkg: festival 2.1-2
Added missing example binaries (close FS#24650), PKGBUILD cleanup

Modified:
  festival/trunk/PKGBUILD

----------+
 PKGBUILD |   78 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-06-18 22:48:26 UTC (rev 127864)
+++ PKGBUILD    2011-06-19 00:11:13 UTC (rev 127865)
@@ -6,7 +6,7 @@
 pkgname=festival
 pkgver=2.1
 _suffix=release
-pkgrel=1
+pkgrel=2
 pkgdesc="A general multi-lingual speech synthesis system"
 arch=('i686' 'x86_64')
 url="http://www.cstr.ed.ac.uk/projects/festival/";
@@ -30,17 +30,17 @@
 
 build() {
        # Build Speech Tools first
-       cd $srcdir/speech_tools
-       patch -Np1 -i $srcdir/speechconfig.patch
+       cd "$srcdir/speech_tools"
+       patch -Np1 -i "$srcdir/speechconfig.patch"
 
        ./configure --prefix=/usr --sysconfdir=/etc
        make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 
        # Build Festival itself
-       cd $srcdir/festival
-       patch -Np1 -i $srcdir/festconfig.patch
+       cd "$srcdir/festival"
+       patch -Np1 -i "$srcdir/festconfig.patch"
 
-       # Aviod make failure on making scripts and docs
+       # Avoid make failure on making scripts and docs
        sed -i "s#examples bin doc#examples#" Makefile
 
        ./configure --prefix=/usr --sysconfdir=/etc
@@ -49,62 +49,72 @@
 
 package() {
        # Install Speech Tools first
-       cd $srcdir/speech_tools
-       install -dm755 
$pkgdir/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
+       cd "$srcdir/speech_tools"
+       install -dm755 
"$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
 
        #binaries
        #move binaries over wrappers (FS#7864)
-       for i in `grep -l 'EST shared script' bin/*`; do
+       for i in $(grep -l 'EST shared script' bin/*); do
                cp -f main/$(basename $i) bin;
        done
-       install -m755 -t $pkgdir/usr/bin bin/[a-z]*
-       rm -f $pkgdir/usr/bin/{est_gdb,est_examples,est_program}
+       install -m755 -t "$pkgdir"/usr/bin bin/[a-z]*
+       rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program}
 
        #libraries
-       install -m755 -t $pkgdir/usr/lib lib/lib*.so.*
-       ln -sf libestbase.so.${pkgver}.1 $pkgdir/usr/lib/libestbase.so
-       ln -sf libeststring.so.1.2 $pkgdir/usr/lib/libeststring.so
-       install -m644 -t $pkgdir/usr/lib lib/lib*.a
+       install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.*
+       ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
+       ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
+       install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
 
        #headers
        for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
-         install -m644 -t ${pkgdir}/usr/include/speech_tools/$dir 
include/$dir/*.h
+         install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir 
include/$dir/*.h
        done
 
        # Install Festival itself
-       cd $srcdir/festival
+       cd "$srcdir"/festival
 
        #binaries
-       install -m755 src/main/festival $pkgdir/usr/bin/
-       install -m755 src/main/festival_client $pkgdir/usr/bin/
-       install -m755 examples/text2wave $pkgdir/usr/bin
-       install -m755 examples/saytime $pkgdir/usr/bin/
+       install -m755 src/main/festival "$pkgdir"/usr/bin/
+       install -m755 src/main/festival_client "$pkgdir"/usr/bin/
+       install -m755 examples/benchmark "$pkgdir"/usr/bin/
+       install -m755 examples/dumpfeats "$pkgdir"/usr/bin/
+       install -m755 examples/durmeanstd "$pkgdir"/usr/bin/
+       install -m755 examples/latest "$pkgdir"/usr/bin/
+       install -m755 examples/make_utts "$pkgdir"/usr/bin/
+       install -m755 examples/powmeanstd "$pkgdir"/usr/bin/
+       install -m755 examples/run-festival-script "$pkgdir"/usr/bin/
+       install -m755 examples/saytime "$pkgdir"/usr/bin/
+       install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/
+       install -m755 examples/text2pos "$pkgdir"/usr/bin/
+       install -m755 examples/text2wave "$pkgdir"/usr/bin
 
        #libraries
-       install -m644 src/lib/libFestival.a $pkgdir/usr/lib/
+       install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
 
        #headers
-       install -dm755 $pkgdir/usr/include/festival
-       install -m644 -t $pkgdir/usr/include/festival src/include/*.h
+       install -dm755 "$pkgdir"/usr/include/festival
+       install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h
 
-       mkdir -p $pkgdir/usr/share/festival
-       #install -m644 -t $pkgdir/usr/share/festival lib/*.scm
+       mkdir -p "$pkgdir"/usr/share/festival
+       #install -m644 -t "$pkgdir"/usr/share/festival lib/*.scm
        #need to clean up but requires knowing which files are actually 
needed...
-       cp -aR lib/* $pkgdir/usr/share/festival
-       rm -f $(find $pkgdir/usr/share/festival -name Makefile)
+       cp -aR lib/* "$pkgdir"/usr/share/festival
+       rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
+       rm -f $(find "$pkgdir"/usr/bin -name Makefile)
 
        #create voices directory
-       install -dm755 $pkgdir/usr/share/festival/voices
+       install -dm755 "$pkgdir"/usr/share/festival/voices
 
        #licenses
-       install -D -m644 $srcdir/festival/COPYING \
-                        $pkgdir/usr/share/licenses/$pkgname/LICENSE
-       install -D -m644 $srcdir/speech_tools/README \
-                        $pkgdir/usr/share/licenses/$pkgname/LICENSE.other
+       install -D -m644 "$srcdir"/festival/COPYING \
+                        "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+       install -D -m644 "$srcdir"/speech_tools/README \
+                        "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other
 
        #################################################################
        # Ok now some general cleanups
-       for i in `find $pkgdir/usr/include/ -type f`; do
+       for i in $(find "$pkgdir"/usr/include/ -type f); do
                sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 
's,speech_tools/\",speech_tools/,g' \
                -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 
's,speech_tools/\",speech_tools/,g' \
                -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 
's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 
's,"instantiate,instantiate,g' \

Reply via email to