update to ntfs_3g-20220507

from Yifei Zhan and tests from Josh Grosse and me, plus:
- regen patches
- remove useless lib/ntfs-3g dir for plugins which aren't (for some
reason) built here; previously was created but not included in plist
(maintainer timeout)

sysutils/ntfs-3g/Makefile

@@ -1,11 +1,10 @@
 COMMENT =	FUSE NTFS driver with read/write support
 
-V =		2017.3.23
+V =		2022.5.17
 DISTNAME =	ntfs-3g_ntfsprogs-${V}
 PKGNAME =	ntfs_3g-${V}
-SHARED_LIBS +=	ntfs-3g		0.2	# .88
+SHARED_LIBS +=	ntfs-3g		1.0	# 89.0
 CATEGORIES =	sysutils
-REVISION =	3
 
 HOMEPAGE =	https://www.tuxera.com/community/open-source-ntfs-3g/
 
@@ -31,4 +30,7 @@ CONFIGURE_ARGS =	--disable-ldconfig \
 			--enable-mount-helper \
 			--with-fuse=external
 
+post-install:
+	rmdir ${PREFIX}/lib/ntfs-3g
+
 .include <bsd.port.mk>

sysutils/ntfs-3g/distinfo

@@ -1,2 +1,2 @@
-SHA256 (ntfs-3g_ntfsprogs-2017.3.23.tgz) = PloCHXt2EmGDbcswU3CvKZeT7tve1zHfPWlDgC4SYtU=
+SHA256 (ntfs-3g_ntfsprogs-2022.5.17.tgz) = BIn7tpclgeG0F6tXjVQ/auUi5/pkjDybSceJUQ/V65M=
-SIZE (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 1259054
+SIZE (ntfs-3g_ntfsprogs-2022.5.17.tgz) = 1318476

sysutils/ntfs-3g/patches/patch-configure

@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -12882,7 +12882,7 @@ else
+@@ -13372,7 +13372,7 @@ else
  fi
  
  		;;

sysutils/ntfs-3g/patches/patch-libntfs-3g_Makefile_in

@@ -1,7 +1,7 @@
 Index: libntfs-3g/Makefile.in
 --- libntfs-3g/Makefile.in.orig
 +++ libntfs-3g/Makefile.in
-@@ -1050,15 +1050,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
+@@ -1168,15 +1168,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
  # We may need to move .so files to root
  # And create ldscript or symbolic link from /usr
  install-exec-hook: install-rootlibLTLIBRARIES

sysutils/ntfs-3g/patches/patch-libntfs-3g_mft_c

@@ -1,7 +1,9 @@
 - rip off mkntfs_get_page_size() from mkntfs.c, to avoid a build error
   on archs where PAGE_SIZE is unusable.
---- libntfs-3g/mft.c.orig	Sat Mar 14 15:10:12 2015
+
-+++ libntfs-3g/mft.c	Sun Jul 19 19:03:42 2015
+Index: libntfs-3g/mft.c
+--- libntfs-3g/mft.c.orig
++++ libntfs-3g/mft.c
 @@ -27,6 +27,9 @@
  #include "config.h"
  #endif
@@ -12,7 +14,7 @@
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
  #endif
-@@ -454,9 +457,28 @@ static int ntfs_is_mft(ntfs_inode *ni)
+@@ -522,9 +525,28 @@ static int ntfs_is_mft(ntfs_inode *ni)
  	return 0;
  }
  
@@ -43,7 +45,7 @@
  
  #define RESERVED_MFT_RECORDS   64
  
-@@ -482,6 +504,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -550,6 +572,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
  	s64 pass_end, ll, data_pos, pass_start, ofs, bit;
  	ntfs_attr *mftbmp_na;
  	u8 *buf, *byte;
@@ -51,7 +53,7 @@
  	unsigned int size;
  	u8 pass, b;
  	int ret = -1;
-@@ -493,7 +516,8 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -561,7 +584,8 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
  	 * Set the end of the pass making sure we do not overflow the mft
  	 * bitmap.
  	 */
@@ -61,7 +63,7 @@
  	pass_end = vol->mft_na->allocated_size >> vol->mft_record_size_bits;
  	ll = mftbmp_na->initialized_size << 3;
  	if (pass_end > ll)
-@@ -519,7 +543,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -587,7 +611,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
  		pass = 2;
  	}
  	pass_start = data_pos;
