[arch-commits] CVS update of arch/build/x11/xorg-apps (PKGBUILD)

[Jan de Groot]

    Date: Thursday, May 3, 2007 @ 13:36:41
  Author: jgc
    Path: /home/cvs-arch/arch/build/x11/xorg-apps

Modified: PKGBUILD (1.7 -> 1.8)

upgpkg: xorg-apps 1.0.2-3
Update Xload, remove patch, move xedit files from /usr/lib/X11 to /usr/share/X11
Fix locale alias file specification


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


Index: arch/build/x11/xorg-apps/PKGBUILD
diff -u arch/build/x11/xorg-apps/PKGBUILD:1.7 arch/build/x11/xorg-apps/PKGBUILD:1.8
--- arch/build/x11/xorg-apps/PKGBUILD:1.7	Thu Feb  1 18:15:03 2007
+++ arch/build/x11/xorg-apps/PKGBUILD	Thu May  3 13:36:41 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.7 2007/02/01 23:15:03 jgc Exp $
+# $Id: PKGBUILD,v 1.8 2007/05/03 17:36:41 jgc Exp $
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-apps
@@ -23,26 +23,25 @@
         ${url}/releases/individual/app/xcursorgen-1.0.1.tar.bz2
         ${url}/releases/individual/app/xeyes-1.0.1.tar.bz2
         ${url}/releases/individual/app/xkill-1.0.1.tar.bz2
-        ${url}/releases/individual/app/xload-1.0.1.tar.bz2
+        ${url}/releases/individual/app/xload-1.0.2.tar.bz2
         ${url}/releases/individual/app/xlogo-1.0.1.tar.bz2
         ${url}/releases/individual/app/xmag-1.0.1.tar.bz2
         ${url}/releases/individual/app/xmessage-1.0.1.tar.bz2
         ${url}/releases/individual/app/xcalc-1.0.1.tar.bz2
 	${url}/releases/individual/app/xman-1.0.2.tar.bz2
 	${url}/releases/individual/app/xedit-1.0.2.tar.bz2
-	${url}/releases/individual/app/xmh-1.0.1.tar.bz2
-	${url}/releases/X11R7.1/patches/xload-1.0.1-setuid.diff)
+	${url}/releases/individual/app/xmh-1.0.1.tar.bz2)
 md5sums=('91f49547f9ed3cd0137c8b7c3183e360' 'aacda46598ce3af8ca16e2a8132db1b2'\
          '6b930326f71993fb54b7203902b387cd' '6b3a6896081f628bf5a2c9129417c86f'\
          '911addfb7fa402217ddac63e5c1d97c7' '6e3c5d0297d88e890b6f5df31f73dd60'\
          'fd06c8b8e3572a0e14af65a49e0dd7d1' '404f5add4537d22dd109c33e518a5190'\
          '2c6ecedb10dc51adbb64c95f22fd99c2' '8678ddd23573022d68dcd883ae239be8'\
          '39e1e62f5bd92603b0230b8b948c2fc4' '033f14f7c4e30d1f4edbb22d5ef86883'\
-         'f66d76abb0f75514ca32272e23cca757' 'ba013813f9c21eb015559466f8d02a44'\
+         'f66d76abb0f75514ca32272e23cca757' 'b41ed6b4bcfc9897366c27a94d2bf150'\
          '4c5482552f38a7d42398a694cc9b2ee6' '058d168d1c7c991b8d12158433ea5f63'\
          'b3674c3a00a089764d86aa94e257ccec' '07b948cf671fde88df1a59bfb0cab3b8'\
          '855f2dbfa2aff58b8b9cd6a1c1120fad' 'c56160e93c24ddf17e69891ed50deb72'\
-         '656bcbdd41818a8b5a9f7dba77a3eeba' '9813ecc6d82157d1e5d19cf265af6ff9')
+         '656bcbdd41818a8b5a9f7dba77a3eeba')
 
 build() {
   cd ${startdir}/src
@@ -54,12 +53,13 @@
           sed -e 's|^LIBPATH = $(libdir)|LIBPATH = $(datadir)|' \
 	      -i Makefile.* || return 1
 	;;
-	xload*)
-	  patch -Np0 -i ${startdir}/src/xload-1.0.1-setuid.diff || return 1
+	xedit*)
+	  sed -e 's|^XEDITDIR = ${libdir}|XEDITDIR = ${datadir}|' \
+	      -i Makefile.* || return 1
 	;;
       esac
       ./configure --prefix=/usr --disable-xprint \
-                  --with-localealiasfile=/usr/share/locale/locale.alias
+                  --with-localealiasfile=/usr/share/X11/locale/locale.alias
       make || return 1
       make DESTDIR=${startdir}/pkg install || return 1
       popd