[arch-commits] Commit in xf86driproto/repos (3 files)

[Eric Bélanger]

    Date: Tuesday, April 21, 2009 @ 22:32:55
  Author: eric
Revision: 36404

Merged revisions 36393 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86driproto/trunk

........
  r36393 | eric | 2009-04-21 21:41:27 -0400 (Tue, 21 Apr 2009) | 2 lines
  
  upgpkg: xf86driproto 2.0.4-2
      Added license
........

Added:
  xf86driproto/repos/extra-i686/LICENSE
    (from rev 36393, xf86driproto/trunk/LICENSE)
Modified:
  xf86driproto/repos/extra-i686/	(properties)
  xf86driproto/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   14 ++++++++------
 2 files changed, 58 insertions(+), 6 deletions(-)


Property changes on: xf86driproto/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86driproto/trunk:1-1885
   + /xf86driproto/trunk:1-36403

Copied: xf86driproto/repos/extra-i686/LICENSE (from rev 36393, xf86driproto/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-22 02:32:55 UTC (rev 36404)
@@ -0,0 +1,50 @@
+# 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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-22 02:31:37 UTC (rev 36403)
+++ extra-i686/PKGBUILD	2009-04-22 02:32:55 UTC (rev 36404)
@@ -3,17 +3,19 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86driproto
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 DRI extension wire protocol"
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-arch=(i686 x86_64)
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+license=('custom')
+source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('01470d088da3a8a3deefa8e1f45d69cb' 'ab39cbff950541dc686b18aa181730f4')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
-md5sums=('01470d088da3a8a3deefa8e1f45d69cb')