Date: Sunday, April 11, 2010 @ 16:17:06 Author: thayer Revision: 77290
upgpkg: dmenu 4.0-2 Remove unnecessary makefile patch Modified: dmenu/trunk/PKGBUILD Deleted: dmenu/trunk/dmenu.patch -------------+ PKGBUILD | 18 +++++++----------- dmenu.patch | 17 ----------------- 2 files changed, 7 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-04-11 19:57:13 UTC (rev 77289) +++ PKGBUILD 2010-04-11 20:17:06 UTC (rev 77290) @@ -1,30 +1,26 @@ # $Id$ -# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org> # Maintainer: Thayer Williams <tha...@archlinux.org> +# Contributor: Jeff 'codemac' Mickey <j...@archlinux.org> pkgname=dmenu pkgver=4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Dynamic X menu" url="http://www.suckless.org/programs/dmenu.html" arch=('i686' 'x86_64') license=('MIT') depends=('libx11' 'libxinerama') makedepends=('xineramaproto') -source=(http://code.suckless.org/dl/tools/$pkgname-$pkgver.tar.gz - dmenu.patch) -md5sums=('66e761a653930cc8a21614ba9fedf903' - 'd74a6665a19cb0403720f1f3abcd280d') +source=(http://code.suckless.org/dl/tools/$pkgname-$pkgver.tar.gz) +md5sums=('66e761a653930cc8a21614ba9fedf903') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 < $srcdir/dmenu.patch || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 || return 1 + make PREFIX=/usr DESTDIR=$pkgdir install || return 1 #install license - mkdir -p $pkgdir/usr/share/licenses/$pkgname - cp LICENSE $pkgdir/usr/share/licenses/$pkgname/ + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } Deleted: dmenu.patch =================================================================== --- dmenu.patch 2010-04-11 19:57:13 UTC (rev 77289) +++ dmenu.patch 2010-04-11 20:17:06 UTC (rev 77290) @@ -1,17 +0,0 @@ ---- dmenu-3.9.orig/config.mk 2008-09-13 20:45:32.000000000 -0300 -+++ dmenu-3.9/config.mk 2008-09-13 20:46:42.000000000 -0300 -@@ -4,11 +4,11 @@ VERSION = 3.9 - # Customize below to fit your system - - # paths --PREFIX = /usr/local -+PREFIX = /usr - MANPREFIX = ${PREFIX}/share/man - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = /usr/include/X11 -+X11LIB = /usr/lib/X11 - - # Xinerama, comment if you don't want it - XINERAMALIBS = -L${X11LIB} -lXinerama