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

Thu Apr 23 02:23:25 UTC 2009

Date: Wednesday, April 22, 2009 @ 22:23:24
  Author: eric
Revision: 36465

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

........
  r36464 | eric | 2009-04-22 22:23:09 -0400 (Wed, 22 Apr 2009) | 2 lines
  
  upgpkg: xterm 243-2
      Added license
........

Added:
  xterm/repos/extra-x86_64/LICENSE
    (from rev 36464, xterm/trunk/LICENSE)
Modified:
  xterm/repos/extra-x86_64/	(properties)
  xterm/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |    8 ++++--
 2 files changed, 78 insertions(+), 3 deletions(-)


Property changes on: xterm/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xterm/trunk:1-33703
   + /xterm/trunk:1-36464

Copied: xterm/repos/extra-x86_64/LICENSE (from rev 36464, xterm/trunk/LICENSE)
===================================================================

--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-04-23 02:23:24 UTC (rev 36465)
@@ -0,0 +1,73 @@
+/***********************************************************
+
+Copyright 2002-2008,2009 by Thomas E. Dickey
+
+                        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, 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+
+Copyright 1987, 1988  The Open Group
+
+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.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard.
+
+                        All Rights Reserved
+
+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 name of Digital not be used in
+advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL 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.
+
+******************************************************************/

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-23 02:23:09 UTC (rev 36464)
+++ extra-x86_64/PKGBUILD	2009-04-23 02:23:24 UTC (rev 36465)
@@ -3,14 +3,15 @@
 # i686 Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xterm
 pkgver=243
-pkgrel=1
+pkgrel=2
 pkgdesc="X Terminal Emulator"
 arch=(i686 x86_64)
 url="http://invisible-island.net/xterm/"
+license=('custom')
 depends=('libxft' 'libxaw>=1.0.5' 'ncurses' 'xorg-apps')
 groups=('xorg')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-md5sums=('be25d2d3661d0bb77fc66e1bcbb3caba')
+source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE)
+md5sums=('be25d2d3661d0bb77fc66e1bcbb3caba' '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -40,5 +41,6 @@
 	      --enable-narrowproto || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   chmod 0755 "${pkgdir}/usr/bin/xterm" || return 1
 }


