[pkgsrc/trunk]: pkgsrc/filesystems/fuse-unionfs fuse_main for FUSE 2.6 has th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cf6b5eaf9d1
branches:  trunk
changeset: 396781:8cf6b5eaf9d1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 03 13:57:14 2009 +0000

description:
fuse_main for FUSE 2.6 has the signature of the !NetBSD branch, so drop
the conditional.

diffstat:

 filesystems/fuse-unionfs/distinfo         |   4 ++--
 filesystems/fuse-unionfs/patches/patch-aa |  12 +-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diffs (36 lines):

diff -r 4ff66aa9e6b9 -r 8cf6b5eaf9d1 filesystems/fuse-unionfs/distinfo
--- a/filesystems/fuse-unionfs/distinfo Mon Aug 03 13:50:39 2009 +0000
+++ b/filesystems/fuse-unionfs/distinfo Mon Aug 03 13:57:14 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/10 12:51:03 agc Exp $
+$NetBSD: distinfo,v 1.2 2009/08/03 13:57:14 joerg Exp $
 
 SHA1 (unionfs-fuse-0.17.tar.bz2) = 791877d7e127c28345f3884f30b9a65032e9ca80
 RMD160 (unionfs-fuse-0.17.tar.bz2) = 020662308ea3930ed26685bcb2cdcaf08f3082f3
 Size (unionfs-fuse-0.17.tar.bz2) = 6447 bytes
-SHA1 (patch-aa) = ab12403f3c83a04cf59e1a4616b76e7c36204a66
+SHA1 (patch-aa) = 855c6d72e5963077ea08c5b296e9423a2c652452
 SHA1 (patch-ab) = fcb7ebe83f25488653ee42548c84d7709ce952d8
diff -r 4ff66aa9e6b9 -r 8cf6b5eaf9d1 filesystems/fuse-unionfs/patches/patch-aa
--- a/filesystems/fuse-unionfs/patches/patch-aa Mon Aug 03 13:50:39 2009 +0000
+++ b/filesystems/fuse-unionfs/patches/patch-aa Mon Aug 03 13:57:14 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/10 12:51:03 agc Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/03 13:57:14 joerg Exp $
 
 --- unionfs.c  2007/03/10 00:31:50     1.1
 +++ unionfs.c  2007/03/10 00:33:02
@@ -10,13 +10,3 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -933,5 +934,9 @@
-       }
- 
-       umask(0);
-+#ifdef __NetBSD__
-+      return fuse_main(args.argc, args.argv, &unionfs_oper);
-+#else
-       return fuse_main(args.argc, args.argv, &unionfs_oper, NULL);
-+#endif
- }