Xorg update part1

2 files changed, 12 insertions, 86 deletions

diff --git a/abs/core/xorg-xpr/PKGBUILD b/abs/core/xorg-xpr/PKGBUILD
index 9fa513a..11ba4ba 100644
--- a/abs/core/xorg-xpr/PKGBUILD
+++ b/abs/core/xorg-xpr/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: $
+# $Id: PKGBUILD 155001 2012-04-01 10:04:57Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xpr
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Print an X window dump from xwd"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libx11' 'libxmu')
+depends=('libx11' 'libxmu' 'sh')
 makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2
-        copyright.patch)
-sha1sums=('9dbd0ff136b612285e00d92d0c7675a4207b1c4a'
-          'd2649781330400b83cf3553d9cfd6e02dd93a2bd')
+groups=('xorg-apps' 'xorg')
+source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2)
+sha1sums=('0645404e9aa2c9f979e4d006c483633bf6cfc2d9')
 
 build() {
   cd "${srcdir}/xpr-${pkgver}"
-  patch -Np1 -i "${srcdir}/copyright.patch"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/xpr-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/abs/core/xorg-xpr/copyright.patch b/abs/core/xorg-xpr/copyright.patch
deleted file mode 100644
index 18e7182..0000000
--- a/abs/core/xorg-xpr/copyright.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 11569289123fb178e23fd1aa284e9fa10e6c1e8c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri, 06 Aug 2010 22:09:48 +0000
-Subject: Fill in COPYING file with copyright notices from source code
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..0f9d8e0 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,53 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Copyright (c) 1985, 1988  X Consortium
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+The above copyright notice and this permission notice shall be included
-+in all copies or substantial portions of the Software.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+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 X CONSORTIUM 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 X Consortium 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 X Consortium.
-+
-+Copyright 1986 by Marvin Solomon and the University of Wisconsin
-+
-+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 names of Marvin Solomon and
-+the University of Wisconsin not be used in
-+advertising or publicity pertaining to distribution of the
-+software without specific, written prior permission.
-+Neither Marvin Solomon nor the University of Wisconsin
-+makes any representations about the suitability of
-+this software for any purpose.  It is provided "as is"
-+without express or implied warranty.
-+
-+Copyright (c) 1988 by Hewlett-Packard Company
-+
-+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
-+Hewlett-Packard not be used in advertising or publicity
-+pertaining to distribution of the software without specific, written
-+prior permission.
---
-cgit v0.8.3-6-g21f6