8 files changed, 171 insertions, 15 deletions

diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 85b9b421fdee..f1911487ad39 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -5,11 +5,11 @@
 #
 
 PORTNAME=	ntfs
-PORTVERSION=	2010.10.2
+PORTVERSION=	2011.4.12
 CATEGORIES=	sysutils
 MASTER_SITES=	http://tuxera.com/opensource/
 PKGNAMEPREFIX=	fusefs-
-DISTNAME=	${PORTNAME}-3g-${PORTVERSION}
+DISTNAME=	${PORTNAME}-3g_ntfsprogs-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -25,8 +25,8 @@ USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
 		--disable-mtab --with-fuse=external
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
+CONFIGURE_ENV="LDFLAGS=-L${LOCALBASE}/lib"
 
 OPTIONS=	LOCK "Lock the device when mounting (avoids access)" on \
 		UBLIO "Enable user space cache for improved speed" on
@@ -34,7 +34,10 @@ OPTIONS=	LOCK "Lock the device when mounting (avoids access)" on \
 SUB_FILES=	pkg-message
 DOCSDIR=	${PREFIX}/share/doc/ntfs-3g
 
-MAN8=		ntfs-3g.8 ntfs-3g.probe.8 ntfs-3g.secaudit.8 ntfs-3g.usermap.8
+MAN8=		mkntfs.8 ntfs-3g.8 ntfs-3g.probe.8 \
+		ntfs-3g.secaudit.8 ntfs-3g.usermap.8 ntfscat.8 ntfsclone.8 \
+		ntfscluster.8 ntfscmp.8 ntfscp.8 ntfsfix.8 ntfsinfo.8 \
+		ntfslabel.8 ntfsls.8 ntfsprogs.8 ntfsresize.8 ntfsundelete.8
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/fusefs-ntfs/distinfo b/sysutils/fusefs-ntfs/distinfo
index 013224e112c9..1d8f357f5b2a 100644
--- a/sysutils/fusefs-ntfs/distinfo
+++ b/sysutils/fusefs-ntfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntfs-3g-2010.10.2.tgz) = 17c7e7f1ea22951bdefaa8aa0e36a011f65fbc76fc3511d16433c46d899e9e71
-SIZE (ntfs-3g-2010.10.2.tgz) = 875186
+SHA256 (ntfs-3g_ntfsprogs-2011.4.12.tgz) = aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248b2ee05
+SIZE (ntfs-3g_ntfsprogs-2011.4.12.tgz) = 1126704
diff --git a/sysutils/fusefs-ntfs/files/extra-patch-ublio b/sysutils/fusefs-ntfs/files/extra-patch-ublio
index b3fa2029c9b2..1a2f172c3b68 100644
--- a/sysutils/fusefs-ntfs/files/extra-patch-ublio
+++ b/sysutils/fusefs-ntfs/files/extra-patch-ublio
@@ -1,6 +1,6 @@
---- libntfs-3g/Makefile.in.orig	2010-03-06 13:12:36.000000000 -0300
-+++ libntfs-3g/Makefile.in	2010-10-04 15:10:43.000000000 -0300
-@@ -241,6 +241,7 @@
+--- libntfs-3g/Makefile.in.orig	2011-04-10 20:04:51.000000000 +0200
++++ libntfs-3g/Makefile.in	2011-04-25 18:54:01.000000000 +0200
+@@ -250,6 +250,7 @@
  libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
  libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined
  @FUSE_INTERNAL_TRUE@libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la
@@ -8,17 +8,20 @@
  libntfs_3g_la_SOURCES = acls.c attrib.c attrlist.c bitmap.c bootsect.c \
  	cache.c collate.c compat.c compress.c debug.c device.c dir.c \
  	efs.c index.c inode.c lcnalloc.c logfile.c logging.c mft.c \
