On Mon, Jun 06, 2016 at 10:12:34PM +0200, Rafael Sadowski wrote:
> Hi @ports,
>
> here's the newest ntfs-3g port. Tested @amd64 and works prefect.
>
> Test case:
>
> - doas mkntfs /dev/sd5c (USB device)
> - doas ntfs-3g /dev/sd5i /mnt/usb
> - copy some PDFs
> - umount
> - mount in Windows 10
> - open the PDFs
> - copy some other files
> - mount on OpenBSD
> - Open some files from Windows 10
>
> Everything looks like expected. OK, comments?
Thank you and OK.
>
> Best regards,
>
> Rafael
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/ntfs-3g/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 Makefile
> --- Makefile 11 Mar 2016 20:28:31 -0000 1.8
> +++ Makefile 6 Jun 2016 19:53:57 -0000
> @@ -2,10 +2,10 @@
>
> COMMENT = FUSE NTFS driver with read/write support
>
> -V = 2015.3.14
> +V = 2016.2.22
> DISTNAME = ntfs-3g_ntfsprogs-${V}
> PKGNAME = ntfs_3g-${V}
> -SHARED_LIBS += ntfs-3g 0.1 # .85
> +SHARED_LIBS += ntfs-3g 0.2 # .86
> CATEGORIES = sysutils
>
> HOMEPAGE = http://www.tuxera.com/
> @@ -26,6 +26,9 @@ CONFIGURE_STYLE = gnu
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
> CONFIGURE_ARGS = --disable-mtab \
> + --enable-extras \
> + --enable-mount-helper \
> + --with-fuse=external \
> --disable-ldconfig
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/ntfs-3g/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 20 Nov 2015 05:32:02 -0000 1.3
> +++ distinfo 6 Jun 2016 19:53:57 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ntfs-3g_ntfsprogs-2015.3.14.tgz) =
> l/mWAV2DFtSicr0mKZeOXpcHLdPMFIzjmAL4A3xlOPI=
> -SIZE (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069
> +SHA256 (ntfs-3g_ntfsprogs-2016.2.22.tgz) =
> 17csBeSzST5glb54mnYMn18rFBgS1biF8xkMmIAvHqA=
> +SIZE (ntfs-3g_ntfsprogs-2016.2.22.tgz) = 1264364
> Index: patches/patch-ntfsprogs_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_Makefile_in,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 patch-ntfsprogs_Makefile_in
> --- patches/patch-ntfsprogs_Makefile_in 20 Nov 2015 05:32:02 -0000
> 1.3
> +++ patches/patch-ntfsprogs_Makefile_in 6 Jun 2016 19:53:57 -0000
> @@ -1,12 +1,12 @@
> $OpenBSD: patch-ntfsprogs_Makefile_in,v 1.3 2015/11/20 05:32:02 pirofti Exp $
> ---- ntfsprogs/Makefile.in.orig Sat Mar 14 15:10:28 2015
> -+++ ntfsprogs/Makefile.in Sun Jul 19 19:03:42 2015
> -@@ -1349,7 +1349,7 @@ uninstall-man: uninstall-man8
> +--- ntfsprogs/Makefile.in.orig Wed Jun 1 08:08:45 2016
> ++++ ntfsprogs/Makefile.in Wed Jun 1 08:09:57 2016
> +@@ -1377,7 +1377,7 @@ uninstall-man: uninstall-man8
>
> - @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@ $(LN_S) -f $(sbindir)/mkntfs
> $(DESTDIR)/$(sbindir)/mkfs.ntfs
> + @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_NTFSPROGS_TRUE@install-data-hook:
> - @ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)$(man8dir)
> + @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@install-data-hook:
> + @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d
> $(DESTDIR)$(man8dir)
> Index: patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-src_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 20 Nov 2015 05:32:02 -0000 1.4
> +++ patches/patch-src_Makefile_in 6 Jun 2016 19:53:57 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-src_Makefile_in,v 1.4 2015/11/20 05:32:02 pirofti Exp $
> ---- src/Makefile.in.orig Sat Mar 14 15:10:28 2015
> -+++ src/Makefile.in Sun Jul 19 19:03:42 2015
> +--- src/Makefile.in.orig Mon Feb 22 08:34:49 2016
> ++++ src/Makefile.in Wed Jun 1 07:54:54 2016
> @@ -83,8 +83,7 @@ target_triplet = @target@
> @ENABLE_NTFS_3G_TRUE@bin_PROGRAMS = ntfs-3g.probe$(EXEEXT) \
> @ENABLE_NTFS_3G_TRUE@ ntfs-3g.usermap$(EXEEXT) \
> @@ -20,7 +20,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.4 20
> } \
> ; done
>
> -@@ -1041,7 +1040,7 @@ uninstall-man: uninstall-man8
> +@@ -1043,7 +1042,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"
> @@ -28,4 +28,4 @@ $OpenBSD: patch-src_Makefile_in,v 1.4 20
> +@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f
> "$(DESTDIR)/sbin/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_NTFS_3G_TRUE@install-data-local: install-man8
> + @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-data-local:
> install-man8
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/ntfs-3g/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 PLIST
> --- pkg/PLIST 20 Nov 2015 05:32:02 -0000 1.4
> +++ pkg/PLIST 6 Jun 2016 19:53:57 -0000
> @@ -9,6 +9,9 @@
> @bin bin/ntfsfix
> @bin bin/ntfsinfo
> @bin bin/ntfsls
> +@bin bin/ntfsrecover
> +@bin bin/ntfstruncate
> +@bin bin/ntfswipe
> include/ntfs-3g/
> include/ntfs-3g/acls.h
> include/ntfs-3g/attrib.h
> @@ -72,6 +75,7 @@ lib/pkgconfig/libntfs-3g.pc
> @man man/man8/ntfslabel.8
> @man man/man8/ntfsls.8
> @man man/man8/ntfsprogs.8
> +@man man/man8/ntfsrecover.8
> @man man/man8/ntfsresize.8
> @man man/man8/ntfstruncate.8
> @man man/man8/ntfsundelete.8
