[arch-commits] Commit in flite/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Wednesday, July 29, 2009 @ 16:32:57
  Author: eric
Revision: 47947

fixed svn conflicts

Modified:
  flite/repos/extra-x86_64/	(properties)
  flite/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)


Property changes on: flite/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /flite/trunk:1
   + /flite/trunk:1-47946

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-29 20:22:45 UTC (rev 47946)
+++ extra-x86_64/PKGBUILD	2009-07-29 20:32:57 UTC (rev 47947)
@@ -2,29 +2,32 @@
 # Maintainer: Simo Leone <simo at archlinux.org>
 pkgname=flite
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A lighweight version of festival speech synthesis"
-arch=(i686 x86_64)
-url="http://fife.speech.cs.cmu.edu/flite/"
-license=""
+arch=('i686' 'x86_64')
+url="http://www.speech.cs.cmu.edu/flite/"
+license=('custom')
 depends=('glibc')
-source=(http://fife.speech.cs.cmu.edu/flite/packed/$pkgname-$pkgver/$pkgname-$pkgver-release.tar.gz)
+source=(http://www.speech.cs.cmu.edu/flite/packed/${pkgname}-${pkgver}/${pkgname}-${pkgver}-release.tar.gz)
 md5sums=('ae0aca1cb7b4801f4372f3a75a9e52b5')
+sha1sums=('233144a772de72741ae1aa2292f672c30224afb3')
 
 build() {
-  export MAKEFLAGS="-j1"
-  cd $startdir/src/$pkgname-$pkgver-release
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}-release"
+  ./configure --prefix=/usr || return 1
 
   #we want the 16k, not 8k voice
-  sed -i 's/cmu_us_kal/cmu_us_kal16/' config/config
+  sed -i 's/cmu_us_kal/cmu_us_kal16/' config/config || return 1
   
   make || return 1
   
-if [ "$CARCH" = "x86_64" ]; then
   #Ugly hack for bad makefile (lib isn't a dir)
-  sed -i 's#@ $(MAKE) -C lib --no-print-directory install#$(INSTALL) -m 644 build/x86_64-linux-gnu/lib/*.a $(INSTALLLIBDIR)#g' Makefile
-  else   sed -i 's#@ $(MAKE) -C lib --no-print-directory install#$(INSTALL) -m 644 build/i386-linux-gnu/lib/*.a $(INSTALLLIBDIR)#g' Makefile
-fi
-  make prefix=$startdir/pkg/usr install
+  if [ "$CARCH" = "i686" ]; then
+    sed -i 's#@ $(MAKE) -C lib --no-print-directory install#$(INSTALL) -m 644 build/i386-linux-gnu/lib/*.a $(INSTALLLIBDIR)#g' Makefile || return 1
+  else
+    sed -i 's#@ $(MAKE) -C lib --no-print-directory install#$(INSTALL) -m 644 build/x86_64-linux-gnu/lib/*.a $(INSTALLLIBDIR)#g' Makefile || return 1
+  fi
+
+  make prefix="${pkgdir}/usr" install || return 1
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }