[arch-commits] Commit in xorg-xkb-utils/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Saturday, November 8, 2008 @ 12:01:43
  Author: jgc
Revision: 18690

Merged revisions 18689 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-xkb-utils/trunk

........
  r18689 | jgc | 2008-11-08 18:00:57 +0100 (Sat, 08 Nov 2008) | 2 lines
  
  upgpkg: xorg-xkb-utils 7.4-1
      Rebuild for libxaw, remove xkbprint, as it is deprecated upstream (and removed from the 7.4 release)
........

Modified:
  xorg-xkb-utils/repos/extra-i686/	(properties)
  xorg-xkb-utils/repos/extra-i686/PKGBUILD

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


Property changes on: xorg-xkb-utils/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-xkb-utils/trunk:1-4398
   + /xorg-xkb-utils/trunk:1-18689

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-08 17:00:57 UTC (rev 18689)
+++ extra-i686/PKGBUILD	2008-11-08 17:01:43 UTC (rev 18690)
@@ -2,32 +2,30 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xkb-utils
-pkgver=7.3
+pkgver=7.4
 pkgrel=1
 pkgdesc="X.org keyboard utilities"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libxaw' 'libxkbfile')
+depends=('libxaw>=1.0.5' 'libxkbfile')
 makedepends=(pkgconfig)
 source=(${url}/releases/individual/app/xkbutils-1.0.1.tar.bz2
         ${url}/releases/individual/app/xkbcomp-1.0.5.tar.bz2
         ${url}/releases/individual/app/xkbevd-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xkbprint-1.0.1.tar.bz2
         ${url}/releases/individual/app/setxkbmap-1.0.4.tar.bz2)
 md5sums=('84396a3dd75337caaae29d8fa5616fb1'
          '6cc96c3e4ed5d9802fe717beac008f19'
          '68f2a143716c23b566f8509d9498f516'
-         'b98ae2d8b21c545b7b322d0b302efefa'
          '6fab3bb176be9e510c5613d054ef1ca4')
 
 build() {
-  cd ${startdir}/src
+  cd "${srcdir}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr
+      ./configure --prefix=/usr || return 1
       make || return 1
-      make DESTDIR=${startdir}/pkg install || return 1
+      make DESTDIR="${pkgdir}" install || return 1
       popd
     fi
   done