Changes 2014.2.15:

libntfs: added use of hd library to get the legacy BIOS geometry
libntfs: switched to /proc/mounts for checking existing mounts
libntfs: fixed usa checking by ntfsck on 4K sector disks
libntfs: fixed processing compressed data beyond file size (Windows 8 compliance)
libntfs: fixed expanding a resident attribute without inserting holes
libntfs: allow DACLs to not have any ACE
libntfs: ignore unmapped regions when checking whether sparse
libntfs: upgraded the Win32 interface for use with ntfsprogs
ntfsresize: enabled relocating the MFT when shrinking a volume
ntfsresize: fixed trying to update the MFT and Bitmap on a test run
ntfsresize: fixed updating all the MFT runs in a relocated MFT
ntfsresize: set the backup boot sector when the size is reliable
ntfsresize: reserved a single sector for the backup boot sector
ntfsundelete: output the modification time when scanning files
ntfsundelete: ported to Windows
ntfsclone: fixed wiping fragmented metadata when creating a metadata image
ntfsclone: allowed cloning a file system despite allocation errors
ntfsclone: fixed bad copying of the backup boot sector
ntfsclone: ported to Windows
ntfsdecrypt: made compatible with libgrypt-1.6

14 files changed, 408 insertions, 0 deletions

diff --git a/filesystems/libntfs/DESCR b/filesystems/libntfs/DESCR
new file mode 100644
index 00000000000..f19858adc51
--- /dev/null
+++ b/filesystems/libntfs/DESCR
@@ -0,0 +1,5 @@
+The Linux-NTFS project aims to bring full support for the NTFS filesystem to the
+Linux operating system.  The ntfsprogs package currently consists of a static
+library and utilities such as mkntfs, ntfscat, ntfsls, ntfsresize, and
+ntfsundelete (for a full list of included utilities see man 8 ntfsprogs after
+installation).
diff --git a/filesystems/libntfs/Makefile b/filesystems/libntfs/Makefile
new file mode 100644
index 00000000000..a9de50969fe
--- /dev/null
+++ b/filesystems/libntfs/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+.include "Makefile.common"
+
+PKGNAME=	lib${DISTNAME:S/-3g_ntfsprogs//}
+CATEGORIES=	sysutils
+
+COMMENT=	Linux-NTFS project utilities for the Windows NT Filesystem
+
+CONFIGURE_ARGS+=	--disable-ntfs-3g
+CONFIGURE_ARGS+=	--disable-ntfsprogs
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/libntfs/Makefile.common b/filesystems/libntfs/Makefile.common
new file mode 100644
index 00000000000..46fc441eb88
--- /dev/null
+++ b/filesystems/libntfs/Makefile.common
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.1 2014/05/19 12:22:06 adam Exp $
+# used by filesystems/fuse-ntfs-3g/Makefile
+# used by sysutils/ntfsprogs/Makefile
+
+DISTNAME=	ntfs-3g_ntfsprogs-2014.2.15
+CATEGORIES=	sysutils
+MASTER_SITES=	http://tuxera.com/opensource/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER?=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.tuxera.com/community/ntfs-3g-download/
+LICENSE=	gnu-gpl-v2
+
+DISTINFO_FILE=	${.CURDIR}/../../filesystems/libntfs/distinfo
+PATCHDIR=	${.CURDIR}/../../filesystems/libntfs/patches
+
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-posix-acls
+CONFIGURE_ARGS+=	--enable-xattr-mappings
diff --git a/filesystems/libntfs/PLIST b/filesystems/libntfs/PLIST
new file mode 100644
index 00000000000..5926f961c24
--- /dev/null
+++ b/filesystems/libntfs/PLIST
@@ -0,0 +1,39 @@
+@comment $NetBSD: PLIST,v 1.1 2014/05/19 12:22:06 adam Exp $
+include/ntfs-3g/acls.h
+include/ntfs-3g/attrib.h
+include/ntfs-3g/attrlist.h
+include/ntfs-3g/bitmap.h
+include/ntfs-3g/bootsect.h
+include/ntfs-3g/cache.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/efs.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/misc.h
+include/ntfs-3g/mst.h
+include/ntfs-3g/ntfstime.h
+include/ntfs-3g/object_id.h
+include/ntfs-3g/param.h
+include/ntfs-3g/realpath.h
+include/ntfs-3g/reparse.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/volume.h
+include/ntfs-3g/xattrs.h
+lib/libntfs-3g.la
+lib/pkgconfig/libntfs-3g.pc
diff --git a/filesystems/libntfs/buildlink3.mk b/filesystems/libntfs/buildlink3.mk
new file mode 100644
index 00000000000..1ea97f6e934
--- /dev/null
+++ b/filesystems/libntfs/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+BUILDLINK_TREE+=	libntfs
+
+.if !defined(LIBNTFS_BUILDLINK3_MK)
+LIBNTFS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libntfs+=	libntfs>=2014.2.15
+BUILDLINK_PKGSRCDIR.libntfs?=	../../filesystems/libntfs
+.endif	# LIBNTFS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libntfs
diff --git a/filesystems/libntfs/distinfo b/filesystems/libntfs/distinfo
new file mode 100644
index 00000000000..a02576e35c6
--- /dev/null
+++ b/filesystems/libntfs/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+SHA1 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = c9836f340b508f5d7776156e5afb02434d3f0174
+RMD160 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 32418b98e60a483173352eb22cc101ed82c92ebf
+Size (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575 bytes
+SHA1 (patch-Makefile.in) = 874ba5084b5eea312a24d7a6b339f83a3f7896d8
+SHA1 (patch-include_ntfs-3g_compat.h) = 78ea127359416c9106eef7025a2ccc84fd0b4447
+SHA1 (patch-include_ntfs-3g_types.h) = b6731cee8e1cd72dfe1ef485f4f997e8dfa6e928
+SHA1 (patch-libntfs-3g_Makefile.in) = 50a318a1c9a0a68d42e5cac2557e781f8c728094
+SHA1 (patch-libntfs-3g_device.c) = 3ad49d69b03cdd500246f77d9f6e30ca3d2e2ec6
+SHA1 (patch-ntfsprogs_Makefile.in) = 9acd073006c54009cedeafc766c964e9b5f11468
+SHA1 (patch-ntfsprogs_ntfsclone.c) = 3306b501e94ce71a709f394516829a727aa743ad
+SHA1 (patch-src_Makefile.in) = 78d107a3ba0e9e0b39a4c5e4eaad2fd58bb9ade2
diff --git a/filesystems/libntfs/patches/patch-Makefile.in b/filesystems/libntfs/patches/patch-Makefile.in
new file mode 100644
index 00000000000..8ee3af4c0ea
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+Don't install README.
+
+--- Makefile.in.orig	2014-05-19 07:53:27.000000000 +0000
++++ Makefile.in
+@@ -754,7 +754,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
diff --git a/filesystems/libntfs/patches/patch-include_ntfs-3g_compat.h b/filesystems/libntfs/patches/patch-include_ntfs-3g_compat.h
new file mode 100644
index 00000000000..d31ae1cb0ef
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-include_ntfs-3g_compat.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_ntfs-3g_compat.h,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+NetBSD-1.6.2 does not know about ENOTSUP.
+
+--- include/ntfs-3g/compat.h.orig	2013-01-13 06:46:35.000000000 +0000
++++ include/ntfs-3g/compat.h
+@@ -71,5 +71,9 @@ extern char *strsep(char **stringp, cons
+ 
+ #endif /* defined WINDOWS */
+ 
++#ifndef ENOTSUP
++#define ENOTSUP EINVAL
++#endif
++
+ #endif /* defined _NTFS_COMPAT_H */
+ 
diff --git a/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h b/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h
new file mode 100644
index 00000000000..0dd5594dcd0
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-include_ntfs-3g_types.h,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+--- include/ntfs-3g/types.h.orig	2013-01-13 06:46:35.000000000 +0000
++++ include/ntfs-3g/types.h
+@@ -68,6 +68,16 @@ typedef sle64 leVCN;
+ typedef s64 LCN;
+ typedef sle64 leLCN;
+ 
++/* XXX For some reason, including sys/mount.h on osx defines TRUE and FALSE
++ * so clear them here.
++ */
++#ifdef FALSE
++#undef FALSE
++#endif
++#ifdef TRUE
++#undef TRUE
++#endif
++
+ /*
+  * The NTFS journal $LogFile uses log sequence numbers which are signed 64-bit
+  * values.  We define our own type LSN, to allow for type checking and better
diff --git a/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in b/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in
new file mode 100644
index 00000000000..17f6d469557
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD: patch-libntfs-3g_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+--- libntfs-3g/Makefile.in.orig	2014-02-15 14:08:00.000000000 +0000
++++ libntfs-3g/Makefile.in
+@@ -849,7 +849,6 @@ install-dvi-am:
+ 
+ install-exec-am: install-libLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-am
+ 
+ install-html-am:
diff --git a/filesystems/libntfs/patches/patch-libntfs-3g_device.c b/filesystems/libntfs/patches/patch-libntfs-3g_device.c
new file mode 100644
index 00000000000..c731c9b8ce3
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-libntfs-3g_device.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-libntfs-3g_device.c,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+--- libntfs-3g/device.c.orig	2014-02-15 14:07:52.000000000 +0000
++++ libntfs-3g/device.c
+@@ -95,6 +95,10 @@
+ #	define BLKBSZSET _IOW(0x12,113,size_t) /* Set device block size in bytes. */
+ #endif
+ 
++#if defined(__NetBSD__)
++#include <sys/disklabel.h> /* XXX autoconf this ? */
++#endif
++
+ /**
+  * ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
+  * @name:	name of the device (must be present)
+@@ -596,6 +600,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
+ 		}
+ 	}
+ #endif
++#ifdef DIOCGPART
++	{
++		struct stat st;
++		if (dev->d_ops->stat(dev, &st) >= 0) {
++			struct disklabel disklabel;
++			int secsize;
++			s64 psize;
++			if (dev->d_ops->ioctl(dev, DIOCGDINFO, &disklabel) >= 0) {
++				secsize = disklabel.d_secsize;
++				psize = disklabel.d_partitions[DISKPART(st.st_rdev)].p_size;
++				ntfs_log_debug("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n",
++						secsize, psize, psize);
++				return psize * secsize / block_size;
++			}
++		}
++	}
++#endif
+ 	/*
+ 	 * We couldn't figure it out by using a specialized ioctl,
+ 	 * so do binary search to find the size of the device.
diff --git a/filesystems/libntfs/patches/patch-ntfsprogs_Makefile.in b/filesystems/libntfs/patches/patch-ntfsprogs_Makefile.in
new file mode 100644
index 00000000000..19f58ef7133
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-ntfsprogs_Makefile.in
@@ -0,0 +1,33 @@
+$NetBSD: patch-ntfsprogs_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+Link against already built and installed libntfs.
+
+--- ntfsprogs/Makefile.in.orig	2014-02-15 14:08:00.000000000 +0000
++++ ntfsprogs/Makefile.in
+@@ -89,8 +89,7 @@ am__mkntfs_SOURCES_DIST = attrdef.c attr
+ @ENABLE_NTFSPROGS_TRUE@	mkntfs-utils.$(OBJEXT)
+ mkntfs_OBJECTS = $(am_mkntfs_OBJECTS)
+ am__DEPENDENCIES_1 =
+-@REALLYSTATIC_FALSE@am__DEPENDENCIES_2 =  \
+-@REALLYSTATIC_FALSE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
++am__DEPENDENCIES_2 =
+ @REALLYSTATIC_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a \
+ @REALLYSTATIC_TRUE@	$(am__DEPENDENCIES_1)
+ @ENABLE_NTFSPROGS_TRUE@mkntfs_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@@ -454,7 +453,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@REALLYSTATIC_FALSE@AM_LIBS = $(top_builddir)/libntfs-3g/libntfs-3g.la
++@REALLYSTATIC_FALSE@AM_LIBS = -lntfs-3g
+ @REALLYSTATIC_TRUE@AM_LIBS = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a $(NTFSPROGS_STATIC_LIBS)
+ @REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries)
+ # older builds may need -static instead of newer -all-static
+@@ -1104,7 +1103,6 @@ install-dvi-am:
+ 
+ install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-am
+ 
+ install-html-am:
diff --git a/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c b/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c
new file mode 100644
index 00000000000..4d3e1a5674c
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c
@@ -0,0 +1,55 @@
+$NetBSD: patch-ntfsprogs_ntfsclone.c,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+--- ntfsprogs/ntfsclone.c.orig	2014-02-15 14:07:52.000000000 +0000
++++ ntfsprogs/ntfsclone.c
+@@ -68,6 +68,19 @@
+  */
+ #define NTFS_DO_NOT_CHECK_ENDIANS
+ 
++#ifdef __NetBSD__
++#  include <sys/param.h>
++   /* NetBSD versions later than 2.99.9 have statvfs(2) instead of statfs(2) */
++#  if __NetBSD_Version__ >= 299000900
++#    include <sys/statvfs.h>
++#    define F_TYPE	f_fsid
++#  else
++#    define F_TYPE	f_type
++#  endif
++#else
++#  define F_TYPE	f_type
++#endif
++
+ #include "debug.h"
+ #include "types.h"
+ #include "support.h"
+@@ -161,8 +174,12 @@ static struct {
+ 	char *output;
+ 	char *volume;
+ #ifndef NO_STATFS
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
++	struct statvfs stfs;
++#else
+ 	struct statfs stfs;
+ #endif
++#endif
+ } opt;
+ 
+ struct bitmap {
+@@ -818,7 +835,7 @@ static void copy_cluster(int rescue, u64
+ #ifndef NO_STATFS
+ 		int err = errno;
+ 		perr_printf("Write failed");
+-		if (err == EIO && opt.stfs.f_type == 0x517b)
++		if (err == EIO && opt.stfs.F_TYPE == 0x517b)
+ 			Printf("Apparently you tried to clone to a remote "
+ 			       "Windows computer but they don't\nhave "
+ 			       "efficient sparse file handling by default. "
+@@ -2238,7 +2255,7 @@ static void set_filesize(s64 filesize)
+ 		Printf("WARNING: Couldn't get filesystem type: "
+ 		       "%s\n", strerror(errno));
+ 	else
+-		fs_type = opt.stfs.f_type;
++		fs_type = opt.stfs.F_TYPE;
+ 
+ 	if (fs_type == 0x52654973)
+ 		Printf("WARNING: You're using ReiserFS, it has very poor "
diff --git a/filesystems/libntfs/patches/patch-src_Makefile.in b/filesystems/libntfs/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..948c8f8986f
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-src_Makefile.in
@@ -0,0 +1,114 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+Link against already built and installed libntfs.
+Install binaries into PREFIX, not the root directory.
+
+--- src/Makefile.in.orig	2014-02-15 14:08:01.000000000 +0000
++++ src/Makefile.in
+@@ -68,8 +68,7 @@ lowntfs_3g_OBJECTS = $(am_lowntfs_3g_OBJ
+ am__DEPENDENCIES_1 =
+ @FUSE_INTERNAL_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ @FUSE_INTERNAL_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/libfuse-lite/libfuse-lite.la
+-@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+-@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ lowntfs_3g_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lowntfs_3g_CFLAGS) \
+ 	$(CFLAGS) $(lowntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
+@@ -77,8 +76,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_OBJECTS = ntfs_3g-ntfs-3g.$(OBJEXT) \
+ @ENABLE_NTFS_3G_TRUE@	ntfs_3g-ntfs-3g_common.$(OBJEXT)
+ ntfs_3g_OBJECTS = $(am_ntfs_3g_OBJECTS)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+-@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ ntfs_3g_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(ntfs_3g_CFLAGS) $(CFLAGS) \
+ 	$(ntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
+@@ -86,8 +84,7 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_probe_OBJECTS =  \
+ @ENABLE_NTFS_3G_TRUE@	ntfs_3g_probe-ntfs-3g.probe.$(OBJEXT)
+ ntfs_3g_probe_OBJECTS = $(am_ntfs_3g_probe_OBJECTS)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES =  \
+-@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES =
+ ntfs_3g_probe_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_probe_CFLAGS) \
+ 	$(CFLAGS) $(ntfs_3g_probe_LDFLAGS) $(LDFLAGS) -o $@
+@@ -95,8 +92,7 @@ am__ntfs_3g_secaudit_SOURCES_DIST = seca
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_secaudit_OBJECTS =  \
+ @ENABLE_NTFS_3G_TRUE@	ntfs_3g_secaudit-secaudit.$(OBJEXT)
+ ntfs_3g_secaudit_OBJECTS = $(am_ntfs_3g_secaudit_OBJECTS)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES =  \
+-@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES =
+ ntfs_3g_secaudit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_secaudit_CFLAGS) \
+ 	$(CFLAGS) $(ntfs_3g_secaudit_LDFLAGS) $(LDFLAGS) -o $@
+@@ -104,8 +100,7 @@ am__ntfs_3g_usermap_SOURCES_DIST = userm
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_usermap_OBJECTS =  \
+ @ENABLE_NTFS_3G_TRUE@	ntfs_3g_usermap-usermap.$(OBJEXT)
+ ntfs_3g_usermap_OBJECTS = $(am_ntfs_3g_usermap_OBJECTS)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES =  \
+-@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES =
+ ntfs_3g_usermap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_usermap_CFLAGS) \
+ 	$(CFLAGS) $(ntfs_3g_usermap_LDFLAGS) $(LDFLAGS) -o $@
+@@ -287,9 +282,9 @@ pkgconfigdir = @pkgconfigdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-rootbindir = @rootbindir@
+-rootlibdir = @rootlibdir@
+-rootsbindir = @rootsbindir@
++rootbindir = @bindir@
++rootlibdir = @libdir@
++rootsbindir = @sbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -313,7 +308,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+ @ENABLE_NTFS_3G_TRUE@		ntfs-3g.usermap.8 \
+ @ENABLE_NTFS_3G_TRUE@		ntfs-3g.secaudit.8
+ 
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(FUSE_LIBS) -lntfs-3g
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
+ @ENABLE_NTFS_3G_TRUE@ntfs_3g_CFLAGS = \
+ @ENABLE_NTFS_3G_TRUE@	$(AM_CFLAGS) 			\
+@@ -322,7 +317,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+ @ENABLE_NTFS_3G_TRUE@	-I$(top_srcdir)/include/ntfs-3g
+ 
+ @ENABLE_NTFS_3G_TRUE@ntfs_3g_SOURCES = ntfs-3g.c ntfs-3g_common.c
+-@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(FUSE_LIBS) -lntfs-3g
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@lowntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
+ @ENABLE_NTFS_3G_TRUE@lowntfs_3g_CFLAGS = \
+ @ENABLE_NTFS_3G_TRUE@	$(AM_CFLAGS) 			\
+@@ -331,9 +326,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+ @ENABLE_NTFS_3G_TRUE@	-I$(top_srcdir)/include/ntfs-3g
+ 
+ @ENABLE_NTFS_3G_TRUE@lowntfs_3g_SOURCES = lowntfs-3g.c ntfs-3g_common.c
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_LDADD = -lntfs-3g
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_LDADD = -lntfs-3g
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_LDADD = -lntfs-3g
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static
+@@ -921,9 +916,9 @@ uninstall-man: uninstall-man8
+ @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@	$(LDCONFIG)
+ 
+ @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local:	install-rootbinPROGRAMS
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(MKDIR_P) "$(DESTDIR)/sbin"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(MKDIR_P) "$(DESTDIR)/$(sbindir)"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/$(sbindir)/mount.ntfs-3g"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/$(sbindir)/mount.lowntfs-3g"
+ 
+ @ENABLE_NTFS_3G_TRUE@install-data-local:	install-man8
+ @ENABLE_NTFS_3G_TRUE@	$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"