[arch-commits] Commit in xorg-xfs/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 13:38:08
  Author: jgc
Revision: 3234

Merged revisions 2-3233 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-xfs/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r3191 | jgc | 2008-06-21 13:23:41 +0000 (Sat, 21 Jun 2008) | 1 line
  
  upgpkg: xorg-xfs 1.0.8-1
........

Modified:
  xorg-xfs/repos/extra-i686/	(properties)
  xorg-xfs/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)


Property changes on: xorg-xfs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-xfs/trunk:1
   + /xorg-xfs/trunk:1-3233

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 17:34:22 UTC (rev 3233)
+++ extra-i686/PKGBUILD	2008-06-21 17:38:08 UTC (rev 3234)
@@ -2,7 +2,7 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-xfs
-pkgver=1.0.5
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="X.Org X11 xfs font server"
 arch=(i686 x86_64)
@@ -11,16 +11,22 @@
 depends=('xorg-font-utils' 'libxfont' 'libfs' 'libx11')
 makedepends=('pkgconfig' 'xtrans')
 source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
-        ${url}/releases/individual/app/xfsinfo-1.0.1.tar.bz2
-	${url}/releases/individual/app/fslsfonts-1.0.1.tar.bz2
-	${url}/releases/individual/app/fstobdf-1.0.2.tar.bz2
-        ${url}/releases/individual/app/showfont-1.0.1.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/showfont-1.0.2.tar.bz2
 	xfs.rc)
+md5sums=('f10717e45535b64eb45226aac571dac2'
+         'e6c0071f6d5436113982f4a575d3f94b'
+         'a61be25c87ee42169ee4dc8344acc9e2'
+         '49a6225380f6c18fff664a043cd569b1'
+         '8f83d774ed4cc2a6dca86edd856d820a'
+         '251f5447f64151e9bb096ebc9f999c3f')
 
 build() {
   cd ${startdir}/src
   pushd xfs-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr || return 1
   make configdir=/etc/X11/fs || return 1
   make configdir=/etc/X11/fs DESTDIR=${startdir}/pkg install || return 1
   sed -i -e 's|/lib/X11/|/share/|g' ${startdir}/pkg/etc/X11/fs/config
@@ -28,7 +34,7 @@
   for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr
+      ./configure --prefix=/usr || return 1
       make || return 1
       make DESTDIR=${startdir}/pkg install || return 1
       popd
@@ -36,11 +42,5 @@
   done
 
   mkdir -p ${startdir}/pkg/etc/rc.d
-  install -m755 ${startdir}/src/xfs.rc ${startdir}/pkg/etc/rc.d/
+  install -m755 ${startdir}/src/xfs.rc ${startdir}/pkg/etc/rc.d/ || return 1
 }
-md5sums=('3fc73b5e39a1fe8b8d96563c8144cffe'
-         'e98b18fbce1261de30b1de819d86f48a'
-         'c7b2f8a938749d41dc86db6bd1e6a4ca'
-         '99144743ab3cbb9cf37090fdc9e747db'
-         '339b2faf1ca5114fda414338e15b6e21'
-         '251f5447f64151e9bb096ebc9f999c3f')