[pkgsrc/trunk]: pkgsrc/sysutils/ntfsprogs fix statvfs hack for non netbsd pla...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c1e512b8901
branches:  trunk
changeset: 502473:7c1e512b8901
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Fri Nov 04 21:46:12 2005 +0000

description:
fix statvfs hack for non netbsd platforms

diffstat:

 sysutils/ntfsprogs/distinfo         |   4 ++--
 sysutils/ntfsprogs/patches/patch-af |  20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diffs (86 lines):

diff -r 18793e74a65d -r 7c1e512b8901 sysutils/ntfsprogs/distinfo
--- a/sysutils/ntfsprogs/distinfo       Fri Nov 04 21:43:12 2005 +0000
+++ b/sysutils/ntfsprogs/distinfo       Fri Nov 04 21:46:12 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/09/06 08:10:59 abs Exp $
+$NetBSD: distinfo,v 1.5 2005/11/04 21:46:12 dbj Exp $
 
 SHA1 (ntfsprogs-1.9.4.tar.gz) = 1250e161f2ee7182bf6e473d4589b5139e3fda8a
 RMD160 (ntfsprogs-1.9.4.tar.gz) = cdeeb8629d5c68a8af23d06adaf56bec62a282e6
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 3ebaa59a289c4085cfec2e27b7e94ce95ff9e74d
 SHA1 (patch-ad) = 576f8505b95965e0c49ec7e63516b49edd5f5679
 SHA1 (patch-ae) = a72389126cda4a7c4cfb46760afdf7e14c94ece3
-SHA1 (patch-af) = f3df508bab7c3606d314488428c2b1db69ccb946
+SHA1 (patch-af) = 119938eefd0f2f942ca160e8520a91dc2eb6dd13
 SHA1 (patch-ag) = 79883013e1ee78c7d8901601badbe9f1857dab65
 SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
 SHA1 (patch-ai) = aa2784d6c859d7cb1136808cd0750c45c026928a
diff -r 18793e74a65d -r 7c1e512b8901 sysutils/ntfsprogs/patches/patch-af
--- a/sysutils/ntfsprogs/patches/patch-af       Fri Nov 04 21:43:12 2005 +0000
+++ b/sysutils/ntfsprogs/patches/patch-af       Fri Nov 04 21:46:12 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2005/09/06 08:10:59 abs Exp $
+$NetBSD: patch-af,v 1.3 2005/11/04 21:46:12 dbj Exp $
 
---- ntfsprogs/ntfsclone.c.orig Sat Sep  4 06:16:32 2004
-+++ ntfsprogs/ntfsclone.c
-@@ -30,6 +30,17 @@
+--- ntfsprogs/ntfsclone.c.orig 2004-09-04 06:16:32.000000000 -0400
++++ ntfsprogs/ntfsclone.c      2005-09-25 10:43:27.000000000 -0400
+@@ -30,6 +30,19 @@
  #include <errno.h>
  #include <getopt.h>
  
@@ -15,12 +15,14 @@
 +#  else
 +#    define F_TYPE    f_type
 +#  endif
++#else
++#  define F_TYPE      f_type
 +#endif
 +
  #include "debug.h"
  #include "types.h"
  #include "support.h"
-@@ -66,7 +77,11 @@
+@@ -66,7 +79,11 @@
        int restore_image;
        char *output;
        char *volume;
@@ -32,7 +34,7 @@
  } opt;
  
  struct bitmap {
-@@ -338,16 +353,13 @@
+@@ -338,16 +355,13 @@
        }       
                
        msg_out = stdout;
@@ -54,7 +56,7 @@
  }
  
  static void progress_init(struct progress_bar *p, u64 start, u64 stop, int res)
-@@ -462,7 +474,7 @@
+@@ -462,7 +476,7 @@
        if (write_all(&fd_out, buff, csize) == -1) {
                int err = errno;
                perr_printf("Write failed");
@@ -63,7 +65,7 @@
                        Printf("Apparently you tried to clone to a remote "
                               "Windows computer but they don't\nhave "
                               "efficient sparse file handling by default. "
-@@ -1152,12 +1164,12 @@
+@@ -1152,12 +1166,12 @@
        if (fstatfs(fd_out, &opt.stfs) == -1)
                Printf("WARNING: Couldn't get filesystem type: "
                       "%s\n", strerror(errno));
@@ -78,7 +80,7 @@
                Printf("WARNING: You're using SMBFS and if the remote share "
                       "isn't Samba but a Windows\ncomputer then the clone "
                       "operation will be very inefficient and may fail!\n");
-@@ -1168,7 +1180,7 @@
+@@ -1168,7 +1182,7 @@
                if (err == E2BIG) {
                        Printf("Your system or the destination filesystem "
                               "doesn't support large files.\n");