From 8d145b4c60a4141e6257c49470d50b4bfc9646d2 Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Wed, 21 Sep 2011 20:29:34 +0000 Subject: [PATCH] - Fix build on 9-CURRENT PR: ports/160608 (plus many other) Submitted by: Kevin Oberman (based on) --- sysutils/fusefs-kmod/Makefile | 6 +++++- .../files/extra-patch-fuse_module__fuse_vnops.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 sysutils/fusefs-kmod/files/extra-patch-fuse_module__fuse_vnops.c diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile index 41f8c56215fd..b08c7aecf470 100644 --- a/sysutils/fusefs-kmod/Makefile +++ b/sysutils/fusefs-kmod/Makefile @@ -7,7 +7,7 @@ PORTNAME= fusefs DISTVERSION= 0.3.9-pre1.20080208 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils kld MASTER_SITES= http://mercurial.creo.hu/repos/fuse4bsd-hg/index.cgi/archive/ PKGNAMESUFFIX= -kmod @@ -58,6 +58,10 @@ OPTIONS= AUTOSETUP "Automatic global config file setup" off .include +.if ${OSVERSION} >= 900040 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fuse_module__fuse_vnops.c +.endif + .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires the Kernel source to be installed. Set SRC_BASE if it is not in /usr/src .endif diff --git a/sysutils/fusefs-kmod/files/extra-patch-fuse_module__fuse_vnops.c b/sysutils/fusefs-kmod/files/extra-patch-fuse_module__fuse_vnops.c new file mode 100644 index 000000000000..f776c3bd9cb5 --- /dev/null +++ b/sysutils/fusefs-kmod/files/extra-patch-fuse_module__fuse_vnops.c @@ -0,0 +1,11 @@ +--- fuse_module/fuse_vfsops.c.orig 2008-02-05 07:25:57.000000000 +0200 ++++ fuse_module/fuse_vfsops.c 2011-09-08 10:27:43.000000000 +0300 +@@ -224,7 +231,7 @@ + struct cdev *fdev; + struct sx *slock; + struct fuse_data *data; +- int mntopts = 0, __mntopts = 0, max_read_set = 0, secondary = 0; ++ uint64_t mntopts = 0, __mntopts = 0, max_read_set = 0, secondary = 0; + unsigned max_read = ~0; + struct vnode *rvp; + struct fuse_vnode_data *fvdat;