- Update fusefs-kmod to 0.2.99.1, fusefs-libs to 2.5.0, fusefs-sshfs to 1.4

PR:		ports/91873
Submitted by:	Anish Mistry <amistry@am-productions.biz> (maintainer)

5 files changed, 58 insertions, 30 deletions

diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile
index bdf406eb167f..43cb45b9c641 100644
--- a/sysutils/fusefs-kmod/Makefile
+++ b/sysutils/fusefs-kmod/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	fusefs
-PORTVERSION=	0.2.19.6
+PORTVERSION=	0.2.99.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://fuse4bsd.creo.hu/downloads/ \
 		http://am-productions.biz/docs/
 PKGNAMESUFFIX=	-kmod
-DISTNAME=	fuse4bsd-0.2.20pre6
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=	fuse4bsd-0.3.0-pre1
 
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Kernel module for fuse
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fuse/fuse_kernel.h:${PORTSDIR}/sysutils/fusefs-libs
 
+CONFLICTS=	fusefs-libs-2.4*
+
 OPTIONS=	AUTOSETUP "Automatic global config file setup" off
-MAKE_ENV+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
+MAKE_ENV+=	BINDIR="${PREFIX}/sbin" MANDIR="${PREFIX}/man/man"
 MAN8=		mount_fusefs.8
 KMODDIR=	${PREFIX}/modules
 MAKE_ARGS=	KMODDIR=${KMODDIR}
@@ -28,13 +29,25 @@ SRC_BASE?=	/usr/src
 STARTUP=	fuse.sh
 SETUP=		setup.sh
 MODULE_PATH=	`sysctl -n kern.module_path`;${KMODDIR}
+TXT_DOCS=	doc.txt
+HTML_DOCS=	Faq.html \
+		Implementation.html \
+		Quickstart.html \
+		article.css \
+		deplate-mini.png \
+		deplate.css \
+		doc.html \
+		heading-navbar.css \
+		home-grey.png \
+		mailto.png \
+		next-grey.png \
+		prev-grey.png \
+		remote.png \
+		serif.css \
+		tabbar-right.css
 
 .include <bsd.port.pre.mk>
 
-.if ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600034 ) || ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700002 )
-MAKE_ARGS+=	-DUSE_OLD_CLONEHANDLER_API
-.endif
-
 .if ${OSVERSION} < 600000
 IGNORE=		requires FreeBSD 6 or above. Please consider porting it to 5.x or even 4.x
 .endif
@@ -43,6 +56,9 @@ IGNORE=		requires FreeBSD 6 or above. Please consider porting it to 5.x or even
 IGNORE=		requires the Kernel source to be installed. Set SRC_BASE if it is not in /usr/src
 .endif
 
+post-configure:
+	${CP} ${LOCALBASE}/include/fuse/fuse_kernel.h ${WRKSRC}/fuse_module
+
 pre-install:
 	${MKDIR} ${KMODDIR}
 
@@ -59,4 +75,14 @@ post-install:
 		-e "s|%%MODULE_PATH%%|${MODULE_PATH}|g" ${PKGMESSAGE}
 .endif
 
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/kmod/html
+.for i in ${TXT_DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/doc/plaintext_out/$i ${DOCSDIR}/kmod
+.endfor
+.for i in ${HTML_DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/doc/html_chunked_out/$i ${DOCSDIR}/kmod/html
+.endfor
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/fusefs-kmod/distinfo b/sysutils/fusefs-kmod/distinfo
index 829b020af345..fb5b587c5026 100644
--- a/sysutils/fusefs-kmod/distinfo
+++ b/sysutils/fusefs-kmod/distinfo
@@ -1,2 +1,3 @@
-MD5 (fuse4bsd-0.2.20pre6.tar.bz2) = e2c48e940b1fdcb669add847e42011c0
-SIZE (fuse4bsd-0.2.20pre6.tar.bz2) = 71336
+MD5 (fuse4bsd-0.3.0-pre1.tar.gz) = 9ac79caade41a0c0579f8247f89bac54
+SHA256 (fuse4bsd-0.3.0-pre1.tar.gz) = 1dbfa704787fbd60b6d880cb75af8d79c4c8d1e4cac16895da417814f1885790
+SIZE (fuse4bsd-0.3.0-pre1.tar.gz) = 165743
diff --git a/sysutils/fusefs-kmod/files/patch-fuse_module_Makefile b/sysutils/fusefs-kmod/files/patch-fuse_module_Makefile
deleted file mode 100644
index d467cfe48593..000000000000
--- a/sysutils/fusefs-kmod/files/patch-fuse_module_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- fuse_module/Makefile.orig	Sun Oct 16 09:01:26 2005
-+++ fuse_module/Makefile	Tue Oct 18 11:58:20 2005
-@@ -35,12 +35,11 @@
- 
- fuse.ko: fuse_kernel.h vnode_if.h vnode_if_typedef.h vnode_if_newproto.h
- 
--fuse_kernel.h: fuse_kernel.h.orig
--	cp fuse_kernel.h.orig fuse_kernel.h
--	patch fuse_kernel.h < kernel-header.diff
-+fuse_kernel.h:
-+	cp ${LOCALBASE}/include/fuse/fuse_kernel.h fuse_kernel.h
- 
- fuse_opnames.c:
--	awk -f ../tools/genopnames.awk fuse_kernel.h.orig > fuse_opnames.c
-+	awk -f ../tools/genopnames.awk fuse_kernel.h > fuse_opnames.c
- 
- vnode_if.h:
- 	awk -f /sys/tools/vnode_if.awk /sys/kern/vnode_if.src -h
diff --git a/sysutils/fusefs-kmod/pkg-message b/sysutils/fusefs-kmod/pkg-message
index 6a58112a016e..6f78bfaa0c6d 100644
--- a/sysutils/fusefs-kmod/pkg-message
+++ b/sysutils/fusefs-kmod/pkg-message
@@ -7,4 +7,5 @@ set the following settings:
  - Add fusefs_enable="YES" to your /etc/rc.conf
 
 %%PREFIX%%/etc/rc.d/fuse.sh start will load the module for the first time
-after the installation.
+after the installation.  Set "sysctl vfs.usermount=1" if you want to be able
+to mount fuse devices as an ordinary user.
diff --git a/sysutils/fusefs-kmod/pkg-plist b/sysutils/fusefs-kmod/pkg-plist
index 90921a7379b7..dfdf9aaf7b16 100644
--- a/sysutils/fusefs-kmod/pkg-plist
+++ b/sysutils/fusefs-kmod/pkg-plist
@@ -1,6 +1,24 @@
 etc/rc.d/fuse.sh
 modules/fuse.ko
 sbin/mount_fusefs
-sbin/mount_fusefs_safe
 @unexec kldxref %D/modules
 @unexec rmdir %D/modules 2>/dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/kmod/doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/Faq.html
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/Implementation.html
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/Quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/article.css
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/deplate-mini.png
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/deplate.css
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/doc.html
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/heading-navbar.css
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/home-grey.png
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/mailto.png
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/next-grey.png
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/prev-grey.png
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/remote.png
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/serif.css
+%%PORTDOCS%%%%DOCSDIR%%/kmod/html/tabbar-right.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod
+@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true