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

[Eric Bélanger]

    Date: Saturday, March 21, 2009 @ 16:31:52
  Author: eric
Revision: 30765

Merged revisions 356,30762 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xosd/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r30762 | eric | 2009-03-21 16:20:26 -0400 (Sat, 21 Mar 2009) | 2 lines
  
  upgpkg: xosd 2.2.14-2
      changed gdk-pixbuf to be an optdepends (close FS#12295), FHS man pages
........

Modified:
  xosd/repos/extra-i686/	(properties)
  xosd/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)


Property changes on: xosd/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xosd/trunk:1
   + /xosd/trunk:1-30764

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-21 20:26:12 UTC (rev 30764)
+++ extra-i686/PKGBUILD	2009-03-21 20:31:52 UTC (rev 30765)
@@ -4,23 +4,24 @@
 
 pkgname=xosd
 pkgver=2.2.14
-pkgrel=1
+pkgrel=2
 pkgdesc="XOSD displays text on your screen. On-Screen-Display-libs for some tools."
 arch=("i686" "x86_64")
 license=('GPL2')
 url="http://www.ignavus.net/software.html"
-depends=('libxt' 'libxinerama' 'gdk-pixbuf')
-makedepends=('xmms' 'bmp')
+depends=('libxt' 'libxinerama')
+makedepends=('xmms' 'bmp' 'gdk-pixbuf')
+optdepends=('gdk-pixbuf: for using the bmp or xmms plugin')
 options=(!libtool)
 #source=("http://www.ignavus.net/xosd-$pkgver.tar.bz2")
 source=("http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver.orig.tar.gz")
+md5sums=('4b349fe930e4eee2f504d6c02673e24d')
 
 build() {
-  cd $startdir/src/xosd-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/xosd-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg/ install
+  make DESTDIR=$pkgdir install || return 1
 }
 
 
-md5sums=('4b349fe930e4eee2f504d6c02673e24d')