[arch-commits] Commit in wipe/repos (3 files)

[Eric Bélanger]

    Date: Friday, March 20, 2009 @ 21:05:43
  Author: eric
Revision: 30590

Fixed svn conflict

Modified:
  wipe/repos/extra-x86_64/	(properties)
  wipe/repos/extra-x86_64/PKGBUILD
Deleted:
  wipe/repos/extra-x86_64/rand.patch

------------+
 PKGBUILD   |   17 ++++++++---------
 rand.patch |   10 ----------
 2 files changed, 8 insertions(+), 19 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-21 01:04:15 UTC (rev 30589)
+++ extra-x86_64/PKGBUILD	2009-03-21 01:05:43 UTC (rev 30590)
@@ -2,21 +2,20 @@
 # Maintainer: Jason Chu <jason at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
-force=y
 pkgname=wipe
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Wipe repeadetly overwrites special patterns to the files to be destroyed - a secure rm(1)"
-arch=(i686 x86_64)
-depends=('glibc')
+arch=('i686' 'x86_64')
 url="http://wipe.sourceforge.net/"
-source=(http://easynews.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
+license=('GPL')
+depends=('glibc')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('1e1366c6407e7910f6131ebfee9f1ea6')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-#  patch -i ../rand.patch || return 1
-  ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make bindir=$startdir/pkg/usr/bin prefix=$startdir/pkg/usr install
+  make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install || return 1
 }

Deleted: extra-x86_64/rand.patch
===================================================================
--- extra-x86_64/rand.patch	2009-03-21 01:04:15 UTC (rev 30589)
+++ extra-x86_64/rand.patch	2009-03-21 01:05:43 UTC (rev 30590)
@@ -1,10 +0,0 @@
---- rand.c-old	2003-04-05 15:29:18.000000000 -0800
-+++ rand.c	2003-04-05 15:29:42.000000000 -0800
-@@ -26,6 +26,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <errno.h>
- 
- #include "std.h"
- #include "io.h"