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

[Jan de Groot]

    Date: Saturday, November 8, 2008 @ 12:17:37
  Author: jgc
Revision: 18694

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

........
  r18693 | jgc | 2008-11-08 18:17:05 +0100 (Sat, 08 Nov 2008) | 2 lines
  
  upgpkg: xorg-server-utils 7.4-1
      Remove deprecated apps
........

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

----------+
 PKGBUILD |   44 +++++++-------------------------------------
 1 file changed, 7 insertions(+), 37 deletions(-)


Property changes on: xorg-server-utils/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-server-utils/trunk:1-14296
   + /xorg-server-utils/trunk:1-18693

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-08 17:17:05 UTC (rev 18693)
+++ extra-i686/PKGBUILD	2008-11-08 17:17:37 UTC (rev 18694)
@@ -2,16 +2,14 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server-utils
-pkgver=7.3
+pkgver=7.4
 pkgrel=1
 pkgdesc="X.Org utilities required by xorg-server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libxfontcache' 'libxi' 'liblbxutil' 'libxrandr>=1.2.1' 'libxxf86misc'
-         'libxaw' 'libxxf86vm' 'libxtrap' 'mcpp>=2.6' 'xtrans')
-makedepends=('pkgconfig' 'xbitmaps' 'xproxymngproto' 'bigreqsproto')
+depends=('libxfontcache' 'libxi' 'libxmu' 'libxxf86misc' 'libxrandr' 'libxxf86vm' 'mcpp>=2.6')
+makedepends=('pkgconfig' 'xbitmaps' 'bigreqsproto' 'xtrans')
 source=(${url}/releases/individual/app/iceauth-1.0.2.tar.bz2
-        ${url}/releases/individual/app/lbxproxy-1.0.1.tar.bz2
         ${url}/releases/individual/app/rgb-1.0.3.tar.bz2
         ${url}/releases/individual/app/sessreg-1.0.4.tar.bz2
         ${url}/releases/individual/app/xcmsdb-1.0.1.tar.bz2
@@ -24,30 +22,7 @@
         ${url}/releases/individual/app/xrefresh-1.0.2.tar.bz2
         ${url}/releases/individual/app/xset-1.0.4.tar.bz2
         ${url}/releases/individual/app/xsetmode-1.0.0.tar.bz2
-        ${url}/releases/individual/app/xsetpointer-1.0.1.tar.bz2
-        ${url}/releases/individual/app/xsetroot-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xstdcmap-1.0.1.tar.bz2
-        ${url}/releases/individual/app/xtrap-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xvidtune-1.0.1.tar.bz2)
-md5sums=('7ab8b64edf0212a9d9a3c8129901a450'
-         '9d5045a5c76b1fe360221b967a5aa0e9'
-         '44ea16cc3104de6401bc74035f642357'
-         '839e968d7197b9563f0fd8a5a3aac2e3'
-         '8579d5f50ba7f0c4a5bf16b9670fea01'
-         '51b4a1c0ae2b3bd77417306fd78a3e94'
-         'f13ddedaa63a608d3b025d326f4f5b5d'
-         'f746aba36f075ae4cae313d849a94f4e'
-         '626731003ec22a74ecf9e44ed098bbdf'
-         '41a9d0cc073fa6165a31fbf9e85f68a6'
-         '9c30b8e1709d5367beb7706146640c07'
-         '1228f890f86148e4e6ae22aa73118cbb'
-         '2f41fd983ba4d89419204854936025e2'
-         'd074e79d380b031d2f60e4cd56538c93'
-         '9e5bcbeda4aaf02bfa095e41d30baee4'
-         '9af7db9f3052aef0b11636720b3101dd'
-         '86ab558441edfb86f853639e4290a754'
-         '97a62a011a11f03b46d72851aa298fa8'
-         'e0744594f4e5969b20df28d897781318')
+        ${url}/releases/individual/app/xsetroot-1.0.2.tar.bz2)
 
 build() {
   cd ${startdir}/src
@@ -56,19 +31,14 @@
       pushd "${i}"
       case "${i}" in
         xrdb*)
-	  ./configure --prefix=/usr --with-cpp=/usr/bin/mcpp\ - at old
+	  ./configure --prefix=/usr --with-cpp=/usr/bin/mcpp\ - at old || return 1
 	;;
-	lbxproxy*)
-	  sed -e 's|$(libdir)/X11/lbxproxy|$(datadir)/X11/libxproxy|g' \
-	      -i Makefile.* || return 1
-	  ./configure --prefix=/usr
-	;;
 	*)
-	  ./configure --prefix=/usr
+	  ./configure --prefix=/usr || return 1
 	;;
       esac
       make || return 1
-      make DESTDIR=${startdir}/pkg install || return 1
+      make DESTDIR="${pkgdir}" install || return 1
       popd
     fi
   done