On Wed, Mar 07, 2018 at 12:38:44PM +0200, Paul Irofti wrote:
> Here is an update for ntfs-3g to the 2017 version. No changes noticed
> during testing: copying many small files is very slow, copying a single
> (or a few) large files is OK.
>
> OK to update?
Homepage does TLS and we can separate sources from build output.
With that OK kn, see updated diff below.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 22 Jun 2016 09:51:33 -0000 1.9
+++ Makefile 7 Mar 2018 21:58:11 -0000
@@ -2,13 +2,13 @@
COMMENT = FUSE NTFS driver with read/write support
-V = 2016.2.22
+V = 2017.3.23
DISTNAME = ntfs-3g_ntfsprogs-${V}
PKGNAME = ntfs_3g-${V}
-SHARED_LIBS += ntfs-3g 0.2 # .86
+SHARED_LIBS += ntfs-3g 0.2 # .88
CATEGORIES = sysutils
-HOMEPAGE = http://www.tuxera.com/
+HOMEPAGE = https://www.tuxera.com/
MAINTAINER = Paul Irofti <piro...@openbsd.org>
@@ -22,6 +22,7 @@ EXTRACT_SUFX = .tgz
LIB_DEPENDS = sysutils/e2fsprogs
+SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 22 Jun 2016 09:51:33 -0000 1.4
+++ distinfo 7 Mar 2018 21:58:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (ntfs-3g_ntfsprogs-2016.2.22.tgz) =
17csBeSzST5glb54mnYMn18rFBgS1biF8xkMmIAvHqA=
-SIZE (ntfs-3g_ntfsprogs-2016.2.22.tgz) = 1264364
+SHA256 (ntfs-3g_ntfsprogs-2017.3.23.tgz) =
PloCHXt2EmGDbcswU3CvKZeT7tve1zHfPWlDgC4SYtU=
+SIZE (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 1259054
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 20 Nov 2015 05:32:02 -0000 1.3
+++ patches/patch-configure 7 Mar 2018 21:58:11 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.3 2015/11/20 05:32:02 pirofti Exp $
---- configure.orig Sat Mar 14 15:10:24 2015
-+++ configure Sun Jul 19 19:03:42 2015
-@@ -12867,7 +12867,7 @@ else
+Index: configure
+--- configure.orig
++++ configure
+@@ -12882,7 +12882,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.3
diff -u -p -r1.3 patch-libntfs-3g_Makefile_in
--- patches/patch-libntfs-3g_Makefile_in 20 Nov 2015 05:32:02 -0000
1.3
+++ patches/patch-libntfs-3g_Makefile_in 7 Mar 2018 21:58:11 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-libntfs-3g_Makefile_in,v 1.3 2015/11/20 05:32:02 pirofti Exp $
---- 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
+Index: libntfs-3g/Makefile.in
+--- libntfs-3g/Makefile.in.orig
++++ libntfs-3g/Makefile.in
+@@ -1050,15 +1050,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-ntfsprogs_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-ntfsprogs_Makefile_in
--- patches/patch-ntfsprogs_Makefile_in 22 Jun 2016 09:51:34 -0000 1.4
+++ patches/patch-ntfsprogs_Makefile_in 7 Mar 2018 21:58:11 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-ntfsprogs_Makefile_in,v 1.4 2016/06/22 09:51:34 dcoppa Exp $
---- 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
+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
Index: patches/patch-ntfsprogs_ntfsclone_c
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_ntfsclone_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ntfsprogs_ntfsclone_c
--- patches/patch-ntfsprogs_ntfsclone_c 20 Nov 2015 05:32:02 -0000 1.3
+++ patches/patch-ntfsprogs_ntfsclone_c 7 Mar 2018 21:58:11 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-ntfsprogs_ntfsclone_c,v 1.3 2015/11/20 05:32:02 pirofti Exp $
---- 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
+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
#ifndef NO_STATFS
int err = errno;
perr_printf("Write failed");
@@ -10,7 +11,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. "
-@@ -2262,7 +2262,7 @@ static void set_filesize(s64 filesize)
+@@ -2277,7 +2277,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.5
diff -u -p -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 22 Jun 2016 09:51:34 -0000 1.5
+++ patches/patch-src_Makefile_in 7 Mar 2018 21:58:11 -0000
@@ -1,17 +1,18 @@
$OpenBSD: patch-src_Makefile_in,v 1.5 2016/06/22 09:51:34 dcoppa Exp $
---- 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) \
- @ENABLE_NTFS_3G_TRUE@ ntfs-3g.secaudit$(EXEEXT)
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -81,8 +81,7 @@ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+ @ENABLE_NTFS_3G_TRUE@bin_PROGRAMS = ntfs-3g.probe$(EXEEXT)
-@ENABLE_NTFS_3G_TRUE@rootbin_PROGRAMS = ntfs-3g$(EXEEXT) \
-@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 \
$(srcdir)/ntfs-3g.8.in $(srcdir)/ntfs-3g.probe.8.in \
-@@ -563,7 +562,7 @@ install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
+@@ -528,7 +527,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 +21,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 20
} \
; done
-@@ -1043,7 +1042,7 @@ uninstall-man: uninstall-man8
+@@ -970,7 +969,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.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 22 Jun 2016 09:51:34 -0000 1.5
+++ pkg/PLIST 7 Mar 2018 21:58:11 -0000
@@ -1,8 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2016/06/22 09:51:34 dcoppa Exp $
@bin bin/ntfs-3g
@bin bin/ntfs-3g.probe
-@bin bin/ntfs-3g.secaudit
-@bin bin/ntfs-3g.usermap
@bin bin/ntfscat
@bin bin/ntfscluster
@bin bin/ntfscmp
@@ -10,7 +8,9 @@
@bin bin/ntfsinfo
@bin bin/ntfsls
@bin bin/ntfsrecover
+@bin bin/ntfssecaudit
@bin bin/ntfstruncate
+@bin bin/ntfsusermap
@bin bin/ntfswipe
include/ntfs-3g/
include/ntfs-3g/acls.h
@@ -42,6 +42,7 @@ include/ntfs-3g/mst.h
include/ntfs-3g/ntfstime.h
include/ntfs-3g/object_id.h
include/ntfs-3g/param.h
+include/ntfs-3g/plugin.h
include/ntfs-3g/realpath.h
include/ntfs-3g/reparse.h
include/ntfs-3g/runlist.h
@@ -61,8 +62,6 @@ lib/pkgconfig/libntfs-3g.pc
@man man/man8/mount.ntfs-3g.8
@man man/man8/ntfs-3g.8
@man man/man8/ntfs-3g.probe.8
-@man man/man8/ntfs-3g.secaudit.8
-@man man/man8/ntfs-3g.usermap.8
@man man/man8/ntfscat.8
@man man/man8/ntfsclone.8
@man man/man8/ntfscluster.8
@@ -77,8 +76,10 @@ lib/pkgconfig/libntfs-3g.pc
@man man/man8/ntfsprogs.8
@man man/man8/ntfsrecover.8
@man man/man8/ntfsresize.8
+@man man/man8/ntfssecaudit.8
@man man/man8/ntfstruncate.8
@man man/man8/ntfsundelete.8
+@man man/man8/ntfsusermap.8
@man man/man8/ntfswipe.8
sbin/mkfs.ntfs
@bin sbin/mkntfs
