6 files changed, 21 insertions, 92 deletions
diff --git a/filesystems/fuse-ntfs-3g/Makefile b/filesystems/fuse-ntfs-3g/Makefile
index 42182863dab..df5c5fda361 100644
--- a/filesystems/fuse-ntfs-3g/Makefile
+++ b/filesystems/fuse-ntfs-3g/Makefile
@@ -1,23 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2012/10/03 16:08:32 asau Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/05/19 12:22:06 adam Exp $
 
-DISTNAME=	ntfs-3g-1.1120
-PKGNAME=	fuse-${DISTNAME}
+.include "../../filesystems/libntfs/Makefile.common"
+
+PKGNAME=	fuse-${DISTNAME:S/_ntfsprogs//}
 CATEGORIES=	filesystems
-MASTER_SITES=	http://www.ntfs-3g.org/
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ntfs-3g.org/
-COMMENT=	NTFS driver for Linux/FreeBSD/NetBSD with read and write support
+COMMENT=	NTFS driver with read and write support
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
+CONFIGURE_ARGS+=	--disable-ntfsprogs
+CONFIGURE_ARGS+=	--enable-mount-helper
 
-CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}
-CONFIGURE_ARGS+=	--disable-ldconfig
+BUILD_DIRS=		src
 
+.include "../../filesystems/libntfs/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/fuse-ntfs-3g/PLIST b/filesystems/fuse-ntfs-3g/PLIST
index f9bc3de85b8..0cc049dfb94 100644
--- a/filesystems/fuse-ntfs-3g/PLIST
+++ b/filesystems/fuse-ntfs-3g/PLIST
@@ -1,34 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:51:59 joerg Exp $
-bin/mount.ntfs-3g
+@comment $NetBSD: PLIST,v 1.4 2014/05/19 12:22:06 adam Exp $
+bin/lowntfs-3g
 bin/ntfs-3g
-man/man8/ntfs-3g.8
+bin/ntfs-3g.probe
+bin/ntfs-3g.secaudit
+bin/ntfs-3g.usermap
+man/man8/mount.lowntfs-3g.8
 man/man8/mount.ntfs-3g.8
-lib/libntfs-3g.la
-include/ntfs-3g/attrib.h
-include/ntfs-3g/attrlist.h
-include/ntfs-3g/bitmap.h
-include/ntfs-3g/bootsect.h
-include/ntfs-3g/collate.h
-include/ntfs-3g/compat.h
-include/ntfs-3g/compress.h
-include/ntfs-3g/debug.h
-include/ntfs-3g/device.h
-include/ntfs-3g/device_io.h
-include/ntfs-3g/dir.h
-include/ntfs-3g/endians.h
-include/ntfs-3g/index.h
-include/ntfs-3g/inode.h
-include/ntfs-3g/layout.h
-include/ntfs-3g/lcnalloc.h
-include/ntfs-3g/logfile.h
-include/ntfs-3g/logging.h
-include/ntfs-3g/mft.h
-include/ntfs-3g/mst.h
-include/ntfs-3g/ntfstime.h
-include/ntfs-3g/runlist.h
-include/ntfs-3g/security.h
-include/ntfs-3g/support.h
-include/ntfs-3g/types.h
-include/ntfs-3g/unistr.h
-include/ntfs-3g/version.h
-include/ntfs-3g/volume.h
+man/man8/ntfs-3g.8
+man/man8/ntfs-3g.probe.8
+man/man8/ntfs-3g.secaudit.8
+man/man8/ntfs-3g.usermap.8
+sbin/mount.lowntfs-3g
+sbin/mount.ntfs-3g
diff --git a/filesystems/fuse-ntfs-3g/buildlink3.mk b/filesystems/fuse-ntfs-3g/buildlink3.mk
deleted file mode 100644
index 52e11e32aaa..00000000000
--- a/filesystems/fuse-ntfs-3g/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/04 12:17:04 dsainty Exp $
-
-BUILDLINK_TREE+=	fuse-ntfs-3g
-
-.if !defined(FUSE_NTFS_3G_BUILDLINK3_MK)
-FUSE_NTFS_3G_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.fuse-ntfs-3g+=	fuse-ntfs-3g>=1.1120
-BUILDLINK_PKGSRCDIR.fuse-ntfs-3g?=	../../filesystems/fuse-ntfs-3g
-.endif	# FUSE_NTFS_3G_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-fuse-ntfs-3g
diff --git a/filesystems/fuse-ntfs-3g/distinfo b/filesystems/fuse-ntfs-3g/distinfo
deleted file mode 100644
index 54dfd51d17c..00000000000
--- a/filesystems/fuse-ntfs-3g/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.16 2012/08/17 13:39:06 marino Exp $
-
-SHA1 (ntfs-3g-1.1120.tgz) = 203b6194e4dc531065b81c8f2ef72dd247e48a9b
-RMD160 (ntfs-3g-1.1120.tgz) = ecaef2641e018364620507a0703546a62c2a7683
-Size (ntfs-3g-1.1120.tgz) = 577005 bytes
-SHA1 (patch-ab) = 9bc1480296f2306aac2b8f2eb67a16743372bced
-SHA1 (patch-configure) = db38a4acf8af45f5755cdfdca9404da71efc72b6
diff --git a/filesystems/fuse-ntfs-3g/patches/patch-ab b/filesystems/fuse-ntfs-3g/patches/patch-ab
deleted file mode 100644
index c35774ee92b..00000000000
--- a/filesystems/fuse-ntfs-3g/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2009/07/08 16:34:40 joerg Exp $
-
---- src/Makefile.in.orig	2007-03-27 23:24:12.000000000 +0200
-+++ src/Makefile.in	2007-04-13 11:16:54.000000000 +0200
-@@ -585,7 +585,7 @@
- 
- install-exec-local:
- 	$(INSTALL) -d $(DESTDIR)/sbin
--	$(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)/sbin/mount.ntfs-3g
-+	$(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)$(bindir)/mount.ntfs-3g
- 
- install-data-local:
- 	$(INSTALL) -d $(DESTDIR)$(man8dir)
diff --git a/filesystems/fuse-ntfs-3g/patches/patch-configure b/filesystems/fuse-ntfs-3g/patches/patch-configure
deleted file mode 100644
index b5b6860b3e5..00000000000
--- a/filesystems/fuse-ntfs-3g/patches/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/08/17 13:39:06 marino Exp $
-
---- configure.orig	2007-11-19 00:27:04.000000000 +0000
-+++ configure
-@@ -20066,7 +20066,7 @@ fi
- 
- 
- case "$target_os" in
--linux*|darwin*|netbsd*)
-+linux*|darwin*|netbsd*|dragonfly*)
- 
- 
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then