CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr 26 04:29:44 UTC 2026

Modified Files:
        pkgsrc/filesystems/libntfs: Makefile distinfo
        pkgsrc/filesystems/libntfs/patches: patch-configure
            patch-libntfs-3g_device.c patch-ntfsprogs_ntfsclone.c
        pkgsrc/sysutils/ntfsprogs: Makefile

Log Message:
ntfsprogs: fix build on -current


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/filesystems/libntfs/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/filesystems/libntfs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/filesystems/libntfs/patches/patch-configure
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c \
    pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/ntfsprogs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/libntfs/Makefile
diff -u pkgsrc/filesystems/libntfs/Makefile:1.2 pkgsrc/filesystems/libntfs/Makefile:1.3
--- pkgsrc/filesystems/libntfs/Makefile:1.2     Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/Makefile Sun Apr 26 04:29:43 2026
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2023/09/08 10:23:07 vins Exp $
+# $NetBSD: Makefile,v 1.3 2026/04/26 04:29:43 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       lib${DISTNAME:S/-3g_ntfsprogs//}
+PKGREVISION=   1
 
 COMMENT=       Linux-NTFS project utilities for the Windows NT Filesystem
 

Index: pkgsrc/filesystems/libntfs/distinfo
diff -u pkgsrc/filesystems/libntfs/distinfo:1.7 pkgsrc/filesystems/libntfs/distinfo:1.8
--- pkgsrc/filesystems/libntfs/distinfo:1.7     Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/distinfo Sun Apr 26 04:29:43 2026
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.7 2023/09/08 10:23:07 vins Exp $
+$NetBSD: distinfo,v 1.8 2026/04/26 04:29:43 wiz Exp $
 
 BLAKE2s (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 7a32e7473300114064611e219b6689e293b7bebaea915c541afed133f0b7ca93
 SHA512 (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 891589483954423b19bef6e8a174fb4311ad92b6397a0db80f77c72b746bf18c2fa12457a571947f92755637a6bc784188920d4f017ae12a420819ab0d74af59
 Size (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 1324320 bytes
 SHA1 (patch-Makefile.in) = e8788b9a008493510631e032f3a1d2244ba52ff0
-SHA1 (patch-configure) = 22ede9302d0c04f0fc3819ad6764afe9656008d4
+SHA1 (patch-configure) = d5dec4324a17b8e60c539c56e1fad9a7f30c4528
 SHA1 (patch-include_ntfs-3g_compat.h) = 78ea127359416c9106eef7025a2ccc84fd0b4447
 SHA1 (patch-include_ntfs-3g_types.h) = bb6414b8991e8a05f32fce88d4915448bc498d58
 SHA1 (patch-libntfs-3g_Makefile.in) = 7930c0d04906969f39a731fe67bb8fe8a15c5c9d
 SHA1 (patch-libntfs-3g_compat.c) = 5cecaa8f8d4fe463094592f11f4757a434e903dd
-SHA1 (patch-libntfs-3g_device.c) = 2d2a9f2517df4535a6d19028384151c64d9afbe2
+SHA1 (patch-libntfs-3g_device.c) = 9e2a6a3414c809852aec33b28df19978fd822c4e
 SHA1 (patch-libntfs-3g_mft.c) = 992eaaae18b29a14f553bed2e53be0a0a915a7eb
 SHA1 (patch-ntfsprogs_Makefile.in) = 9acd073006c54009cedeafc766c964e9b5f11468
-SHA1 (patch-ntfsprogs_ntfsclone.c) = 62850f27bcc28c59e126f1ced467f9b64cd5b10e
+SHA1 (patch-ntfsprogs_ntfsclone.c) = 4f3919444366f06d7e92b3371d046ea8780e1554
 SHA1 (patch-src_Makefile.in) = 6d946cd2078d0983281d3e92af6e54bf3483bca1
 SHA1 (patch-src_ntfs-3g.c) = 9ae108fec22dc2a4219cd4ae5077d9eea17ab700

Index: pkgsrc/filesystems/libntfs/patches/patch-configure
diff -u pkgsrc/filesystems/libntfs/patches/patch-configure:1.1 pkgsrc/filesystems/libntfs/patches/patch-configure:1.2
--- pkgsrc/filesystems/libntfs/patches/patch-configure:1.1      Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/patches/patch-configure  Sun Apr 26 04:29:44 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2023/09/08 10:23:07 vins Exp $
+$NetBSD: patch-configure,v 1.2 2026/04/26 04:29:44 wiz Exp $
 
 Avoid test "==" operator.
 
 --- configure.orig     2022-10-20 15:35:11.000000000 +0000
 +++ configure
-@@ -14104,11 +14104,11 @@ esac
+@@ -14104,11 +14104,11 @@ if test "x${enable_ntfs_3g}" != "xyes"; then
  
  if test "x${enable_ntfs_3g}" != "xyes"; then
        with_fuse="none"

Index: pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c
diff -u pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c:1.2 pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c:1.3
--- pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c:1.2    Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c        Sun Apr 26 04:29:44 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-libntfs-3g_device.c,v 1.2 2023/09/08 10:23:07 vins Exp $
+$NetBSD: patch-libntfs-3g_device.c,v 1.3 2026/04/26 04:29:44 wiz Exp $
 
 Use DIOCGPARTINFO on NetBSD to get the device size in blocks.
 
@@ -16,10 +16,13 @@ Use DIOCGPARTINFO on NetBSD to get the d
  /**
   * ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
   * @name:     name of the device (must be present)
-@@ -596,6 +601,24 @@ s64 ntfs_device_size_get(struct ntfs_dev
-               }
-       }
- #endif
+@@ -593,6 +598,24 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int 
+                               (unsigned long long) blocks,
+                               (unsigned long long) blocks);
+                       return blocks * sector_size / block_size;
++              }
++      }
++#endif
 +#ifdef DIOCGPARTINFO
 +      {
 +              /* NetBSD */
@@ -35,9 +38,6 @@ Use DIOCGPARTINFO on NetBSD to get the d
 +                                              secsize, psize, psize);
 +                              return psize * secsize / block_size;
 +                      }
-+              }
-+      }
-+#endif
-       /*
-        * We couldn't figure it out by using a specialized ioctl,
-        * so do binary search to find the size of the device.
+               }
+       }
+ #endif
Index: pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c
diff -u pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c:1.2 pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c:1.3
--- pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c:1.2  Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c      Sun Apr 26 04:29:44 2026
@@ -1,22 +1,17 @@
-$NetBSD: patch-ntfsprogs_ntfsclone.c,v 1.2 2023/09/08 10:23:07 vins Exp $
+$NetBSD: patch-ntfsprogs_ntfsclone.c,v 1.3 2026/04/26 04:29:44 wiz Exp $
 
 Fix for NetBSD's statvfs(2).
 
 --- ntfsprogs/ntfsclone.c.orig 2021-09-13 07:34:39.000000000 +0000
 +++ ntfsprogs/ntfsclone.c
-@@ -71,6 +71,19 @@
+@@ -71,6 +71,14 @@
   */
  #define NTFS_DO_NOT_CHECK_ENDIANS
  
 +#ifdef __NetBSD__
