[pkgsrc/trunk]: pkgsrc/filesystems/fuse-wdfs #ifndef out some code which resu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/16ab9530de95
branches:  trunk
changeset: 538670:16ab9530de95
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Sat Feb 16 01:24:39 2008 +0000

description:
#ifndef out some code which results in SIG_SEGV on NetBSD.  See patch-aa.
Bump rev.

diffstat:

 filesystems/fuse-wdfs/Makefile         |   3 ++-
 filesystems/fuse-wdfs/distinfo         |   4 ++--
 filesystems/fuse-wdfs/patches/patch-aa |  25 +++++++++++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diffs (76 lines):

diff -r f25ed9bdc5d8 -r 16ab9530de95 filesystems/fuse-wdfs/Makefile
--- a/filesystems/fuse-wdfs/Makefile    Sat Feb 16 01:24:07 2008 +0000
+++ b/filesystems/fuse-wdfs/Makefile    Sat Feb 16 01:24:39 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/01/28 02:56:46 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/02/16 01:24:39 bjs Exp $
 #
 
 DISTNAME=      wdfs-1.4.2
 PKGNAME=       fuse-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    filesystems
 MASTER_SITES=  http://noedler.de/projekte/wdfs/
 
diff -r f25ed9bdc5d8 -r 16ab9530de95 filesystems/fuse-wdfs/distinfo
--- a/filesystems/fuse-wdfs/distinfo    Sat Feb 16 01:24:07 2008 +0000
+++ b/filesystems/fuse-wdfs/distinfo    Sat Feb 16 01:24:39 2008 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/01/28 02:56:46 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/02/16 01:24:39 bjs Exp $
 
 SHA1 (wdfs-1.4.2.tar.gz) = 71ae2e355d00bc1fbe7093b0a3b15ddc76a74516
 RMD160 (wdfs-1.4.2.tar.gz) = 101702c0aaf66c2d2b24ae768a5e910756432c1a
 Size (wdfs-1.4.2.tar.gz) = 109315 bytes
-SHA1 (patch-aa) = 47e5145eb0639ea87807bc521f8611517a9b78cc
+SHA1 (patch-aa) = 050b27b342e28419eeb63115ed90f16b246bc1e5
 SHA1 (patch-ab) = 1237cdd4baf150899b4d9ea1073d399ffe925a64
diff -r f25ed9bdc5d8 -r 16ab9530de95 filesystems/fuse-wdfs/patches/patch-aa
--- a/filesystems/fuse-wdfs/patches/patch-aa    Sat Feb 16 01:24:07 2008 +0000
+++ b/filesystems/fuse-wdfs/patches/patch-aa    Sat Feb 16 01:24:39 2008 +0000
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2008/01/28 02:56:46 bjs Exp $
+$NetBSD: patch-aa,v 1.3 2008/02/16 01:24:39 bjs Exp $
+
+If refuse(3) ever supports -ho in option_list, the #ifndef __NetBSD__ 
+should be removed.
 
 --- src/wdfs-main.c.orig       2007-04-12 04:30:08.000000000 -0400
 +++ src/wdfs-main.c
-@@ -131,6 +131,10 @@ static struct fuse_opt wdfs_opts[] = {
+@@ -131,14 +131,24 @@ static struct fuse_opt wdfs_opts[] = {
        FUSE_OPT_END
  };
  
@@ -13,7 +16,21 @@
  static int wdfs_opt_proc(
        void *data, const char *option, int key, struct fuse_args *option_list)
  {
-@@ -1213,7 +1217,8 @@ static int wdfs_statfs(const char *local
+       switch (key) {
+               case KEY_HELP:
+                       print_help();
++#ifndef __NetBSD__
++/*
++ * XXX Using refuse(3), this results in abnormal program termination
++ *     with SIG_SEGV.
++ */
+                       fuse_opt_add_arg(option_list, "-ho");
+                       call_fuse_main(option_list);
++#endif
+                       exit(1);
+ 
+               case KEY_VERSION:
+@@ -1213,7 +1223,8 @@ static int wdfs_statfs(const char *local
  
  
  /* just say hello when fuse takes over control. */
@@ -23,7 +40,7 @@
        static void* wdfs_init(struct fuse_conn_info *conn)
  #else
        static void* wdfs_init()
-@@ -1308,7 +1313,7 @@ static void print_help()
+@@ -1308,7 +1319,7 @@ static void print_help()
  /* just a simple wrapper for fuse_main(), because the interface changed...  */
  static int call_fuse_main(struct fuse_args *args)
  {