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

[Eric Bélanger]

    Date: Friday, March 20, 2009 @ 21:10:09
  Author: eric
Revision: 30594

Fixed svn conflict

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

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-21 01:08:43 UTC (rev 30593)
+++ extra-x86_64/PKGBUILD	2009-03-21 01:10:09 UTC (rev 30594)
@@ -4,19 +4,21 @@
 
 pkgname=wmix
 pkgver=3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Dockapp mixer for OSS or ALSA"
-arch=(i686 x86_64)
-source=(http://www.ne.jp/asahi/linux/timecop/software/$pkgname-$pkgver.tar.gz)
+arch=('i686' 'x86_64')
 url="http://www.ne.jp/asahi/linux/timecop/"
+license=('GPL')
 depends=('libxpm')
+source=(http://www.ne.jp/asahi/linux/timecop/software/$pkgname-$pkgver.tar.gz)
 md5sums=('62f6e86f7558f193e081dc29444a6699')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/bin
+  cd $srcdir/$pkgname-$pkgver
+  install -d $pkgdir/usr/bin
   #  Fix version.
-  sed -e '/^#define VERSION/ s/3\.0/3.1/' -e 's/wmix 3\.0/wmix 3.1/' -i wmix.c
+  sed -e '/^#define VERSION/ s/3\.0/3.1/' -e 's/wmix 3\.0/wmix 3.1/' -i wmix.c || return 1
   make || return 1
-  make PREFIX=$startdir/pkg/usr install
+  make PREFIX=$pkgdir/usr install || return 1
+  install -D -m644 wmix.1x.gz $pkgdir/usr/share/man/man1/wmix.1x.gz || return 1
 }