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

[Thayer Williams]

    Date: Monday, November 17, 2008 @ 18:27:50
  Author: thayer
Revision: 19252

Merged revisions 18936,19250 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/dmenu/trunk

........
  r18936 | thayer | 2008-11-11 17:49:12 -0800 (Tue, 11 Nov 2008) | 2 lines
  
  upgpkg: dmenu 3.9-2
      added libxinerama dep for i686
........
  r19250 | thayer | 2008-11-17 15:25:25 -0800 (Mon, 17 Nov 2008) | 1 line
  
  pkgbuild cleanup
........

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

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


Property changes on: dmenu/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /dmenu/trunk:1-18629
   + /dmenu/trunk:1-19251

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-17 23:27:08 UTC (rev 19251)
+++ extra-x86_64/PKGBUILD	2008-11-17 23:27:50 UTC (rev 19252)
@@ -4,7 +4,7 @@
 
 pkgname=dmenu
 pkgver=3.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Dynamic X menu"
 url="http://www.suckless.org/programs/dmenu.html"
 arch=('i686' 'x86_64')
@@ -17,13 +17,13 @@
 
 build()
 {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 < ../dmenu.patch
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 < $srcdir/dmenu.patch || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install || return 1
 
   #install license
-  mkdir -p $startdir/pkg/usr/share/licenses/$pkgname
-  cp LICENSE $startdir/pkg/usr/share/licenses/$pkgname/
+  mkdir -p $pkgdir/usr/share/licenses/$pkgname
+  cp LICENSE $pkgdir/usr/share/licenses/$pkgname/
 }