---- src/ntfs-3g.c.orig	2010-03-06 13:12:25.000000000 -0300
-+++ src/ntfs-3g.c	2010-10-04 15:11:57.000000000 -0300
-@@ -3508,7 +3508,11 @@
+--- src/ntfs-3g.c.orig	2011-04-10 20:04:41.000000000 +0200
++++ src/ntfs-3g.c	2011-04-25 18:56:07.000000000 +0200
+@@ -3262,9 +3262,13 @@
  #else
  	.utime		= ntfs_fuse_utime,
  #endif
 +#ifndef __FreeBSD__
- 	.bmap		= ntfs_fuse_bmap,
++ 	.bmap		= ntfs_fuse_bmap,
 +#else
 +	.bmap		= NULL,
 +#endif
+ 	.fsync		= ntfs_fuse_fsync,
+ 	.fsyncdir	= ntfs_fuse_fsync,
+-	.bmap		= ntfs_fuse_bmap,
  	.destroy        = ntfs_fuse_destroy2,
  #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
  	.access		= ntfs_fuse_access,
diff --git a/sysutils/fusefs-ntfs/files/patch-ntfsprogs__Makefile.in b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__Makefile.in
new file mode 100644
index 000000000000..e45ed32216ff
--- /dev/null
+++ b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__Makefile.in
@@ -0,0 +1,15 @@
+--- ./ntfsprogs/Makefile.in.orig	2011-07-08 16:21:25.000000000 +0100
++++ ./ntfsprogs/Makefile.in	2011-07-08 16:21:40.000000000 +0100
+@@ -1073,12 +1073,8 @@
+ # mkfs.ntfs[.8] hard link
+ 
+ @ENABLE_NTFSPROGS_TRUE@install-exec-hook:
+-@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)/sbin
+-@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
+ 
+ @ENABLE_NTFSPROGS_TRUE@install-data-hook:
+-@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)$(man8dir)
+-@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ 
+ @ENABLE_NTFSPROGS_TRUE@uninstall-local:
+ @ENABLE_NTFSPROGS_TRUE@	$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
diff --git a/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsclone.c b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsclone.c
new file mode 100644
index 000000000000..3636660c30e2
--- /dev/null
+++ b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsclone.c
@@ -0,0 +1,77 @@
+--- ntfsprogs/ntfsclone.3	2011-04-10 20:04:41.000000000 +0200
++++ ntfsprogs/ntfsclone.c	2011-04-25 14:06:11.000000000 +0200
+@@ -89,6 +89,10 @@
+ #define BLKGETSIZE64	_IOR(0x12,114,size_t)	/* Get device size in bytes. */
+ #endif
+ 
++#ifdef __sun
++#define NO_STATFS 1	/* statfs(2) and f_type are not universal */
++#endif
++
+ static const char *EXEC_NAME = "ntfsclone";
+ 
+ static const char *bad_sectors_warning_msg =
+@@ -119,7 +123,9 @@
+ 	int restore_image;
+ 	char *output;
+ 	char *volume;
++#ifndef NO_STATFS
+ 	struct statfs stfs;
++#endif
+ } opt;
+ 
+ struct bitmap {
+@@ -629,6 +635,7 @@
+ 	}
+ 
+ 	if (write_all(&fd_out, buff, csize) == -1) {
++#ifndef NO_STATFS
+ 		int err = errno;
+ 		perr_printf("Write failed");
+ 		if (err == EIO && opt.stfs.f_type == 0x517b)
+@@ -637,6 +644,9 @@
+ 			       "efficient sparse file handling by default. "
+ 			       "Please try a different method.\n");
+ 		exit(1);
++#else
++		perr_printf("Write failed");
++#endif
+ 	}
+ }
+ 
+@@ -1565,6 +1575,7 @@
+ 
+ static void set_filesize(s64 filesize)
+ {
++#ifndef NO_STATFS
+ 	long fs_type = 0; /* Unknown filesystem type */
+ 
+ 	if (fstatfs(fd_out, &opt.stfs) == -1)
+@@ -1582,22 +1593,27 @@
+ 		Printf("WARNING: You're using SMBFS and if the remote share "
+ 		       "isn't Samba but a Windows\ncomputer then the clone "
+ 		       "operation will be very inefficient and may fail!\n");
++#endif
+ 
+ 	if (ftruncate(fd_out, filesize) == -1) {
+ 		int err = errno;
+ 		perr_printf("ftruncate failed for file '%s'", opt.output);
++#ifndef NO_STATFS
+ 		if (fs_type)
+ 			Printf("Destination filesystem type is 0x%lx.\n",
+ 			       (unsigned long)fs_type);
++#endif
+ 		if (err == E2BIG) {
+ 			Printf("Your system or the destination filesystem "
+ 			       "doesn't support large files.\n");
++#ifndef NO_STATFS
+ 			if (fs_type == 0x517b) {
+ 				Printf("SMBFS needs minimum Linux kernel "
+ 				       "version 2.4.25 and\n the 'lfs' option"
+ 				       "\nfor smbmount to have large "
+ 				       "file support.\n");
+ 			}
++#endif
+ 		} else if (err == EPERM) {
+ 			Printf("Apparently the destination filesystem doesn't "
+ 			       "support sparse files.\nYou can overcome this "
diff --git a/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsresize.c b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsresize.c
new file mode 100644
index 000000000000..70908f70d348
--- /dev/null
+++ b/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsresize.c
@@ -0,0 +1,12 @@
+--- ntfsprogs/ntfsresize.2	2011-04-10 20:04:41.000000000 +0200
++++ ntfsprogs/ntfsresize.c	2011-04-24 08:34:35.000000000 +0200
+@@ -48,6 +48,9 @@
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #endif
diff --git a/sysutils/fusefs-ntfs/files/patch-src__ntfs-3g_common.c b/sysutils/fusefs-ntfs/files/patch-src__ntfs-3g_common.c
new file mode 100644
index 000000000000..42889e483758
--- /dev/null
+++ b/sysutils/fusefs-ntfs/files/patch-src__ntfs-3g_common.c
@@ -0,0 +1,33 @@
+--- src/ntfs-3g_common.9	2011-04-23 09:17:21.000000000 +0200
++++ src/ntfs-3g_common.c	2011-04-24 08:24:33.000000000 +0200
+@@ -32,6 +32,10 @@
+ #include <string.h>
+ #endif
+
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
++
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+--- src/ntfs-3g_common.c.ref	2011-04-23 08:25:28.000000000 +0200
++++ src/ntfs-3g_common.c	2011-04-23 08:32:16.000000000 +0200
+@@ -58,8 +58,6 @@
+
+ static const char nf_ns_alt_xattr_efsinfo[] = "user.ntfs.efsinfo";
+
+-#ifdef HAVE_SETXATTR
+-
+ static const char def_opts[] = "allow_other,nonempty,";
+
+ 	/*
+@@ -573,6 +571,8 @@
+ 	return 0;
+ }
+
++#ifdef HAVE_SETXATTR
++
+ int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx,
+ 			char *list, size_t size, BOOL prefixing)
+ {
diff --git a/sysutils/fusefs-ntfs/pkg-plist b/sysutils/fusefs-ntfs/pkg-plist
index 24c7b40953bb..9bc34dd31c2b 100644
--- a/sysutils/fusefs-ntfs/pkg-plist
+++ b/sysutils/fusefs-ntfs/pkg-plist
@@ -3,6 +3,12 @@ bin/ntfs-3g
 bin/ntfs-3g.probe
 bin/ntfs-3g.secaudit
 bin/ntfs-3g.usermap
+bin/ntfscat
+bin/ntfscluster
+bin/ntfscmp
+bin/ntfsfix
+bin/ntfsinfo
+bin/ntfsls
 include/ntfs-3g/acls.h
 include/ntfs-3g/attrib.h
 include/ntfs-3g/attrlist.h
@@ -37,11 +43,18 @@ 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.a
 lib/libntfs-3g.la
 lib/libntfs-3g.so
-lib/libntfs-3g.so.80
+lib/libntfs-3g.so.81
 libdata/pkgconfig/libntfs-3g.pc
+sbin/mkntfs
+sbin/ntfsclone
+sbin/ntfscp
+sbin/ntfslabel
+sbin/ntfsresize
+sbin/ntfsundelete
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%@dirrm %%DOCSDIR%%