Fix build failure on 9.x

While on it:
- Pet portlint

PR:		195095
Submitted by:	woot-woot@yandex.ru (PR) evgeni.dimitrov@gmail.com (patch)
Reviewed by:	dpejesh@yahoo.com (maintainer)
Approved by:	dpejesh@yahoo.com (maintainer)
MFH:		2015Q1

4 files changed, 58 insertions, 11 deletions

diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile
index 8426818eefb1..e5e65521d9e1 100644
--- a/sysutils/fusefs-kmod/Makefile
+++ b/sysutils/fusefs-kmod/Makefile
@@ -2,13 +2,15 @@
 
 PORTNAME=	fusefs-kmod
 PORTVERSION=	0.263233
+PORTREVISION=	1
 PORTEPOCH=	1
-CATEGORIES=	sysutils kld
+CATEGORIES=	sysutils
+MASTER_SITES=	https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/
 
 MAINTAINER=	dpejesh@yahoo.com
 COMMENT=	FUSE kernel module
 
-MASTER_SITES=	https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/
+BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -17,8 +19,6 @@ WRKSRC=		${WRKDIR}
 USE_RC_SUBR=	fusefs
 USES=		kmod uidfix
 
-BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
-
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${MANPREFIX}/man/man"
 
@@ -32,6 +32,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-fuse_vfsops.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-fuse_vnops.c
 .endif
 .if ${OSVERSION} >= 900000 && ${OSVERSION} < 1000000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-9-fuse_main.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-9-fuse_vfsops.c
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-9-fuse_vnops.c
 .endif
diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c
new file mode 100644
index 000000000000..118e861afcc2
--- /dev/null
+++ b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c
@@ -0,0 +1,22 @@
+--- fs/fuse/fuse_main.c.orig	2014-12-02 15:57:14.465629906 +0200
++++ fs/fuse/fuse_main.c	2014-12-02 16:03:10.070605830 +0200
+@@ -92,10 +92,19 @@
+ 	.vfc_flags = VFCF_SYNTHETIC
+ };
+ 
++#ifdef SYSCTL_NULL_INT_PTR
++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD,
++    SYSCTL_NULL_INT_PTR, FUSE_KERNEL_VERSION,
++    "FUSE kernel abi major version");
++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD,
++    SYSCTL_NULL_INT_PTR, FUSE_KERNEL_MINOR_VERSION,
++    "FUSE kernel abi minor version");
++#else
+ SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD,
+     0, FUSE_KERNEL_VERSION, "FUSE kernel abi major version");
+ SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD,
+     0, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version");
++#endif // SYSCTL_NULL_INT_PTR
+ 
+ /******************************
+  *
diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c
index f38a35662abf..c6fb4c368a73 100644
--- a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c
+++ b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c
@@ -1,6 +1,6 @@
---- fs/fuse/fuse_vfsops.c.orig
-+++ fs/fuse/fuse_vfsops.c
-@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
+--- fs/fuse/fuse_vfsops.c.orig	2014-03-16 12:55:57.000000000 +0200
++++ fs/fuse/fuse_vfsops.c	2014-12-02 16:02:35.879606170 +0200
+@@ -62,7 +62,7 @@
  #include <sys/errno.h>
  #include <sys/param.h>
  #include <sys/kernel.h>
@@ -9,7 +9,32 @@
  #include <sys/conf.h>
  #include <sys/filedesc.h>
  #include <sys/uio.h>
-@@ -220,7 +220,6 @@ fuse_vfsop_mount(struct mount *mp)
+@@ -113,13 +113,24 @@
+ 	.vfs_statfs = fuse_vfsop_statfs,
+ };
+ 
++#ifdef SYSCTL_NULL_INT_PTR
++SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD,
++    SYSCTL_NULL_INT_PTR, 1, "indicate async handshake");
++#else
+ SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD,
+     0, 1, "indicate async handshake");
++#endif // SYSCTL_NULL_INT_PTR
+ static int fuse_enforce_dev_perms = 0;
+ 
++#ifdef SYSCTL_NULL_INT_PTR
++SYSCTL_INT(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW,
++    &fuse_enforce_dev_perms, 0,
++    "enforce fuse device permissions for secondary mounts");
++#else
+ SYSCTL_LONG(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW,
+     &fuse_enforce_dev_perms, 0,
+     "enforce fuse device permissions for secondary mounts");
++#endif // SYSCTL_NULL_INT_PTR
+ static unsigned sync_unmount = 1;
+ 
+ SYSCTL_UINT(_vfs_fuse, OID_AUTO, sync_unmount, CTLFLAG_RW,
+@@ -220,7 +231,6 @@
  	struct file *fp, *fptmp;
  	char *fspec, *subtype;
  	struct vfsoptlist *opts;
@@ -17,7 +42,7 @@
  
  	subtype = NULL;
  	max_read_set = 0;
-@@ -290,7 +289,7 @@ fuse_vfsop_mount(struct mount *mp)
+@@ -290,7 +300,7 @@
  
  	FS_DEBUG2G("mntopts 0x%jx\n", (uintmax_t)mntopts);
  
@@ -26,7 +51,7 @@
  	if (err != 0) {
  		FS_DEBUG("invalid or not opened device: data=%p\n", data);
  		goto out;
-@@ -459,7 +458,7 @@ fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp)
+@@ -459,7 +469,7 @@
  				FUSE_UNLOCK();
  				VOP_UNLOCK(*vpp, 0);
  				vrele(*vpp);
diff --git a/sysutils/fusefs-kmod/pkg-descr b/sysutils/fusefs-kmod/pkg-descr
index a1f338dbe6f8..9ab5d39d4594 100644
--- a/sysutils/fusefs-kmod/pkg-descr
+++ b/sysutils/fusefs-kmod/pkg-descr
@@ -1,3 +1,2 @@
 Kernel module for fusefs based filesystems,
 backported from 10.x to 8.x and 9.x.
-