- Update to version 1.2216.

- Add note in README.FreeBSD about mount(8) workarounds (symlink/patch) for
  using from /etc/fstab in FreeBSD >= 7.x, as external types are hard coded
  in mount.c.

5 files changed, 21 insertions, 8 deletions

diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 92d0da1c8f1a..ab14d0a2304d 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -5,7 +5,7 @@
 #
 
 PORTNAME=	ntfs
-PORTVERSION=	1.2129
+PORTVERSION=	1.2216
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ntfs-3g.org/
 PKGNAMEPREFIX=	fusefs-
diff --git a/sysutils/fusefs-ntfs/distinfo b/sysutils/fusefs-ntfs/distinfo
index dd01dc604f9a..51373ec74fb9 100644
--- a/sysutils/fusefs-ntfs/distinfo
+++ b/sysutils/fusefs-ntfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntfs-3g-1.2129.tgz) = 8dc058841779feb2ec2588c30fb28ad2
-SHA256 (ntfs-3g-1.2129.tgz) = 3101309eb31fec2cad160cbf67be181e3da3fcad5d6bfda621d1d752d378d801
-SIZE (ntfs-3g-1.2129.tgz) = 647786
+MD5 (ntfs-3g-1.2216.tgz) = d1664636d38e4ce8eb2af1f09bc5a15d
+SHA256 (ntfs-3g-1.2216.tgz) = b5669bc43840497f1b4d5e1038f9018bf840ce7af4afc18a9fec0467958acd92
+SIZE (ntfs-3g-1.2216.tgz) = 646352
diff --git a/sysutils/fusefs-ntfs/files/README.FreeBSD b/sysutils/fusefs-ntfs/files/README.FreeBSD
index 7fe4bd941bff..6747bf452264 100644
--- a/sysutils/fusefs-ntfs/files/README.FreeBSD
+++ b/sysutils/fusefs-ntfs/files/README.FreeBSD
@@ -52,6 +52,19 @@ instead of "ntfs", and the additional "late" parameter is required. Example:
 
 /dev/ad4s1		/wxp		ntfs-3g	rw,late		0	0
 
+Note that in FreeBSD 7.x, mount(8) has a fixed (hard coded) list of external
+mount_XXX programs that can be called, so to make this work you have to do one
+of the following:
+
+1. Rename /sbin/mount_ntfs, symlink ntfs-3g as the former, and use just "ntfs"
+   as the type in /etc/fstab.
+   $ mv /sbin/mount_ntfs /sbin/mount_ntfs-kern
+   $ ln -s /usr/sbin/mount_ntfs-3g /usr/sbin/mount_ntfs
+2. Apply a patch to src/sbin/mount/mount.c to add "ntfs-3g" as a valid type.
+3. Apply a patch to src/sbin/mount/mount.c to make it work like in 6.x (better
+   than the previous one as will allow any external type). It can be found at:
+   http://people.freebsd.org/~alepulver/current-7.0-mount.diff
+
 ==============================================================================
 4. Ublio configuration
 ==============================================================================
diff --git a/sysutils/fusefs-ntfs/files/patch-src-Makefile.in b/sysutils/fusefs-ntfs/files/patch-src-Makefile.in
index 8928cb5a4e92..a9c1e4ec380f 100644
--- a/sysutils/fusefs-ntfs/files/patch-src-Makefile.in
+++ b/sysutils/fusefs-ntfs/files/patch-src-Makefile.in
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	Mon Jan 28 16:08:09 2008
-+++ src/Makefile.in	Fri Feb  8 16:05:14 2008
+--- src/Makefile.in.orig	2008-02-16 14:14:31.000000000 -0300
++++ src/Makefile.in	2008-02-18 18:31:40.000000000 -0300
 @@ -638,7 +638,7 @@
  
  info-am:
@@ -13,7 +13,7 @@
  
  install-exec-local:
  	$(INSTALL) -d "$(DESTDIR)$(rootsbindir)"
--	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g"
+-	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
 +	$(LN_S) -f "$(rootbindir)/ntfs-3g" "/usr/sbin/mount_ntfs-3g"
  
  install-data-local:
diff --git a/sysutils/fusefs-ntfs/pkg-plist b/sysutils/fusefs-ntfs/pkg-plist
index 4bd3abbe0674..df251a17eafc 100644
--- a/sysutils/fusefs-ntfs/pkg-plist
+++ b/sysutils/fusefs-ntfs/pkg-plist
@@ -34,7 +34,7 @@ include/ntfs-3g/volume.h
 lib/libntfs-3g.a
 lib/libntfs-3g.la
 lib/libntfs-3g.so
-lib/libntfs-3g.so.21
+lib/libntfs-3g.so.23
 libdata/pkgconfig/libntfs-3g.pc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD