fuse_main for FUSE 2.6 has the signature of the !NetBSD branch, so drop

the conditional.
jsonn · Aug 3, 2009 · 7fa8973 · 7fa8973
1 parent a1f92f8
commit 7fa8973
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/filesystems/fuse-unionfs/distinfo b/filesystems/fuse-unionfs/distinfo
@@ -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 --git a/filesystems/fuse-unionfs/patches/patch-aa b/filesystems/fuse-unionfs/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/10 12:51:03 agc Exp $
  #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
- }