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

[Jan de Groot]

    Date: Tuesday, August 18, 2009 @ 11:02:25
  Author: jgc
Revision: 50030

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

........
  r49792 | jgc | 2009-08-15 18:55:20 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  upgpkg: xorg-server-utils 7.4-7
      Update xrandr
........

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

----------+
 PKGBUILD |   67 ++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 25 deletions(-)


Property changes on: xorg-server-utils/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-server-utils/trunk:1-38887
   + /xorg-server-utils/trunk:1-50029

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-18 14:59:15 UTC (rev 50029)
+++ extra-i686/PKGBUILD	2009-08-18 15:02:25 UTC (rev 50030)
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server-utils
 pkgver=7.4
-pkgrel=6
+pkgrel=7
 pkgdesc="X.Org utilities required by xorg-server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -16,51 +16,68 @@
         ${url}/releases/individual/app/sessreg-1.0.4.tar.bz2
         ${url}/releases/individual/app/xcmsdb-1.0.1.tar.bz2
         ${url}/releases/individual/app/xbacklight-1.1.tar.bz2
-	${url}/releases/individual/app/xgamma-1.0.2.tar.bz2
+        ${url}/releases/individual/app/xgamma-1.0.2.tar.bz2
         ${url}/releases/individual/app/xhost-1.0.2.tar.bz2
-	${url}/releases/individual/app/xinput-1.4.2.tar.bz2
+        ${url}/releases/individual/app/xinput-1.4.2.tar.bz2
         ${url}/releases/individual/app/xmodmap-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xrandr-1.3.0.tar.bz2
+        ${url}/releases/individual/app/xrandr-1.3.1.tar.bz2
         ${url}/releases/individual/app/xrdb-1.0.5.tar.bz2
         ${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/xsetroot-1.0.2.tar.bz2
-	${url}/releases/individual/app/xvidtune-1.0.1.tar.bz2
-        LICENSE.iceauth LICENSE.xcmsdb LICENSE.xrdb LICENSE.xrefresh 
-        LICENSE.xset LICENSE.xsetroot LICENSE.xvidtune)
-md5sums=('7ab8b64edf0212a9d9a3c8129901a450' '44ea16cc3104de6401bc74035f642357'\
-         '839e968d7197b9563f0fd8a5a3aac2e3' '8579d5f50ba7f0c4a5bf16b9670fea01'\
-         '51b4a1c0ae2b3bd77417306fd78a3e94' 'f13ddedaa63a608d3b025d326f4f5b5d'\
-         'f746aba36f075ae4cae313d849a94f4e' '58e619576cbf4b6057eebb7a97fe2ddf'\
-         '626731003ec22a74ecf9e44ed098bbdf' '616612a15711a4422e71be6acc42ca3c'\
-         '9c30b8e1709d5367beb7706146640c07' '1228f890f86148e4e6ae22aa73118cbb'\
-         '2f41fd983ba4d89419204854936025e2' 'd074e79d380b031d2f60e4cd56538c93'\
-         '9af7db9f3052aef0b11636720b3101dd' 'e0744594f4e5969b20df28d897781318'\
-         '65695dc24c24958190724a23655ffda7' 'b6235416dca2205f0ba83c0c4b3ddeb8'\
-         'd0a9bf9f958d238583af763819d64b5f' '008d85623476ccad16e056809ed43807'\
-         '19fa75322c9c3a40c20787c07ed3f8af' '3485f0bcea219af946adf6492f55b54c'\
+        ${url}/releases/individual/app/xvidtune-1.0.1.tar.bz2
+        LICENSE.iceauth
+        LICENSE.xcmsdb
+        LICENSE.xrdb
+        LICENSE.xrefresh 
+        LICENSE.xset
+        LICENSE.xsetroot
+        LICENSE.xvidtune)
+md5sums=('7ab8b64edf0212a9d9a3c8129901a450'
+         '44ea16cc3104de6401bc74035f642357'
+         '839e968d7197b9563f0fd8a5a3aac2e3'
+         '8579d5f50ba7f0c4a5bf16b9670fea01'
+         '51b4a1c0ae2b3bd77417306fd78a3e94'
+         'f13ddedaa63a608d3b025d326f4f5b5d'
+         'f746aba36f075ae4cae313d849a94f4e'
+         '58e619576cbf4b6057eebb7a97fe2ddf'
+         '626731003ec22a74ecf9e44ed098bbdf'
+         'b1a77afa37d845bccc6726e2891fc7f2'
+         '9c30b8e1709d5367beb7706146640c07'
+         '1228f890f86148e4e6ae22aa73118cbb'
+         '2f41fd983ba4d89419204854936025e2'
+         'd074e79d380b031d2f60e4cd56538c93'
+         '9af7db9f3052aef0b11636720b3101dd'
+         'e0744594f4e5969b20df28d897781318'
+         '65695dc24c24958190724a23655ffda7'
+         'b6235416dca2205f0ba83c0c4b3ddeb8'
+         'd0a9bf9f958d238583af763819d64b5f'
+         '008d85623476ccad16e056809ed43807'
+         '19fa75322c9c3a40c20787c07ed3f8af'
+         '3485f0bcea219af946adf6492f55b54c'
          '4e6babde6334e3c5cb4a3136526aa564')
 
 build() {
   cd "${srcdir}"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
       case "${i}" in
         xrdb*)
-	  ./configure --prefix=/usr --mandir=/usr/share/man --with-cpp=/usr/bin/mcpp\ - at old || return 1
-	;;
-	*)
-	  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	;;
+          ./configure --prefix=/usr --mandir=/usr/share/man --with-cpp=/usr/bin/mcpp\ - at old || return 1
+          ;;
+        *)
+          ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+          ;;
       esac
       make || return 1
       make DESTDIR="${pkgdir}" install || return 1
-      install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
+      install -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
       popd
     fi
   done
 # Replacing stub license files
-  install -D -m644 "${srcdir}"/LICENSE.* "${pkgdir}/usr/share/licenses/${pkgname}/"  || return 1
+  install -m644 "${srcdir}"/LICENSE.* "${pkgdir}/usr/share/licenses/${pkgname}/"  || return 1
 }