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

2012-03-02 Thread andyrtr 
Date: Friday, March 2, 2012 @ 14:10:02
  Author: andyrtr
Revision: 151782

upgpkg: xorg-xfs 1.1.2-1

upstream update 1.1.2

Modified:
  xorg-xfs/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-02 18:55:43 UTC (rev 151781)
+++ PKGBUILD2012-03-02 19:10:02 UTC (rev 151782)
@@ -3,27 +3,27 @@
 # Contributor: Jan de Groot j...@archlinux.org
 
 pkgname=xorg-xfs
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+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=1.4.0' 'libfs=1.0.2' 'libx11=1.2.2')
-makedepends=('pkgconfig' 'xtrans')
+depends=('xorg-font-utils' 'libxfont=1.4.5' 'libfs=1.0.2' 'libx11=1.2.2')
+makedepends=('pkgconfig' 'xtrans' 'xorg-util-macros')
 source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2
 ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
 ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
 ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
 ${url}/releases/individual/app/showfont-1.0.3.tar.bz2
 xfs.rc)
-md5sums=('e02c6cae689c082b8c98a421df8f8670'
- 'aae6fa48b5c2ce9186a5ff4ccc14a1d4'
- '9b50d967ac6d4bae9bffb62a5e527a50'
- 'fc1f42aac16d6b76c79a1a3a0fb6a53b'
- '50b466ab6ed4a5b8df5abf1ef844309a'
- '251f5447f64151e9bb096ebc9f999c3f')
+sha1sums=('d4a64e12f8a773bd0120977191586ca12baf1ace'
+  '21c5f544f34d9164797575da85727558f5e09d33'
+  '00177564597ac629207ca597f663b689902817df'
+  '5310493f53277fd196f93bbb7f2a204cad8997b7'
+  '161bf5f037db70dd75cb327648fbba559e821e76'
+  '21277375814e358ec16e8f8330f420e3d4df63e5')
 
 build() {
   cd ${srcdir}

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

2012-02-24 Thread Allan McRae 
Date: Friday, February 24, 2012 @ 08:48:50
  Author: allan
Revision: 151034

upgpkg: xorg-xfs 1.1.1-2

signing rebuild

Modified:
  xorg-xfs/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-24 13:46:55 UTC (rev 151033)
+++ PKGBUILD2012-02-24 13:48:50 UTC (rev 151034)
@@ -4,9 +4,9 @@
 
 pkgname=xorg-xfs
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc=X.Org X11 xfs font server
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url=http://xorg.freedesktop.org/;
 license=('custom')
 backup=('etc/X11/fs/config')

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

2011-02-05 Thread andyrtr 
Date: Saturday, February 5, 2011 @ 05:30:46
  Author: andyrtr
Revision: 108976

upgpkg: xorg-xfs 1.1.1-1
upstream update 1.1.1

Modified:
  xorg-xfs/trunk/PKGBUILD

--+
 PKGBUILD |   53 ++---
 1 file changed, 34 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-05 10:25:04 UTC (rev 108975)
+++ PKGBUILD2011-02-05 10:30:46 UTC (rev 108976)
@@ -1,8 +1,9 @@
 # $Id$
 # Maintainer: Alexander Baldeck alexan...@archlinux.org
 # Contributor: Jan de Groot j...@archlinux.org
+
 pkgname=xorg-xfs
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc=X.Org X11 xfs font server
 arch=(i686 x86_64)
@@ -12,38 +13,52 @@
 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/showfont-1.0.2.tar.bz2
+${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2
+${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2
+${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2
+${url}/releases/individual/app/showfont-1.0.3.tar.bz2
 xfs.rc)
-md5sums=('5cfc06a320f74f07a0aa73da62307e9a'
- 'e6c0071f6d5436113982f4a575d3f94b'
- 'a61be25c87ee42169ee4dc8344acc9e2'
- '49a6225380f6c18fff664a043cd569b1'
- '8f83d774ed4cc2a6dca86edd856d820a'
+md5sums=('e02c6cae689c082b8c98a421df8f8670'
+ 'aae6fa48b5c2ce9186a5ff4ccc14a1d4'
+ '9b50d967ac6d4bae9bffb62a5e527a50'
+ 'fc1f42aac16d6b76c79a1a3a0fb6a53b'
+ '50b466ab6ed4a5b8df5abf1ef844309a'
  '251f5447f64151e9bb096ebc9f999c3f')
 
 build() {
   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
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make configdir=/etc/X11/fs
+  popd  
+
+  for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do
+if [ -d ${i} ]; then
+  pushd ${i}
+  ./configure --prefix=/usr
+  make
+  popd
+fi
+  done
+}
+
+package() {
+  cd ${srcdir}
+  pushd xfs-${pkgver}
+  make configdir=/etc/X11/fs DESTDIR=${pkgdir} install
   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
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs
   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 -m644 COPYING 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*} || return 1
+  make DESTDIR=${pkgdir} install
+  install -m644 COPYING 
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
   popd
 fi
   done
   install -m755 -d ${pkgdir}/etc/rc.d
-  install -m755 ${srcdir}/xfs.rc ${pkgdir}/etc/rc.d/xfs || return 1
+  install -m755 ${srcdir}/xfs.rc ${pkgdir}/etc/rc.d/xfs
 }