Thu Mar 7 00:04:11 PST 2013

1 files changed, 13 insertions, 31 deletions

diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index 00622cbaf..efe13d040 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,22 +1,27 @@
-# $Id: PKGBUILD 176861 2013-02-01 21:35:19Z eric $
+# $Id: PKGBUILD 179546 2013-03-06 15:52:21Z eric $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Bächler <thomas.archlinux.org>
 
 pkgbase=ntfs-3g_ntfsprogs
-pkgname=('ntfs-3g' 'ntfsprogs')
+pkgname=ntfs-3g
 pkgver=2013.1.13
-pkgrel=1
-url="http://www.tuxera.com/community/ntfs-3g-download/"
+pkgrel=2
+pkgdesc="NTFS filesystem utilities"
 arch=('i686' 'x86_64')
+url="http://www.tuxera.com/community/ntfs-3g-download/"
 license=('GPL2')
-depends=('glibc' 'fuse')
+depends=('util-linux' 'fuse')
+conflicts=('ntfsprogs')
+provides=('ntfsprogs')
+replaces=('ntfsprogs')
 options=('!libtool')
 source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
 sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
+  sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in
   ./configure --prefix=/usr \
     --with-fuse=external --disable-static \
     --enable-posix-acls --disable-ldconfig \
@@ -25,30 +30,7 @@ build() {
 }
 
 package_ntfs-3g() {
-  pkgdesc="Stable read and write NTFS driver"
-
-  for DIR in src libntfs-3g include; do
-    cd "$srcdir/$pkgbase-$pkgver/$DIR"
-    make DESTDIR="$pkgdir" install
-  done
-
-  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/{s,}bin
-  rmdir "$pkgdir/lib"
-
-  cd "$pkgdir"/usr/bin
-  ln -s ntfs-3g mount.ntfs
-  ln -s ntfs-3g mount.ntfs-3g
-  ln -s lowntfs-3g mount.lowntfs-3g
-}
-
-package_ntfsprogs() {
-  pkgdesc="NTFS filesystem utilities"
-  depends=('util-linux' 'ntfs-3g')
-
-  cd "$srcdir/$pkgbase-$pkgver/ntfsprogs"
-  make DESTDIR="$pkgdir" install
-
-  mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/
-  rm -rf "$pkgdir"/sbin
+  cd "$srcdir/$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+  ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs"
 }