filesystems/fuse-encfs: Piggyback on NetBSD switches

This package is still broken on DragonFly after this fix.
error: multiple failures on RawFileIO.cpp (might be gcc 4.4 related)

3 files changed, 10 insertions, 10 deletions

diff --git a/filesystems/fuse-encfs/distinfo b/filesystems/fuse-encfs/distinfo
index 2fcbadff554..b549087aea6 100644
--- a/filesystems/fuse-encfs/distinfo
+++ b/filesystems/fuse-encfs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2011/11/24 14:11:19 joerg Exp $
+$NetBSD: distinfo,v 1.3 2012/08/17 15:15:27 marino Exp $
 
 SHA1 (encfs-1.2.0-2.tgz) = 15e0037ef123ef3967d5c101d10f3643c33bcb68
 RMD160 (encfs-1.2.0-2.tgz) = 979fd6a11137c1acdabd3349302d8cd7e3b6625b
 Size (encfs-1.2.0-2.tgz) = 528039 bytes
 SHA1 (patch-aa) = 2e40cf7e222bfc3def5d1aa2c431854e9f59e0e9
-SHA1 (patch-ab) = 0d8929ad64b5f3b1ef904b554f2b7e8eb8e8fd19
-SHA1 (patch-ac) = 7dd3f34634c91219665cfb1c56facfe69c6eed50
+SHA1 (patch-ab) = 680eac660752826503aeed48995ca93b2f280f1a
+SHA1 (patch-ac) = ab7d063f8429f794c0ea81d30e051eb48c35e000
 SHA1 (patch-ad) = 4077b9cbd1bdf1f71029183acce6a8570dbbef7a
 SHA1 (patch-ae) = 48e06c61293a3280825df151df4670db1a3fbcc0
 SHA1 (patch-encfs_Config.cpp) = a868994c763821c40f9169965c5b2a80262a3c7d
diff --git a/filesystems/fuse-encfs/patches/patch-ab b/filesystems/fuse-encfs/patches/patch-ab
index 0f01729baca..eb347ef03a7 100644
--- a/filesystems/fuse-encfs/patches/patch-ab
+++ b/filesystems/fuse-encfs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2012/08/17 15:15:27 marino Exp $
 
 --- encfs/encfs.h.orig	2007-03-01 01:04:54.000000000 +0100
 +++ encfs/encfs.h	2007-03-01 01:05:30.000000000 +0100
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
  	struct fuse_file_info *info);
  int encfs_write(const char *path, const char *buf, size_t size, off_t offset,
  	struct fuse_file_info *info);
-+#ifndef __NetBSD__
++#if !defined (__NetBSD__) && !defined (__DragonFly__)
  int encfs_statfs(const char *, struct statfs *fst);
 +#else
 +int encfs_statfs(const char *, struct statvfs *fst);
diff --git a/filesystems/fuse-encfs/patches/patch-ac b/filesystems/fuse-encfs/patches/patch-ac
index 5996c3f85ef..a5b7e64783d 100644
--- a/filesystems/fuse-encfs/patches/patch-ac
+++ b/filesystems/fuse-encfs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2012/08/17 15:15:27 marino Exp $
 
 --- encfs/encfs.cpp.orig	2007-03-01 01:05:53.000000000 +0100
 +++ encfs/encfs.cpp	2007-03-01 01:10:17.000000000 +0100
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
  #include <fcntl.h>
  #include <dirent.h>
  #include <errno.h>
-+#ifndef __NetBSD__
++#if !defined (__NetBSD__) && !defined (__DragonFly__)
  #include <sys/statfs.h>
 +#else
 +#include <sys/statvfs.h>
@@ -18,7 +18,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
      return res;
  }
  
-+#ifndef __NetBSD__
++#if !defined (__NetBSD__) && !defined (__DragonFly__)
  int encfs_statfs(const char *path, struct statfs *st)
 +#else
 +int encfs_statfs(const char *path, struct statvfs *st)
@@ -30,14 +30,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/03/01 00:34:14 xtraeme Exp $
  	string cyName = FSRoot->rootDirectory();
  
  	rLog(Info, "doing statfs of %s", cyName.c_str());
-+#ifndef __NetBSD__
++#if !defined (__NetBSD__) && !defined (__DragonFly__)
  	res = statfs( cyName.c_str(), st );
 +#else
 +	res = statvfs(cyName.c_str(), st);
 +#endif
  	if(!res) 
  	{
-+#ifndef __NetBSD__
++#if !defined (__NetBSD__) && !defined (__DragonFly__)
  	    // adjust maximum name length..
  	    st->f_namelen     = 6 * (st->f_namelen - 2) / 8; // approx..
 +#else