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

[Ronald van Haren]

    Date: Thursday, November 13, 2008 @ 05:37:23
  Author: ronald
Revision: 18981

fix svn merge error

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

----------+
 PKGBUILD |   32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)


Property changes on: sox/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /sox/trunk:1
   + /sox/trunk:1-18980

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-13 10:35:18 UTC (rev 18980)
+++ extra-x86_64/PKGBUILD	2008-11-13 10:37:23 UTC (rev 18981)
@@ -1,32 +1,28 @@
 # $Id$
-# Maintainer: dale <dale at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: dale <dale at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
 pkgname=sox
-pkgver=14.0.0
-pkgrel=2
+pkgver=14.2.0
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libtool>=2.2' 'ffmpeg' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib' 'libsndfile' 'libsamplerate')
+depends=('ffmpeg' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib' 'libsndfile' 'libsamplerate')
 url="http://sox.sourceforge.net/"
-source=(http://easynews.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz amr.h)
-md5sums=('c0c242fb2760cea9dc30de884eb1facc'
-         '85271d1c2bab23980adf9e71084f4d1b')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 options=(!libtool)
+md5sums=('7afc0e85d14be014f08e7d3b7ee8c24e')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc
-	# fix for missing amr.h in 14.0.0 tarball
-	cp $startdir/src/amr.h $startdir/src/$pkgname-$pkgver/src || return 1
+	cd $srcdir/$pkgname-$pkgver
+	
+ 	./configure --prefix=/usr --sysconfdir=/etc
+	
 	make || return 1
-	make prefix=$startdir/pkg/usr install
+	make DESTDIR=$pkgdir install || return 1
 	cd $startdir/pkg/usr/bin
 	rm -f rec
 	ln -sf play rec
-	cd $startdir/pkg/usr/share/man/man1
-	# looks like man pages are OK by themselves now.
-	# rm -f rec.1 soxmix.1
-	# ln -s play.1 rec.1
-	# ln -s sox.1.gz soxmix.1
 }