-+#  include <sys/param.h>
-+   /* NetBSD versions later than 2.99.9 have statvfs(2) instead of statfs(2) */
-+#  if __NetBSD_Version__ >= 299000900
-+#    include <sys/statvfs.h>
-+#    define F_TYPE     f_fsid
-+#  else
-+#    define F_TYPE     f_type
-+#  endif
++#  include <sys/statvfs.h>
++#  define fstatfs      fstatvfs
++#  define F_TYPE       f_fsid
 +#else
 +#  define F_TYPE       f_type
 +#endif
@@ -24,11 +19,20 @@ Fix for NetBSD's statvfs(2).
  #include "param.h"
  #include "debug.h"
  #include "types.h"
-@@ -166,8 +179,12 @@ static struct {
+@@ -105,7 +113,7 @@
+ #undef HAVE_WINDOWS_H
+ #endif
+ 
+-#if defined(__sun) | defined(HAVE_WINDOWS_H)
++#if defined(__sun) || defined(HAVE_WINDOWS_H)
+ #define NO_STATFS 1   /* statfs(2) and f_type are not universal */
+ #endif
+ 
+@@ -166,8 +174,12 @@ static struct {
        char *output;
        char *volume;
  #ifndef NO_STATFS
-+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
++#if defined(__NetBSD__)
 +      struct statvfs stfs;
 +#else
        struct statfs stfs;
@@ -37,7 +41,7 @@ Fix for NetBSD's statvfs(2).
  } opt;
  
  struct bitmap {
-@@ -852,7 +869,7 @@ static void copy_cluster(int rescue, u64
+@@ -852,7 +864,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u
  #ifndef NO_STATFS
                int err = errno;
                perr_printf("Write failed");
@@ -46,7 +50,7 @@ Fix for NetBSD's statvfs(2).
                        Printf("Apparently you tried to clone to a remote "
                               "Windows computer but they don't\nhave "
                               "efficient sparse file handling by default. "
-@@ -2312,7 +2329,7 @@ static void set_filesize(s64 filesize)
+@@ -2312,7 +2324,7 @@ static void set_filesize(s64 filesize)
                Printf("WARNING: Couldn't get filesystem type: "
                       "%s\n", strerror(errno));
        else

Index: pkgsrc/sysutils/ntfsprogs/Makefile
diff -u pkgsrc/sysutils/ntfsprogs/Makefile:1.13 pkgsrc/sysutils/ntfsprogs/Makefile:1.14
--- pkgsrc/sysutils/ntfsprogs/Makefile:1.13     Fri Sep  8 10:23:07 2023
+++ pkgsrc/sysutils/ntfsprogs/Makefile  Sun Apr 26 04:29:44 2026
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2023/09/08 10:23:07 vins Exp $
+# $NetBSD: Makefile,v 1.14 2026/04/26 04:29:44 wiz Exp $
 
 .include "../../filesystems/libntfs/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/ntfs-3g_//}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 
 COMMENT=       Linux-NTFS project utilities for the Windows NT Filesystem