[arch-commits] Commit in festival/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Monday, November 25, 2013 @ 04:55:25
  Author: eric
Revision: 200302

Add prepare function, PKGBUILD clean up

Modified:
  festival/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-25 03:50:15 UTC (rev 200301)
+++ PKGBUILD	2013-11-25 03:55:25 UTC (rev 200302)
@@ -5,7 +5,6 @@
 
 pkgname=festival
 pkgver=2.1
-_suffix=release
 pkgrel=3
 pkgdesc="A general multi-lingual speech synthesis system"
 arch=('i686' 'x86_64')
@@ -13,8 +12,8 @@
 license=('BSD' 'GPL' 'custom')
 depends=('perl')
 options=('!makeflags')
-source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz"
-        "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz"
+source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-release.tar.gz"
+        "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-release.tar.gz"
 	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
 	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
 	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
@@ -30,29 +29,33 @@
          '348cc033430aee7989463198818ae74c'
          '46132b1cd86a982007312def49ab176a')
 
-build() {
+prepare() {
   cd "$srcdir"
-  patch -Np0 -i "$srcdir/festival-shared-build.patch"
+  patch -p0 -i "$srcdir/festival-shared-build.patch"
+  cd "$srcdir/speech_tools"
+  patch -p1 -i "$srcdir/speechconfig.patch"
 
+  cd "$srcdir/festival"
+  patch -p1 -i "$srcdir/festconfig.patch"
+
+  # Avoid make failure on making scripts and docs
+  sed -i "s#examples bin doc#examples#" Makefile
+}
+
+build() {
   # Build Speech Tools first
   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"
-
-  # Avoid make failure on making scripts and docs
-  sed -i "s#examples bin doc#examples#" Makefile
-
   ./configure --prefix=/usr --sysconfdir=/etc
   make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 }
 
 package() {
- # Install Speech Tools first
+  # Install Speech Tools first
   cd "$srcdir/speech_tools"
   install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}