xorg-utils:Bumped/Updated for LinHES 7.

6 files changed, 167 insertions, 29 deletions

diff --git a/abs/core-testing/xorg-util-macros/PKGBUILD b/abs/core-testing/xorg-util-macros/PKGBUILD
index af3786a..3ca4dfa 100644
--- a/abs/core-testing/xorg-util-macros/PKGBUILD
+++ b/abs/core-testing/xorg-util-macros/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 21902 2008-12-17 20:27:32Z jgc $
+# $Id: PKGBUILD 85383 2010-07-12 17:45:37Z jgc $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-util-macros
-pkgver=1.2.1
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="X.Org Autotools macros"
-arch=(i686 x86_64)
+arch=(any)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
-md5sums=('dc7ddaf9bea8b341510efe4dac125af4')
+sha1sums=('01bd26de7f76907ad502b430a5d18f64a896dc81')
 
 build() {
   cd "${srcdir}/util-macros-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/lib"
+  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/abs/core-testing/xorg-utils/LICENSE.xdpyinfo b/abs/core-testing/xorg-utils/LICENSE.xdpyinfo
new file mode 100644
index 0000000..495dd2b
--- /dev/null
+++ b/abs/core-testing/xorg-utils/LICENSE.xdpyinfo
@@ -0,0 +1,26 @@
+  Copyright 1988, 1998  The Open Group
+  Copyright 2005 Hitachi, Ltd.
+  
+  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.
+   *
+   * Author:  Jim Fulton, MIT X Consortium
+   */
+
diff --git a/abs/core-testing/xorg-utils/LICENSE.xfd b/abs/core-testing/xorg-utils/LICENSE.xfd
new file mode 100644
index 0000000..2ac6c9d
--- /dev/null
+++ b/abs/core-testing/xorg-utils/LICENSE.xfd
@@ -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.
+   * *
+   * Author:  Jim Fulton, MIT X Consortium
+   */
+
diff --git a/abs/core-testing/xorg-utils/LICENSE.xlsfonts b/abs/core-testing/xorg-utils/LICENSE.xlsfonts
new file mode 100644
index 0000000..a9a4bd3
--- /dev/null
+++ b/abs/core-testing/xorg-utils/LICENSE.xlsfonts
@@ -0,0 +1,22 @@
+  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.
+
diff --git a/abs/core-testing/xorg-utils/LICENSE.xprop b/abs/core-testing/xorg-utils/LICENSE.xprop
new file mode 100644
index 0000000..b94017f
--- /dev/null
+++ b/abs/core-testing/xorg-utils/LICENSE.xprop
@@ -0,0 +1,45 @@
+  Copyright 1990, 1998  The Open Group
+  Copyright (c) 2000  The XFree86 Project, Inc.
+  
+  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.
+
+  Copyright 2007 Kim woelders
+ 
+  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, and
+  that the name of the copyright holders not be used in advertising or
+  publicity pertaining to distribution of the software without specific,
+  written prior permission.  The copyright holders make no representations
+  about the suitability of this software for any purpose.  It is provided "as
+  is" without express or implied warranty.
+ 
+  THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL THE COPYRIGHT HOLDERS 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-testing/xorg-utils/PKGBUILD b/abs/core-testing/xorg-utils/PKGBUILD
index 61a55ce..cef7e9e 100644
--- a/abs/core-testing/xorg-utils/PKGBUILD
+++ b/abs/core-testing/xorg-utils/PKGBUILD
@@ -1,42 +1,60 @@
-# $Id: PKGBUILD 18946 2008-11-12 04:14:33Z eric $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 81985 2010-06-07 13:58:47Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=xorg-utils
-pkgver=7.4
+pkgver=7.6
 pkgrel=2
 pkgdesc="Collection of client utilities used to query the X server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('libxxf86dga' 'libxi' 'libxxf86misc' 'libxtst' 'libxinerama' 'libxv'
-         'libdmx' 'libxft' 'libxaw>=1.0.5')
-makedepends=('pkgconfig' 'mesa')
-source=(${url}/releases/individual/app/xdpyinfo-1.0.3.tar.bz2
-        ${url}/releases/individual/app/xdriinfo-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xev-1.0.3.tar.bz2
+         'libdmx' 'libxft' 'libxaw>=1.0.6' 'libgl' 'libxcomposite' 'xcb-util')
+makedepends=('pkgconfig' 'mesa' 'glproto' 'xorg-util-macros')
+groups=('xorg')
+source=(${url}/releases/individual/app/xdpyinfo-1.1.0.tar.bz2
+        ${url}/releases/individual/app/xdriinfo-1.0.3.tar.bz2
+        ${url}/releases/individual/app/xev-1.0.4.tar.bz2
         ${url}/releases/individual/app/xfd-1.0.1.tar.bz2
         ${url}/releases/individual/app/xfontsel-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xlsatoms-1.0.1.tar.bz2
-        ${url}/releases/individual/app/xlsclients-1.0.1.tar.bz2
+        ${url}/releases/individual/app/xlsatoms-1.1.0.tar.bz2
+        ${url}/releases/individual/app/xlsclients-1.1.0.tar.bz2
         ${url}/releases/individual/app/xlsfonts-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xprop-1.0.4.tar.bz2
-        ${url}/releases/individual/app/xvinfo-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xwininfo-1.0.4.tar.bz2)
-md5sums=('b7cbab6cbcd12bf7ad65dbc12d86e104' 'a5ec51ed9f0a55dc3462d90d52ff899c'\
-         'a9532c3d1683c99bb5df1895cb3a60b1' 'c72abd90f50ef459bc14b39ec9fcc7f8'\
-         '288fe4cf8a990e4e602aac16dd9109fb' '69adcda848479acc3b82b3928812d191'\
-         '44473b880d26bfbe8b3d4d72b183cba7' '28958248590ff60ecd70e8f590d977b7'\
-         '48aa8fd78802f477dcbf9ef0dfd9f783' 'e1e318436f49e2f0f3764593dadd9ad2'\
-         'e2a9bf5ab7f2a0866700a3b49dd8c6bf')
+        ${url}/releases/individual/app/xprop-1.1.0.tar.bz2
+        ${url}/releases/individual/app/xvinfo-1.1.0.tar.bz2
+        ${url}/releases/individual/app/xwininfo-1.0.5.tar.bz2
+        LICENSE.xdpyinfo
+        LICENSE.xfd
+        LICENSE.xprop
+        LICENSE.xlsfonts)
+md5sums=('d1d516610316138105cd07064b257c5c'
+         'cb304d1ce562ac48b68eedeba38c662f'
+         '5f98c0a2725a33d60ef4956befe078fb'
+         'c72abd90f50ef459bc14b39ec9fcc7f8'
+         '288fe4cf8a990e4e602aac16dd9109fb'
+         'c543ccb6489b629d427810d9a57d0724'
+         '550a0fee047c5043f2cbf190b41f8a1b'
+         '28958248590ff60ecd70e8f590d977b7'
+         'f0bacbd30f0dd1c1e9ccafe97687b7a4'
+         '8cc299b2cb636b5f7fe672610789d3d4'
+         '908f8bc3255f639effa9780fb1c19ea4'
+         'b43f731a9e2684728230ce8e33f63228'
+         '9e8a82b7e9898f36c378b80509f170a6'
+         '801f9850b29dad506e995d011efe2914'
+         '345d6e65d71fdde292cc27f93c15e4a1')
 
 build() {
   cd "${srcdir}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+      ./configure --prefix=/usr --mandir=/usr/share/man --without-xprint || return 1
       make || return 1
       make DESTDIR="${pkgdir}" install || return 1
+      install -D -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
 }