@@ -70,7 +72,7 @@
  	if (!buf)
  		goto leave;
  	
-@@ -532,7 +556,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -600,7 +624,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
  	b = 0;
  #endif
  	/* Loop until a free mft record is found. */

sysutils/ntfs-3g/patches/patch-libntfs-3g_security_c

@@ -1,7 +1,7 @@
 Index: libntfs-3g/security.c
 --- libntfs-3g/security.c.orig
 +++ libntfs-3g/security.c
-@@ -47,6 +47,10 @@
+@@ -44,6 +44,10 @@
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
@@ -12,7 +12,7 @@ Index: libntfs-3g/security.c
  
  #include <unistd.h>
  #include <pwd.h>
-@@ -1228,6 +1232,68 @@ static BOOL groupmember(struct SECURITY_CONTEXT *scx, 
+@@ -1225,6 +1229,68 @@ static BOOL groupmember(struct SECURITY_CONTEXT *scx, 
  		close(fd);
  		}
  	}

sysutils/ntfs-3g/patches/patch-ntfsprogs_Makefile_in

@@ -1,12 +0,0 @@
-Index: ntfsprogs/Makefile.in
---- ntfsprogs/Makefile.in.orig
-+++ ntfsprogs/Makefile.in
-@@ -1425,7 +1425,7 @@ uninstall-man: uninstall-man8
- 
- @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@install-exec-hook:
- @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)/sbin
--@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
-+@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/$(sbindir)/mkfs.ntfs
- 
- @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@install-data-hook:
- @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@	$(INSTALL) -d $(DESTDIR)$(man8dir)

sysutils/ntfs-3g/patches/patch-ntfsprogs_ntfsclone_c

@@ -1,7 +1,7 @@
 Index: ntfsprogs/ntfsclone.c
 --- ntfsprogs/ntfsclone.c.orig
 +++ ntfsprogs/ntfsclone.c
-@@ -848,7 +848,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u
+@@ -852,7 +852,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u
  #ifndef NO_STATFS
  		int err = errno;
  		perr_printf("Write failed");
@@ -10,7 +10,7 @@ Index: ntfsprogs/ntfsclone.c
  			Printf("Apparently you tried to clone to a remote "
  			       "Windows computer but they don't\nhave "
  			       "efficient sparse file handling by default. "
-@@ -2277,7 +2277,7 @@ static void set_filesize(s64 filesize)
+@@ -2312,7 +2312,7 @@ static void set_filesize(s64 filesize)
  		Printf("WARNING: Couldn't get filesystem type: "
  		       "%s\n", strerror(errno));
  	else

sysutils/ntfs-3g/patches/patch-src_Makefile_in

@@ -1,7 +1,7 @@
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -81,8 +81,7 @@ build_triplet = @build@
+@@ -91,8 +91,7 @@ build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
  @ENABLE_NTFS_3G_TRUE@bin_PROGRAMS = ntfs-3g.probe$(EXEEXT)
@@ -9,9 +9,9 @@ Index: src/Makefile.in
 -@ENABLE_NTFS_3G_TRUE@	lowntfs-3g$(EXEEXT)
 +@ENABLE_NTFS_3G_TRUE@rootbin_PROGRAMS = ntfs-3g$(EXEEXT)
  subdir = src
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- 	$(srcdir)/ntfs-3g.8.in $(srcdir)/ntfs-3g.probe.8.in \
+ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-@@ -528,7 +527,7 @@ install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
+@@ -543,7 +542,7 @@ install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
  	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
  	    test -z "$$files" || { \
  	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(rootbindir)$$dir'"; \
@@ -20,7 +20,7 @@ Index: src/Makefile.in
  	    } \
  	; done
  
-@@ -970,7 +969,7 @@ uninstall-man: uninstall-man8
+@@ -1004,7 +1003,7 @@ uninstall-man: uninstall-man8
  
  @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"

sysutils/ntfs-3g/pkg/PLIST

@@ -51,7 +51,7 @@ include/ntfs-3g/types.h
 include/ntfs-3g/unistr.h
 include/ntfs-3g/volume.h
 include/ntfs-3g/xattrs.h
-lib/libntfs-3g.a
+@static-lib lib/libntfs-3g.a
 lib/libntfs-3g.la
 @lib lib/libntfs-3g.so.${LIBntfs-3g_VERSION}
 lib/pkgconfig/libntfs-3g.pc