Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

3 files changed, 95 insertions, 38 deletions

diff --git a/abs/core/xorg-server-utils/LICENSE.iceauth b/abs/core/xorg-server-utils/LICENSE.iceauth
new file mode 100644
index 0000000..06941b3
--- /dev/null
+++ b/abs/core/xorg-server-utils/LICENSE.iceauth
@@ -0,0 +1,25 @@
+  Copyright 1989, 1998  The Open Group
+  
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation.
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+  OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  
+  Except as contained in this notice, the name of The Open Group shall not be
+  used in advertising or otherwise to promote the sale, use or other dealings
+  in this Software without prior written authorization from The Open Group.
+   * *
+   * Original Author of "xauth" : Jim Fulton, MIT X Consortium
+   * Modified into "iceauth"    : Ralph Mor, X Consortium
+   */
diff --git a/abs/core/xorg-server-utils/LICENSE.xcmsdb b/abs/core/xorg-server-utils/LICENSE.xcmsdb
new file mode 100644
index 0000000..132ace6
--- /dev/null
+++ b/abs/core/xorg-server-utils/LICENSE.xcmsdb
@@ -0,0 +1,18 @@
+   (c) Copyright 1990 Tektronix Inc.
+   	All Rights Reserved
+   
+   Permission to use, copy, modify, and distribute this software and its
+   documentation for any purpose and without fee is hereby granted,
+   provided that the above copyright notice appear in all copies and that
+   both that copyright notice and this permission notice appear in
+   supporting documentation, and that the name of Tektronix not be used
+   in advertising or publicity pertaining to distribution of the software
+   without specific, written prior permission.
+   
+   Tektronix disclaims all warranties with regard to this software, including
+   all implied warranties of merchantability and fitness, in no event shall
+   Tektronix be liable for any special, indirect or consequential damages or
+   any damages whatsoever resulting from loss of use, data or profits,
+   whether in an action of contract, negligence or other tortious action,
+   arising out of or in connection with the use or performance of this
+   software.
diff --git a/abs/core/xorg-server-utils/PKGBUILD b/abs/core/xorg-server-utils/PKGBUILD
index 84b4d12..5185a07 100644
--- a/abs/core/xorg-server-utils/PKGBUILD
+++ b/abs/core/xorg-server-utils/PKGBUILD
@@ -1,59 +1,73 @@
-# $Id: PKGBUILD 19183 2008-11-16 22:56:53Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 88717 2010-08-24 14:40:21Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=xorg-server-utils
-pkgver=7.4
-pkgrel=2
+pkgver=7.5
+pkgrel=6
 pkgdesc="X.Org utilities required by xorg-server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libxfontcache' 'libxi' 'libxmu' 'libxxf86misc' 'libxrandr' 'libxxf86vm' 'mcpp>=2.6')
+license=('custom')
+depends=('libxfontcache>=1.0.5' 'libxi>=1.3' 'libxaw>=1.0.6' 'libxrandr>=1.3.0' 'libxxf86vm>=1.1.0' 'mcpp>=2.7.2')
 makedepends=('pkgconfig' 'xbitmaps' 'bigreqsproto' 'xtrans')
-source=(${url}/releases/individual/app/iceauth-1.0.2.tar.bz2
+groups=('xorg')
+source=(${url}/releases/individual/app/iceauth-1.0.3.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
-        ${url}/releases/individual/app/xbacklight-1.1.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/xmodmap-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xrandr-1.2.3.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/sessreg-1.0.6.tar.bz2
+        ${url}/releases/individual/app/xcmsdb-1.0.2.tar.bz2
+        ${url}/releases/individual/app/xbacklight-1.1.1.tar.bz2
+        ${url}/releases/individual/app/xgamma-1.0.3.tar.bz2
+        ${url}/releases/individual/app/xhost-1.0.3.tar.bz2
+        ${url}/releases/individual/app/xinput-1.5.2.tar.bz2
+        ${url}/releases/individual/app/xmodmap-1.0.4.tar.bz2
+        ${url}/releases/individual/app/xrandr-1.3.3.tar.bz2
+        ${url}/releases/individual/app/xrdb-1.0.6.tar.bz2
+        ${url}/releases/individual/app/xrefresh-1.0.3.tar.bz2
+        ${url}/releases/individual/app/xset-1.2.0.tar.bz2
         ${url}/releases/individual/app/xsetmode-1.0.0.tar.bz2
-        ${url}/releases/individual/app/xsetroot-1.0.2.tar.bz2)
-md5sums=('7ab8b64edf0212a9d9a3c8129901a450'
+        ${url}/releases/individual/app/xsetroot-1.0.3.tar.bz2
+        ${url}/releases/individual/app/xvidtune-1.0.2.tar.bz2
+        LICENSE.iceauth
+        LICENSE.xcmsdb)
+md5sums=('975ade3f238c1eb10705da0a91e6e8e7'
          '44ea16cc3104de6401bc74035f642357'
-         '839e968d7197b9563f0fd8a5a3aac2e3'
-         '8579d5f50ba7f0c4a5bf16b9670fea01'
-         '51b4a1c0ae2b3bd77417306fd78a3e94'
-         'f13ddedaa63a608d3b025d326f4f5b5d'
-         'f746aba36f075ae4cae313d849a94f4e'
-         '626731003ec22a74ecf9e44ed098bbdf'
-         '41a9d0cc073fa6165a31fbf9e85f68a6'
-         '9c30b8e1709d5367beb7706146640c07'
-         '1228f890f86148e4e6ae22aa73118cbb'
-         '2f41fd983ba4d89419204854936025e2'
+         '8c8fcda19f4cffe573d43ec9b8255f8e'
+         '7f2bed9f4dd3301d18d83eb296c3be0d'
+         '3e39eec6d0fd5c587ca6d55aa7bb8fe1'
+         'e8a88bf1a18f35b724619849dca97f4f'
+         'c7f91b4a750d297f269c2a0a3206a1b2'
+         '8cec6023f90180cb8e4be31d98c43fda'
+         'bbe021f812e0014a8ee3692317788119'
+         '5b2dcfb0d9b736afaf78f6ce7651259c'
+         '8dd881cd5a7dcb6e456549817f0fb475'
+         '8f4fafcfb77b3c6972cc44bb3f1c899c'
+         '88ff2d390695366fa53e5d746fe86ad5'
          'd074e79d380b031d2f60e4cd56538c93'
-         '9af7db9f3052aef0b11636720b3101dd')
+         'cbda9b9b8da5af4614110883d5a276b8'
+         'e40eeb4454f2a7cdde3a14f5dfd3aadd'
+         '65695dc24c24958190724a23655ffda7'
+         'b6235416dca2205f0ba83c0c4b3ddeb8')
 
 build() {
-  cd ${startdir}/src
+  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\ -@old || return 1
-	;;
-	*)
-	  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-	;;
+          ./configure --prefix=/usr --mandir=/usr/share/man --with-cpp=/usr/bin/mcpp
+          ;;
+        *)
+          ./configure --prefix=/usr --mandir=/usr/share/man
+          ;;
       esac
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
+      make
+      make DESTDIR="${pkgdir}" install
+      install -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
       popd
     fi
   done
+# Replacing stub license files
+  install -m644 "${srcdir}"/LICENSE.* "${pkgdir}/usr/share/licenses/${pkgname}/"
 }