[arch-commits] Commit in catdoc/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Friday, March 27, 2009 @ 23:50:45
  Author: eric
Revision: 31735

Merged revisions 356,2304,31734 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/catdoc/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2304 | paul | 2008-05-31 01:00:40 -0400 (Sat, 31 May 2008) | 2 lines
  
  Added licenses for 64 packages.
........
  r31734 | eric | 2009-03-27 23:50:27 -0400 (Fri, 27 Mar 2009) | 2 lines
  
  upgpkg: catdoc 0.94.2-2
      Updated url, Added tk optdepends, Disabled SMP build, FHS man pages
........

Modified:
  catdoc/repos/extra-x86_64/	(properties)
  catdoc/repos/extra-x86_64/PKGBUILD

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


Property changes on: catdoc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /catdoc/trunk:1
   + /catdoc/trunk:1-31734

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-28 03:50:27 UTC (rev 31734)
+++ extra-x86_64/PKGBUILD	2009-03-28 03:50:45 UTC (rev 31735)
@@ -4,18 +4,21 @@
 
 pkgname=catdoc
 pkgver=0.94.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
 arch=(i686 x86_64)
-url="http://www.45.free.net/~vitus/software/catdoc/"
+url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+license=('GPL')
 depends=('glibc')
-source=(ftp://ftp.45.free.net/pub/catdoc/$pkgname-$pkgver.tar.gz)
+optdepends=('tk: for using wordview')
+options=('!makeflags')
+source=(http://ftp.wagner.pp.ru/pub/catdoc/$pkgname-$pkgver.tar.gz)
 md5sums=('243e1680bb3e703616f5adecfee24491')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr  --with-wish=/usr/bin/wish
-  /usr/bin/make || return 1
-  /usr/bin/make prefix=$startdir/pkg/usr install
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --with-wish=/usr/bin/wish || return 1
+  make || return 1
+  make installroot=$pkgdir mandir=/usr/share/man/man1 install || return 1
 }
 # vim: ts=2 sw=2 et ft=sh