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

[Jan de Groot]

    Date: Monday, July 12, 2010 @ 13:29:34
  Author: jgc
Revision: 85358

upgpkg: xf86-video-voodoo 1.2.4-1
Update to 1.2.4 - replace license with upstream file

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

----------+
 LICENSE  |   36 ------------------------------------
 PKGBUILD |   19 +++++++++----------
 2 files changed, 9 insertions(+), 46 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-07-12 17:27:20 UTC (rev 85357)
+++ LICENSE	2010-07-12 17:29:34 UTC (rev 85358)
@@ -1,36 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Author: Alan Cox <alan at redhat.com>
-
-Derived from:
-XFree86 driver for Glide(tm). (Mainly for Voodoo 1 and 2 cards)
-by Henrik Harmsen (hch at cd.chalmers.se or Henrik.Harmsen at erv.ericsson.se)
-
-Portions derived from  linux/drivers/video/sstfb.c
-    -- voodoo graphics frame buffer
-    Copyright (c) 2000-2002 Ghozlane Toumi <gtoumi at laposte.net>
-Relicensed from GPL to the X license by consent of the author
-
-Other code Copyright 2004 Red Hat 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, and that the names of Red Hat, Alan Cox and Henrik Harmsen
-not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Th authors make no
-representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL RICHARD HECKER 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.
-
-THIS SOFTWARE IS NOT DESIGNED FOR USE IN SAFETY CRITICAL SYSTEMS OF
-ANY KIND OR FORM.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-12 17:27:20 UTC (rev 85357)
+++ PKGBUILD	2010-07-12 17:29:34 UTC (rev 85358)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-voodoo
-pkgver=1.2.3
-pkgrel=2
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,15 +13,14 @@
 conflicts=('xorg-server<1.8.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        LICENSE)
-md5sums=('c164effcc839eca1fc1d43a42f4086db'
-         '235f1f4be8fc98400bd84c3c9bd7d2ee')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }