[arch-commits] Commit in ntfs-3g_ntfsprogs/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, February 26, 2013 @ 06:01:14
  Author: eric
Revision: 178626

upgpkg: ntfs-3g_ntfsprogs 2013.1.13-2

Merge ntfsprogs with ntfs-3g

Modified:
  ntfs-3g_ntfsprogs/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-25 23:26:23 UTC (rev 178625)
+++ PKGBUILD	2013-02-26 05:01:14 UTC (rev 178626)
@@ -4,19 +4,24 @@
 # Contributor: Thomas Bächler <thomas.archlinux.org>
 
 pkgbase=ntfs-3g_ntfsprogs
-pkgname=('ntfs-3g' 'ntfsprogs')
+pkgname=ntfs-3g
 pkgver=2013.1.13
-pkgrel=1
+pkgrel=2
+pkgdesc="NTFS filesystem utilities"
+arch=('i686' 'x86_64')
 url="http://www.tuxera.com/community/ntfs-3g-download/"
-arch=('i686' 'x86_64')
 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 @@
 }
 
 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
+  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"
 }
-
-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
-}