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

[Ronald van Haren]

    Date: Monday, July 27, 2009 @ 14:40:12
  Author: ronald
Revision: 47797

fix svn merge error

Modified:
  ntfsprogs/repos/extra-x86_64/	(properties)
  ntfsprogs/repos/extra-x86_64/PKGBUILD
Deleted:
  ntfsprogs/repos/extra-x86_64/ntfsprogs.install

-------------------+
 PKGBUILD          |   15 ++++++---------
 ntfsprogs.install |   24 ------------------------
 2 files changed, 6 insertions(+), 33 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-27 18:39:03 UTC (rev 47796)
+++ extra-x86_64/PKGBUILD	2009-07-27 18:40:12 UTC (rev 47797)
@@ -1,26 +1,23 @@
 # $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=ntfsprogs
 pkgver=2.0.0
-pkgrel=2
+pkgrel=3
 depends=('glibc' 'fuse' 'e2fsprogs')
 makedepends=('pkgconfig')
 pkgdesc="NTFS Resizing Tool"
 arch=(i686 x86_64)
 license=('GPL')
-#source=(http://heanet.dl.sourceforge.net/sourceforge/linux-ntfs/$pkgname-$pkgver.tar.gz)
-#source=(http://mesh.dl.sourceforge.net/sourceforge/linux-ntfs/$pkgname-$pkgver.tar.gz)
-source=(http://switch.dl.sourceforge.net/sourceforge/linux-ntfs/$pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/linux-ntfs/${pkgname}-${pkgver}.tar.gz)
 url="http://linux-ntfs.sourceforge.net"
-install=('ntfsprogs.install')
 options=(!libtool)
 md5sums=('2c402b647bb7aeb1d3f8ce1cc354fd68')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-gnome-vfs --enable-fuse-module PKG_CONFIG=/usr/bin/pkg-config
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --disable-gnome-vfs --mandir=/usr/share/man
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${pkgdir} install
 }
 

Deleted: extra-x86_64/ntfsprogs.install
===================================================================
--- extra-x86_64/ntfsprogs.install	2009-07-27 18:39:03 UTC (rev 47796)
+++ extra-x86_64/ntfsprogs.install	2009-07-27 18:40:12 UTC (rev 47797)
@@ -1,24 +0,0 @@
- # arg 1:  the new package version
-post_install() {
-cat << EOF
-NOTE:
-==> There is a good guide to use the ntfsresize utility at:
-    'http://mlf.linux.rulez.org/mlf/ezaz/ntfsresize.html'
-
-WARNING:
-==> This program "can" cause dataloss if you don't use it right!
-==> Make a backup of your files! You have been warned !!!     
-EOF
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-post_install $1
-}
-
-
-op=$1
-shift
-$op $*
\ No newline at end of file