[arch-commits] Commit in xf86-video-chips/trunk (LICENSE PKGBUILD)

Tue Aug 24 09:46:46 UTC 2010

Date: Tuesday, August 24, 2010 @ 05:46:46
  Author: jgc
Revision: 88618

upgpkg: xf86-video-chips 1.2.3-1
Update to 1.2.3, build for xserver 1.9

Modified:
  xf86-video-chips/trunk/PKGBUILD
Deleted:
  xf86-video-chips/trunk/LICENSE

----------+
 LICENSE  |   89 -------------------------------------------------------------
 PKGBUILD |   23 +++++++--------
 2 files changed, 11 insertions(+), 101 deletions(-)

Deleted: LICENSE
===================================================================

--- LICENSE	2010-08-24 09:42:38 UTC (rev 88617)
+++ LICENSE	2010-08-24 09:46:46 UTC (rev 88618)
@@ -1,89 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright 1993 by Jon Block <block at frc.com>
-Modified by Mike Hollick <hollick at graphics.cis.upenn.edu>
-Modified 1994 by Régis Cridlig <cridlig at dmi.ens.fr>
-
-Major Contributors to XFree86 3.2
-Modified 1995/6 by Nozomi Ytow
-Modified 1996 by Egbert Eich <eich at xfree86.org>
-Modified 1996 by David Bateman <dbateman at club-internet.fr>
-Modified 1996 by Xavier Ducoin <xavier at rd.lectra.fr>
-
-Contributors to XFree86 3.2
-Modified 1995/6 by Ken Raeburn <raeburn at raeburn.org>
-Modified 1996 by Shigehiro Nomura <nomura at sm.sony.co.jp>
-Modified 1996 by Marc de Courville <marc at courville.org>
-Modified 1996 by Adam Sulmicki <adam at cfar.umd.edu>
-Modified 1996 by Jens Maurer <jmaurer at cck.uni-kl.de>
-
-Large parts rewritten for XFree86 4.0
-Modified 1998 by David Bateman <dbateman at club-internet.fr>
-Modified 1998 by Egbert Eich <eich at xfree86.org>
-Modified 1998 by Nozomi Ytow
-
-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 authors not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The authors makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE AUTHORS 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.
-
-Copyright 1997
-Digital Equipment Corporation. All rights reserved.
-This software is furnished under license and may be used and copied only in
-accordance with the following terms and conditions.  Subject to these
-conditions, you may download, copy, install, use, modify and distribute
-this software in source and/or binary form. No title or ownership is
-transferred hereby.
-1) Any source code used, modified or distributed must reproduce and retain
-this copyright notice and list of conditions as they appear in the
-source file.
-
-2) No right is granted to use any trade name, trademark, or logo of Digital
-Equipment Corporation. Neither the "Digital Equipment Corporation" name
-nor any trademark or logo of Digital Equipment Corporation may be used
-to endorse or promote products derived from this software without the
-prior written permission of Digital Equipment Corporation.
-
-3) This software is provided "AS-IS" and any express or implied warranties,
-including but not limited to, any implied warranties of merchantability,
-fitness for a particular purpose, or non-infringement are disclaimed. In
-no event shall DIGITAL be liable for any damages whatsoever, and in
-particular, DIGITAL shall not be liable for special, indirect,
-consequential, or incidental damages or damages for lost profits, loss
-of revenue or loss of use, whether such damages arise in contract,
-negligence, tort, under statute, in equity, at law or otherwise, even if
-advised of the possibility of such damage.
-
-Copyright 1994  The XFree86 Project
-
-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
-DAVID WEXELBLAT 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	2010-08-24 09:42:38 UTC (rev 88617)
+++ PKGBUILD	2010-08-24 09:46:46 UTC (rev 88618)
@@ -1,29 +1,28 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
+
 pkgname=xf86-video-chips
-pkgver=1.2.2
-pkgrel=3
+pkgver=1.2.3
+pkgrel=1
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
-makedepends=('pkgconfig' 'xorg-server>=1.8.0')
-conflicts=('xorg-server<1.8.0')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-sha1sums=('3990bc1cf4e8963164b3a38b15f92bc87da9278c'
-          '89ef876d4e3913775190f39902da6421d808eed2')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('79d1592dacbdd5ff0419dcb2fef2a2ca541dd329')
 
 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}/"
 }


