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

[Jan de Groot]

    Date: Saturday, August 15, 2009 @ 12:43:11
  Author: jgc
Revision: 49790

upgpkg: xorg-xfs 1.1.0-1
    Update to 1.1.0, remove license as upstream provides one now

Modified:
  xorg-xfs/trunk/PKGBUILD
Deleted:
  xorg-xfs/trunk/LICENSE.xfs

-------------+
 LICENSE.xfs |   25 -------------------------
 PKGBUILD    |   39 +++++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 43 deletions(-)

Deleted: LICENSE.xfs
===================================================================
--- LICENSE.xfs	2009-08-15 16:26:33 UTC (rev 49789)
+++ LICENSE.xfs	2009-08-15 16:43:11 UTC (rev 49790)
@@ -1,25 +0,0 @@
-Copyright (c) 1988  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 CONNECTION 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 dealings in this Software without prior written authorization
-from the X Consortium.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-15 16:26:33 UTC (rev 49789)
+++ PKGBUILD	2009-08-15 16:43:11 UTC (rev 49790)
@@ -2,45 +2,48 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xfs
-pkgver=1.0.8
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="X.Org X11 xfs font server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 backup=('etc/X11/fs/config')
-depends=('xorg-font-utils' 'libxfont' 'libfs' 'libx11')
+depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2')
 makedepends=('pkgconfig' 'xtrans')
 source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
         ${url}/releases/individual/app/xfsinfo-1.0.2.tar.bz2
-	${url}/releases/individual/app/fslsfonts-1.0.2.tar.bz2
-	${url}/releases/individual/app/fstobdf-1.0.3.tar.bz2
+        ${url}/releases/individual/app/fslsfonts-1.0.2.tar.bz2
+        ${url}/releases/individual/app/fstobdf-1.0.3.tar.bz2
         ${url}/releases/individual/app/showfont-1.0.2.tar.bz2
-	xfs.rc LICENSE.xfs)
-md5sums=('f10717e45535b64eb45226aac571dac2' 'e6c0071f6d5436113982f4a575d3f94b'\
-         'a61be25c87ee42169ee4dc8344acc9e2' '49a6225380f6c18fff664a043cd569b1'\
-         '8f83d774ed4cc2a6dca86edd856d820a' '251f5447f64151e9bb096ebc9f999c3f'\
-         'a4f198e2c1835cf956f36b5958ab99e7')
+        xfs.rc)
+md5sums=('5cfc06a320f74f07a0aa73da62307e9a'
+         'e6c0071f6d5436113982f4a575d3f94b'
+         'a61be25c87ee42169ee4dc8344acc9e2'
+         '49a6225380f6c18fff664a043cd569b1'
+         '8f83d774ed4cc2a6dca86edd856d820a'
+         '251f5447f64151e9bb096ebc9f999c3f')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   pushd xfs-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make configdir=/etc/X11/fs || return 1
-  make configdir=/etc/X11/fs DESTDIR=${pkgdir} install || return 1
-  sed -i -e 's|/lib/X11/|/share/|g' ${pkgdir}/etc/X11/fs/config
+  make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install || return 1
+  sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs" || return 1
   popd
   for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
     if [ -d "${i}" ]; then
       pushd "${i}"
       ./configure --prefix=/usr || return 1
       make || return 1
-      make DESTDIR=${pkgdir} install || return 1
-      install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
+      make DESTDIR="${pkgdir}" install || return 1
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}" || return 1
       popd
     fi
   done
-# replacing stub license file
-  install -D -m644 ${srcdir}/LICENSE.xfs ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs || return 1
-  install -D -m755 ${srcdir}/xfs.rc ${pkgdir}/etc/rc.d/xfs.rc || return 1
+  install -m755 -d "${pkgdir}/etc/rc.d"
+  install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs" || return 1
 }