Here's a simple update for the next stable version:
Tested @amd64 with USB2-ntfs-HDD and many file transfers.
Ok?
Cheers, Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 22 May 2015 11:31:18 -0000 1.6
+++ Makefile 19 Jul 2015 18:46:31 -0000
@@ -2,12 +2,11 @@
COMMENT = FUSE NTFS driver with read/write support
-V = 2014.2.15
+V = 2015.3.14
DISTNAME = ntfs-3g_ntfsprogs-${V}
PKGNAME = ntfs_3g-${V}
-SHARED_LIBS += ntfs-3g 0.0 # .84
+SHARED_LIBS += ntfs-3g 0.0 # .85
CATEGORIES = sysutils
-REVISION = 0
HOMEPAGE = http://www.tuxera.com/
@@ -29,8 +28,5 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--disable-mtab \
--disable-ldconfig
-
-post-install:
- rmdir ${WRKINST}/lib
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 30 Apr 2014 23:07:25 -0000 1.2
+++ distinfo 19 Jul 2015 18:46:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (ntfs-3g_ntfsprogs-2014.2.15.tgz) =
TDCZQAyxSyMaPJ1xizqNFS04VVBZNBzl/G0CKSpKW1Y=
-SIZE (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575
+SHA256 (ntfs-3g_ntfsprogs-2015.3.14.tgz) =
l/mWAV2DFtSicr0mKZeOXpcHLdPMFIzjmAL4A3xlOPI=
+SIZE (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 30 Apr 2014 23:07:25 -0000 1.2
+++ patches/patch-configure 19 Jul 2015 18:46:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2014/04/30 23:07:25 pirofti Exp $
---- configure.orig Sat Feb 15 16:07:59 2014
-+++ configure Tue Apr 29 11:29:37 2014
-@@ -11890,7 +11890,7 @@ else
+--- configure.orig Sat Mar 14 15:10:24 2015
++++ configure Sun Jul 19 19:03:42 2015
+@@ -12867,7 +12867,7 @@ else
fi
;;
Index: patches/patch-libntfs-3g_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-libntfs-3g_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-libntfs-3g_Makefile_in
--- patches/patch-libntfs-3g_Makefile_in 30 Apr 2014 23:07:25 -0000
1.2
+++ patches/patch-libntfs-3g_Makefile_in 19 Jul 2015 18:46:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libntfs-3g_Makefile_in,v 1.2 2014/04/30 23:07:25 pirofti Exp $
---- libntfs-3g/Makefile.in.orig Sat Feb 15 16:08:00 2014
-+++ libntfs-3g/Makefile.in Tue Apr 29 11:29:37 2014
-@@ -915,15 +915,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
+--- libntfs-3g/Makefile.in.orig Sat Mar 14 15:10:28 2015
++++ libntfs-3g/Makefile.in Sun Jul 19 19:03:42 2015
+@@ -1049,15 +1049,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
Index: patches/patch-libntfs-3g_mft_c
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-libntfs-3g_mft_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-libntfs-3g_mft_c
--- patches/patch-libntfs-3g_mft_c 5 Jan 2014 01:51:15 -0000 1.1
+++ patches/patch-libntfs-3g_mft_c 19 Jul 2015 18:46:31 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-libntfs-3g_mft_c,v 1.1 2014/01/05 01:51:15 jca Exp $
- 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 Wed Dec 25 02:12:11 2013
-+++ libntfs-3g/mft.c Wed Dec 25 02:16:16 2013
-@@ -26,6 +26,9 @@
+--- libntfs-3g/mft.c.orig Sat Mar 14 15:10:12 2015
++++ libntfs-3g/mft.c Sun Jul 19 19:03:42 2015
+@@ -27,6 +27,9 @@
#include "config.h"
#endif
@@ -13,7 +13,7 @@ $OpenBSD: patch-libntfs-3g_mft_c,v 1.1 2
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-@@ -453,9 +456,28 @@ static int ntfs_is_mft(ntfs_inode *ni)
+@@ -454,9 +457,28 @@ static int ntfs_is_mft(ntfs_inode *ni)
return 0;
}
@@ -44,7 +44,7 @@ $OpenBSD: patch-libntfs-3g_mft_c,v 1.1 2
#define RESERVED_MFT_RECORDS 64
-@@ -481,6 +503,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -482,6 +504,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;
@@ -52,7 +52,7 @@ $OpenBSD: patch-libntfs-3g_mft_c,v 1.1 2
unsigned int size;
u8 pass, b;
int ret = -1;
-@@ -492,7 +515,8 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -493,7 +516,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.
*/
@@ -62,7 +62,7 @@ $OpenBSD: patch-libntfs-3g_mft_c,v 1.1 2
pass_end = vol->mft_na->allocated_size >> vol->mft_record_size_bits;
ll = mftbmp_na->initialized_size << 3;
if (pass_end > ll)
-@@ -518,7 +542,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -519,7 +543,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
pass = 2;
}
pass_start = data_pos;
@@ -71,7 +71,7 @@ $OpenBSD: patch-libntfs-3g_mft_c,v 1.1 2
if (!buf)
goto leave;
-@@ -531,7 +555,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
+@@ -532,7 +556,7 @@ static int ntfs_mft_bitmap_find_free_rec(ntfs_volume *
b = 0;
#endif
/* Loop until a free mft record is found. */
Index: patches/patch-ntfsprogs_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-ntfsprogs_Makefile_in
--- patches/patch-ntfsprogs_Makefile_in 30 Apr 2014 23:07:25 -0000 1.2
+++ patches/patch-ntfsprogs_Makefile_in 19 Jul 2015 18:46:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ntfsprogs_Makefile_in,v 1.2 2014/04/30 23:07:25 pirofti Exp $
---- ntfsprogs/Makefile.in.orig Sat Feb 15 16:08:00 2014
-+++ ntfsprogs/Makefile.in Tue Apr 29 11:29:37 2014
-@@ -1184,7 +1184,7 @@ uninstall-man: uninstall-man8
+--- 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
@ENABLE_NTFSPROGS_TRUE@install-exec-hook:
@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)/sbin
Index: patches/patch-ntfsprogs_ntfsclone_c
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_ntfsclone_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-ntfsprogs_ntfsclone_c
--- patches/patch-ntfsprogs_ntfsclone_c 30 Apr 2014 23:07:25 -0000 1.2
+++ patches/patch-ntfsprogs_ntfsclone_c 19 Jul 2015 18:46:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ntfsprogs_ntfsclone_c,v 1.2 2014/04/30 23:07:25 pirofti Exp $
---- ntfsprogs/ntfsclone.c.orig Sat Feb 15 16:07:52 2014
-+++ ntfsprogs/ntfsclone.c Tue Apr 29 11:29:37 2014
-@@ -818,7 +818,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u
+--- ntfsprogs/ntfsclone.c.orig Sat Mar 14 15:10:12 2015
++++ ntfsprogs/ntfsclone.c Sun Jul 19 19:03:42 2015
+@@ -842,7 +842,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 @@ $OpenBSD: patch-ntfsprogs_ntfsclone_c,v
Printf("Apparently you tried to clone to a remote "
"Windows computer but they don't\nhave "
"efficient sparse file handling by default. "
-@@ -2238,7 +2238,7 @@ static void set_filesize(s64 filesize)
+@@ -2262,7 +2262,7 @@ static void set_filesize(s64 filesize)
Printf("WARNING: Couldn't get filesystem type: "
"%s\n", strerror(errno));
else
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-src_Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 30 Apr 2014 23:07:25 -0000 1.3
+++ patches/patch-src_Makefile_in 19 Jul 2015 18:46:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.3 2014/04/30 23:07:25 pirofti Exp $
---- src/Makefile.in.orig Sat Feb 15 16:08:01 2014
-+++ src/Makefile.in Tue Apr 29 11:32:40 2014
-@@ -39,8 +39,7 @@ target_triplet = @target@
+--- src/Makefile.in.orig Sat Mar 14 15:10:28 2015
++++ src/Makefile.in Sun Jul 19 19:03:42 2015
+@@ -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) \
@ENABLE_NTFS_3G_TRUE@ ntfs-3g.secaudit$(EXEEXT)
@@ -9,9 +9,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 20
-@ENABLE_NTFS_3G_TRUE@ lowntfs-3g$(EXEEXT)
+@ENABLE_NTFS_3G_TRUE@rootbin_PROGRAMS = ntfs-3g$(EXEEXT)
subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/ntfs-3g.8.in $(srcdir)/ntfs-3g.probe.8.in \
-@@ -449,7 +448,7 @@ install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
+@@ -563,7 +562,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 @@ $OpenBSD: patch-src_Makefile_in,v 1.3 20
} \
; done
-@@ -922,7 +921,7 @@ uninstall-man: uninstall-man8
+@@ -1041,7 +1040,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"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 22 May 2015 11:31:18 -0000 1.3
+++ pkg/PLIST 19 Jul 2015 18:46:31 -0000
@@ -23,10 +23,12 @@ include/ntfs-3g/debug.h
include/ntfs-3g/device.h
include/ntfs-3g/device_io.h
include/ntfs-3g/dir.h
+include/ntfs-3g/ea.h
include/ntfs-3g/efs.h
include/ntfs-3g/endians.h
include/ntfs-3g/index.h
include/ntfs-3g/inode.h
+include/ntfs-3g/ioctl.h
include/ntfs-3g/layout.h
include/ntfs-3g/lcnalloc.h
include/ntfs-3g/logfile.h
@@ -63,13 +65,17 @@ lib/pkgconfig/libntfs-3g.pc
@man man/man8/ntfscluster.8
@man man/man8/ntfscmp.8
@man man/man8/ntfscp.8
+@man man/man8/ntfsdecrypt.8
+@man man/man8/ntfsfallocate.8
@man man/man8/ntfsfix.8
@man man/man8/ntfsinfo.8
@man man/man8/ntfslabel.8
@man man/man8/ntfsls.8
@man man/man8/ntfsprogs.8
@man man/man8/ntfsresize.8
+@man man/man8/ntfstruncate.8
@man man/man8/ntfsundelete.8
+@man man/man8/ntfswipe.8
sbin/mkfs.ntfs
@bin sbin/mkntfs
@bin sbin/ntfsclone
