[arch-commits] Commit in xorg-twm/trunk (LICENSE PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, February 5, 2011 @ 05:46:21
  Author: andyrtr
Revision: 108998

upgpkg: xorg-twm 1.0.6-1
upstream update 1.0.6

Modified:
  xorg-twm/trunk/PKGBUILD
Deleted:
  xorg-twm/trunk/LICENSE

----------+
 LICENSE  |   47 -----------------------------------------------
 PKGBUILD |   23 ++++++++++++++---------
 2 files changed, 14 insertions(+), 56 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2011-02-05 10:42:44 UTC (rev 108997)
+++ LICENSE	2011-02-05 10:46:21 UTC (rev 108998)
@@ -1,47 +0,0 @@
-Copyright 1989, 1998  The Open Group
-Copyright 2005 Hitachi, Ltd.
-
-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 1988 by Evans & Sutherland Computer Corporation,        
-                          Salt Lake City, Utah                           
-                        Cambridge, Massachusetts                         
-                                                                         
-                           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  permis-    
-    sion  notice appear in supporting  documentation,  and  that  the    
-    name of Evans & Sutherland not be used in advertising    
-    in publicity pertaining to distribution of the  software  without    
-    specific, written prior permission.                                  
-                                                                         
-    EVANS & SUTHERLAND DISCLAIMs ALL WARRANTIES WITH REGARD    
-    TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES  OF  MERCHANT-    
-    ABILITY  AND  FITNESS,  IN  NO  EVENT SHALL EVANS & SUTHERLAND    
-    BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL  DAM-    
-    AGES 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: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-05 10:42:44 UTC (rev 108997)
+++ PKGBUILD	2011-02-05 10:46:21 UTC (rev 108998)
@@ -1,9 +1,10 @@
 # $Id$
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
+
 pkgname=xorg-twm
-pkgver=1.0.4
-pkgrel=3
+pkgver=1.0.6
+pkgrel=1
 pkgdesc="Tab Window Manager for the X Window System"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -12,15 +13,19 @@
 depends=('libxmu')
 makedepends=('pkgconfig')
 groups=('xorg')
-source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2 LICENSE)
-md5sums=('0865e14c73c08fa8c501ae877298ee9f' '5c4d86c1fc04aa595d9b6bf1c20d7023')
+source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2)
+md5sums=('952d06a0c2ec34687b536c7b619fc671')
 
 build() {
   cd "${srcdir}/twm-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/twm-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/X11/twm"
-  install -m644 src/system.twmrc "${pkgdir}/etc/X11/twm/" || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -m644 src/system.twmrc "${pkgdir}/etc/X11/twm/"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }