Added some patches to make ntfsprogs compile on NetBSD-1.6.2, which does

not have ENOTSUP. Approved by jlam.

7 files changed, 97 insertions, 7 deletions

diff --git a/sysutils/ntfsprogs/distinfo b/sysutils/ntfsprogs/distinfo
index 811bfaa8a74..63bf5b4472a 100644
--- a/sysutils/ntfsprogs/distinfo
+++ b/sysutils/ntfsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:55 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/03/15 20:24:30 rillig Exp $
 
 SHA1 (ntfsprogs-1.9.4.tar.gz) = 1250e161f2ee7182bf6e473d4589b5139e3fda8a
 RMD160 (ntfsprogs-1.9.4.tar.gz) = cdeeb8629d5c68a8af23d06adaf56bec62a282e6
@@ -7,6 +7,11 @@ SHA1 (patch-aa) = 1e63d62190b3d2ca78d96c9ba2398232c656a5dc
 SHA1 (patch-ab) = 6d571d962e702d776792c84a81bdaf8e7b8357e4
 SHA1 (patch-ac) = 3ebaa59a289c4085cfec2e27b7e94ce95ff9e74d
 SHA1 (patch-ad) = 576f8505b95965e0c49ec7e63516b49edd5f5679
-SHA1 (patch-ae) = 7bfacd98899ddb63cf73132a7e070186452bd46b
+SHA1 (patch-ae) = a72389126cda4a7c4cfb46760afdf7e14c94ece3
 SHA1 (patch-af) = f892b293fd235aec9ed4340a7ceb21620b2cbe5c
 SHA1 (patch-ag) = 79883013e1ee78c7d8901601badbe9f1857dab65
+SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
+SHA1 (patch-ai) = aa2784d6c859d7cb1136808cd0750c45c026928a
+SHA1 (patch-aj) = d1e401cf378267d241b4842c02fba91ad6528fce
+SHA1 (patch-ak) = 9920e5c08242af2b09e46858be2fffedde7b7c7a
+SHA1 (patch-al) = 6d7ca94fba1972afcd4ebbee12a6ece057f2c45b
diff --git a/sysutils/ntfsprogs/patches/patch-ae b/sysutils/ntfsprogs/patches/patch-ae
index 47431e9a17e..0626e861ab2 100644
--- a/sysutils/ntfsprogs/patches/patch-ae
+++ b/sysutils/ntfsprogs/patches/patch-ae
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-ae,v 1.2 2005/03/15 20:24:30 rillig Exp $
 
---- libntfs/device.c.orig	Sat Sep  4 06:16:32 2004
-+++ libntfs/device.c
-@@ -52,6 +52,10 @@
+--- libntfs/device.c.orig	Sat Sep  4 12:16:32 2004
++++ libntfs/device.c	Sat Mar 12 10:14:34 2005
+@@ -37,6 +37,8 @@
+ #	include <linux/hdreg.h>
+ #endif
+ 
++#include "compat.h"
++
+ #include "types.h"
+ #include "mst.h"
+ #include "debug.h"
+@@ -52,6 +54,10 @@
  #define HDIO_GETGEO	0x0301	/* Get device geometry. */
  #endif
  
@@ -13,7 +22,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
  /**
   * ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
   * name:	name of the device (must be present)
-@@ -498,6 +502,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
+@@ -498,6 +504,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
  					(unsigned long)this_floppy.size,
  					(unsigned long)this_floppy.size);
  			return (s64)this_floppy.size * 512 / block_size;
diff --git a/sysutils/ntfsprogs/patches/patch-ah b/sysutils/ntfsprogs/patches/patch-ah
new file mode 100644
index 00000000000..8cf2e43f0a2
--- /dev/null
+++ b/sysutils/ntfsprogs/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2005/03/15 20:24:30 rillig Exp $
+
+NetBSD-1.6.2 does not know about ENOTSUP.
+
+--- include/ntfs/compat.h.orig	Sat Sep  4 12:16:32 2004
++++ include/ntfs/compat.h	Sat Mar 12 10:13:43 2005
+@@ -50,5 +50,9 @@ extern int ffs(int i);
+ 
+ #endif /* defined WINDOWS */
+ 
++#ifndef ENOTSUP
++#define ENOTSUP EINVAL
++#endif
++
+ #endif /* defined _NTFS_COMPAT_H */
+ 
diff --git a/sysutils/ntfsprogs/patches/patch-ai b/sysutils/ntfsprogs/patches/patch-ai
new file mode 100644
index 00000000000..a03af3831a7
--- /dev/null
+++ b/sysutils/ntfsprogs/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2005/03/15 20:24:30 rillig Exp $
+
+Needed for ENOTSUP on NetBSD-1.6.2.
+
+--- libntfs/attrlist.c.orig	Sat Sep  4 12:16:32 2004
++++ libntfs/attrlist.c	Sat Mar 12 10:14:41 2005
+@@ -24,6 +24,8 @@
+ 
+ #include <errno.h>
+ 
++#include "compat.h"
++
+ #include "types.h"
+ #include "layout.h"
+ #include "attrib.h"
diff --git a/sysutils/ntfsprogs/patches/patch-aj b/sysutils/ntfsprogs/patches/patch-aj
new file mode 100644
index 00000000000..70509be5460
--- /dev/null
+++ b/sysutils/ntfsprogs/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2005/03/15 20:24:30 rillig Exp $
+
+Needed for ENOTSUP on NetBSD-1.6.2.
+
+--- libntfs/volume.c.orig	Sat Sep  4 12:16:32 2004
++++ libntfs/volume.c	Sat Mar 12 10:15:07 2005
+@@ -30,6 +30,8 @@
+ #include <sys/stat.h>
+ #include <limits.h>
+ 
++#include "compat.h"
++
+ #include "volume.h"
+ #include "attrib.h"
+ #include "mft.h"
diff --git a/sysutils/ntfsprogs/patches/patch-ak b/sysutils/ntfsprogs/patches/patch-ak
new file mode 100644
index 00000000000..4630bc99d9e
--- /dev/null
+++ b/sysutils/ntfsprogs/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2005/03/15 20:24:30 rillig Exp $
+
+Needed for ENOTSUP on NetBSD-1.6.2.
+
+--- libntfs/win32_io.c.orig	Sat Sep  4 12:16:32 2004
++++ libntfs/win32_io.c	Sat Mar 12 10:15:23 2005
+@@ -32,6 +32,8 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ 
++#include "compat.h"
++
+ /*
+  * Cannot use "../include/types.h" since it conflicts with "wintypes.h".
+  * define our own...
diff --git a/sysutils/ntfsprogs/patches/patch-al b/sysutils/ntfsprogs/patches/patch-al
new file mode 100644
index 00000000000..678c3e5604c
--- /dev/null
+++ b/sysutils/ntfsprogs/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2005/03/15 20:24:30 rillig Exp $
+
+Needed for ENOTSUP on NetBSD-1.6.2.
+
+--- ntfsprogs/mkntfs.c.orig	Sat Sep  4 12:16:32 2004
++++ ntfsprogs/mkntfs.c	Sat Mar 12 10:17:19 2005
+@@ -116,6 +116,8 @@
+ #	define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytse. */
+ #endif
+ 
++#include "compat.h"
++
+ #include "types.h"
+ #include "bootsect.h"
+ #include "device.h"