From f399ef7cf6bd0f73ae798d35e41f84627b907f22 Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Sun, 10 Apr 2011 21:23:14 +0000
Subject: [PATCH] nfts-3g: update to new version - ntfsprogs removed

---
 ntfs-3g/PKGBUILD   | 16 ++++++++++------
 ntfsprogs/PKGBUILD | 24 ------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 ntfsprogs/PKGBUILD

diff --git a/ntfs-3g/PKGBUILD b/ntfs-3g/PKGBUILD
index 40c5e2e4b..9b75b4d50 100644
--- a/ntfs-3g/PKGBUILD
+++ b/ntfs-3g/PKGBUILD
@@ -5,7 +5,8 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=ntfs-3g
-pkgver=2011.1.15
+_realname=ntfs-3g_ntfsprogs
+pkgver=2011.4.12
 pkgrel=1
 pkgdesc="Stable read and write NTFS driver"
 url="http://www.tuxera.com"
@@ -14,19 +15,22 @@ license=('GPL2')
 depends=('glibc')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://www.tuxera.com/opensource/${pkgname}-${pkgver}.tgz
+conflicts=('ntfsprogs')
+provides=("ntfsprogs=${pkgver}")
+source=(http://www.tuxera.com/opensource/${_realname}-${pkgver}.tgz
         25-ntfs-config-write-policy.fdi)
-sha1sums=('d7cf0c5e8730568f5fa8802869d6fe8cdd4a0213'
+sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7'
           '200029f2999a2c284fd30ae25734abf6459c3501')
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_realname}-${pkgver}"
   ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
-    --with-fuse=internal --disable-static
+    --with-fuse=internal --disable-static --disable-gnome-vfs \
+    --mandir=/usr/share/man
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${_realname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs"
   install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
diff --git a/ntfsprogs/PKGBUILD b/ntfsprogs/PKGBUILD
deleted file mode 100644
index 56bf76566..000000000
--- a/ntfsprogs/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 48342 2009-08-01 14:46:45Z jgc $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=ntfsprogs
-pkgver=2.0.0
-pkgrel=4
-depends=('glibc' 'fuse' 'util-linux-ng>=2.16')
-makedepends=('pkgconfig')
-pkgdesc="NTFS filesystem utilities"
-arch=(i686 x86_64)
-license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/linux-ntfs/${pkgname}-${pkgver}.tar.gz)
-url="http://www.linux-ntfs.org/"
-options=(!libtool)
-md5sums=('2c402b647bb7aeb1d3f8ce1cc354fd68')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-gnome-vfs \
-      --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
-