From 5be0cf5d57fd5f31b94cc01d839bac2cb1942157 Mon Sep 17 00:00:00 2001 From: bjs Date: Mon, 28 Jan 2008 02:56:46 +0000 Subject: Update to version 1.4.2. While here, support if it exists. I'm not sure about FUSE_VERSION vs. FUSE_USE_VERSION in different implementations, so define FUSE_USE_VERSION from FUSE_VERSION if it does not exist and use that. 2007-04-17 CHANGES: - fixed a stupid bug that avoids mounting the root of a server - documented the optional port for mounting a webdav server - improved attribute caching for some special cases --- filesystems/fuse-wdfs/Makefile | 11 +++++--- filesystems/fuse-wdfs/distinfo | 12 ++++----- filesystems/fuse-wdfs/patches/patch-aa | 48 +++++++++++++++++++++++----------- filesystems/fuse-wdfs/patches/patch-ab | 37 +++++++++++++------------- 4 files changed, 65 insertions(+), 43 deletions(-) diff --git a/filesystems/fuse-wdfs/Makefile b/filesystems/fuse-wdfs/Makefile index f9aa7ade5d5..8579af6cd0a 100644 --- a/filesystems/fuse-wdfs/Makefile +++ b/filesystems/fuse-wdfs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/01/18 05:06:33 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2008/01/28 02:56:46 bjs Exp $ # -DISTNAME= wdfs-1.4.1 +DISTNAME= wdfs-1.4.2 PKGNAME= fuse-${DISTNAME} -PKGREVISION= 1 CATEGORIES= filesystems MASTER_SITES= http://noedler.de/projekte/wdfs/ @@ -14,6 +13,12 @@ COMMENT= FUSE-based webdav filesystem GNU_CONFIGURE= yes USE_TOOLS+= pkg-config +PTHREAD_AUTO_VARS= yes + +.if exists(/usr/include/stdbool.h) +CPPFLAGS+= -DHAVE_STDBOOL_H +.endif + .include "../../devel/glib2/buildlink3.mk" .include "../../www/neon/buildlink3.mk" diff --git a/filesystems/fuse-wdfs/distinfo b/filesystems/fuse-wdfs/distinfo index d0fe2608a01..b8a46af761c 100644 --- a/filesystems/fuse-wdfs/distinfo +++ b/filesystems/fuse-wdfs/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2007/05/16 22:28:19 agc Exp $ +$NetBSD: distinfo,v 1.3 2008/01/28 02:56:46 bjs Exp $ -SHA1 (wdfs-1.4.1.tar.gz) = 7748ef4f3d00a0910a2bc09c5901929408e8a990 -RMD160 (wdfs-1.4.1.tar.gz) = f2d682ba7840ba11ada3f0444fddb921890240fb -Size (wdfs-1.4.1.tar.gz) = 109223 bytes -SHA1 (patch-aa) = 3353a90a2a411f9633e26dd6a0df05d0c0ab083d -SHA1 (patch-ab) = f48827366e739ea5602d95695f62dd4630fa3fa1 +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-ab) = 1237cdd4baf150899b4d9ea1073d399ffe925a64 diff --git a/filesystems/fuse-wdfs/patches/patch-aa b/filesystems/fuse-wdfs/patches/patch-aa index 528b10c07ea..ce608d06d6b 100644 --- a/filesystems/fuse-wdfs/patches/patch-aa +++ b/filesystems/fuse-wdfs/patches/patch-aa @@ -1,16 +1,34 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/05/16 19:56:37 agc Exp $ +$NetBSD: patch-aa,v 1.2 2008/01/28 02:56:46 bjs Exp $ ---- src/Makefile.in 2007/03/11 22:35:55 1.1 -+++ src/Makefile.in 2007/03/11 22:37:43 -@@ -56,9 +56,9 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -pthread - CCLD = $(CC) --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) -pthread $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(wdfs_SOURCES) - DIST_SOURCES = $(wdfs_SOURCES) - ETAGS = etags +--- 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[] = { + FUSE_OPT_END + }; + ++#ifndef FUSE_USE_VERSION ++#define FUSE_USE_VERSION FUSE_VERSION ++#endif ++ + 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 + + + /* just say hello when fuse takes over control. */ +-#if FUSE_VERSION >= 26 ++ ++#if FUSE_USE_VERSION >= 26 + static void* wdfs_init(struct fuse_conn_info *conn) + #else + static void* wdfs_init() +@@ -1308,7 +1313,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) + { +-#if FUSE_VERSION >= 26 ++#if FUSE_USE_VERSION >= 26 + return fuse_main(args->argc, args->argv, &wdfs_operations, NULL); + #else + return fuse_main(args->argc, args->argv, &wdfs_operations); diff --git a/filesystems/fuse-wdfs/patches/patch-ab b/filesystems/fuse-wdfs/patches/patch-ab index 5220e0a52e2..5627455a8df 100644 --- a/filesystems/fuse-wdfs/patches/patch-ab +++ b/filesystems/fuse-wdfs/patches/patch-ab @@ -1,22 +1,21 @@ -$NetBSD: patch-ab,v 1.1 2007/05/16 22:28:19 agc Exp $ +$NetBSD: patch-ab,v 1.2 2008/01/28 02:56:46 bjs Exp $ ---- src/wdfs-main.c 2007/05/16 22:24:29 1.1 -+++ src/wdfs-main.c 2007/05/16 22:24:54 -@@ -1209,7 +1209,7 @@ +--- src/wdfs-main.h.orig 2007-03-28 16:53:21.000000000 -0400 ++++ src/wdfs-main.h +@@ -29,10 +29,16 @@ + esac + */ ++#if defined(HAVE_STDBOOL_H) ++#include ++typedef bool bool_t; ++#else + typedef enum { + true = 1, + false = 0 + } bool_t; ++#endif ++ - /* just say hello when fuse takes over control. */ --#if FUSE_VERSION >= 26 -+#if FUSE_USE_VERSION >= 26 - static void* wdfs_init(struct fuse_conn_info *conn) - #else - static void* wdfs_init() -@@ -1304,7 +1304,7 @@ - /* just a simple wrapper for fuse_main(), because the interface changed... */ - static int call_fuse_main(struct fuse_args *args) - { --#if FUSE_VERSION >= 26 -+#if FUSE_USE_VERSION >= 26 - return fuse_main(args->argc, args->argv, &wdfs_operations, NULL); - #else - return fuse_main(args->argc, args->argv, &wdfs_operations); + /* used as mode for unify_path() */ + enum { -- cgit v1.2.3