Date: Wednesday, January 19, 2011 @ 06:32:55 Author: jgc Revision: 106813
upgpkg: xf86driproto 2.1.1-1 Update to 2.1.1, remove custom license file, upstream includes it now Modified: xf86driproto/trunk/PKGBUILD Deleted: xf86driproto/trunk/LICENSE ----------+ LICENSE | 50 -------------------------------------------------- PKGBUILD | 23 ++++++++++++----------- 2 files changed, 12 insertions(+), 61 deletions(-) Deleted: LICENSE =================================================================== --- LICENSE 2011-01-19 11:30:57 UTC (rev 106812) +++ LICENSE 2011-01-19 11:32:55 UTC (rev 106813) @@ -1,50 +0,0 @@ -# Copyright (C) 1994 X Consortium -# -# 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: -# -# 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 -# 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 CONNEC- -# TION 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 deal- - - -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -Copyright 2000 VA Linux Systems, Inc. -All Rights Reserved. - -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, sub license, 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: - -The above copyright notice and this permission notice (including the -next paragraph) 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 NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. - -**************************************************************************/ Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-19 11:30:57 UTC (rev 106812) +++ PKGBUILD 2011-01-19 11:32:55 UTC (rev 106813) @@ -1,23 +1,24 @@ # $Id$ -# Maintainer: Alexander Baldeck <alexan...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> + pkgname=xf86driproto -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="X11 DRI extension wire protocol" arch=(any) +makedepends=('xorg-util-macros') url="http://xorg.freedesktop.org/" license=('custom') -source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2 - LICENSE) -sha1sums=('0dfc6616ffc68ca3c3b5decb1e365aaa93be8548' - '32bab65dd9c0b49333146abf16602967041b0d92') +source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('23e861f40ba0f0cbbfd7db7ba2ef623762ffca17') build() { cd "${srcdir}/${pkgname}-${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/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" }