5 files changed, 40 insertions, 20 deletions

diff --git a/net/nfs-ganesha/Makefile b/net/nfs-ganesha/Makefile
index 0b90c8864a4a..b23ed1fafa30 100644
--- a/net/nfs-ganesha/Makefile
+++ b/net/nfs-ganesha/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nfs-ganesha
 DISTVERSION=	2.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	fatih@gandi.net
@@ -16,9 +16,9 @@ USE_RC_SUBR=	ganesha
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nfs-ganesha
-GH_TAGNAME=	V2.7-rc1
+GH_TAGNAME=	V2.7.0
 CFLAGS+=	-Wno-error
-GH_TUPLE=	nfs-ganesha:ntirpc:b69c2c1e353:ganesha/src/libntirpc
+GH_TUPLE=	nfs-ganesha:ntirpc:v1.7.0:ganesha/src/libntirpc
 
 CMAKE_ARGS=	-DLIB_INSTALL_DIR=${LOCALBASE}/lib -DUSE_GSS=OFF -DUSE_9P=OFF \
 		-DUSE_FSAL_PROXY=OFF -DUSE_FSAL_GPFS=OFF -DUSE_FSAL_CEPH=OFF \
diff --git a/net/nfs-ganesha/distinfo b/net/nfs-ganesha/distinfo
index f8b0667e3ac9..dea3b000ab0a 100644
--- a/net/nfs-ganesha/distinfo
+++ b/net/nfs-ganesha/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1534776761
-SHA256 (nfs-ganesha-nfs-ganesha-2.7.0-V2.7-rc1_GH0.tar.gz) = bcb7ae7f9a80e23c56164b8b69dd0be88dc9baa9945bbccb90895caa66d0f45f
-SIZE (nfs-ganesha-nfs-ganesha-2.7.0-V2.7-rc1_GH0.tar.gz) = 1690807
-SHA256 (nfs-ganesha-ntirpc-b69c2c1e353_GH0.tar.gz) = c035a974cdb49af610a451bc7527b5d3c7891cf54778cde0a76f5c135b422329
-SIZE (nfs-ganesha-ntirpc-b69c2c1e353_GH0.tar.gz) = 373146
+TIMESTAMP = 1537179573
+SHA256 (nfs-ganesha-nfs-ganesha-2.7.0-V2.7.0_GH0.tar.gz) = a458bd461049e4800bad24a2fd01335de6020f46ee495d5b2621eb3270097bca
+SIZE (nfs-ganesha-nfs-ganesha-2.7.0-V2.7.0_GH0.tar.gz) = 1691800
+SHA256 (nfs-ganesha-ntirpc-v1.7.0_GH0.tar.gz) = 61c72b481cd75945852df2f9ee5a6080e6f8cca7e57f4c7bc950f6cea0a7fbdb
+SIZE (nfs-ganesha-ntirpc-v1.7.0_GH0.tar.gz) = 373195
diff --git a/net/nfs-ganesha/files/patch-src_os_freebsd_xattr.c b/net/nfs-ganesha/files/patch-src_os_freebsd_xattr.c
index 971777e9f734..1ac4364a3c1b 100644
--- a/net/nfs-ganesha/files/patch-src_os_freebsd_xattr.c
+++ b/net/nfs-ganesha/files/patch-src_os_freebsd_xattr.c
@@ -1,15 +1,14 @@
---- src/os/freebsd/xattr.c.orig	2018-08-10 21:04:37 UTC
+diff --git a/src/os/freebsd/xattr.c b/src/os/freebsd/xattr.c
+index 5edb6f8b8..1d6275d61 100644
+--- src/os/freebsd/xattr.c
 +++ src/os/freebsd/xattr.c
-@@ -27,8 +27,12 @@
+@@ -26,6 +26,9 @@
+  */
  
  #include <os/freebsd/xattr.h>
- #include <sys/extattr.h>
-+#include <sys/param.h>
- 
-+
-+#ifndef EXTATTR_MAXNAMELEN
- #define EXTATTR_MAXNAMELEN 255
++#ifndef NAME_MAX
++#include <sys/syslimits.h>
 +#endif
+ #include <sys/extattr.h>
  
- ssize_t fgetxattr(int fd, const char *name, void *value, size_t size)
- {
+ #ifndef EXTATTR_MAXNAMELEN
diff --git a/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt b/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt
new file mode 100644
index 000000000000..e09cab2ce330
--- /dev/null
+++ b/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt
@@ -0,0 +1,21 @@
+commit cf799916131f30bf42d33ddd86b326bb2f90ffbc
+Author: Fatih Acar <fatih.acar@gandi.net>
+Date:   Fri May 18 12:30:19 2018 +0200
+
+    ganeshactl, cmakefile: python2.7 on freebsd
+
+diff --git a/src/scripts/ganeshactl/CMakeLists.txt b/src/scripts/ganeshactl/CMakeLists.txt
+index 2e950b676..0fac9af3d 100644
+--- src/scripts/ganeshactl/CMakeLists.txt
++++ src/scripts/ganeshactl/CMakeLists.txt
+@@ -1,6 +1,10 @@
+ # Building and packaging DBUS scripts for ganesha
+ 
++if (FREEBSD)
++find_program(PYTHON "python2.7")
++else (FREEBSD)
+ find_program(PYTHON "python")
++endif (FREEBSD)
+ 
+ # PyQT based class modules
+ set(GANESHA_BASE_SRCS
diff --git a/net/nfs-ganesha/pkg-plist b/net/nfs-ganesha/pkg-plist
index 4f737df6c90e..24bdde2adb40 100644
--- a/net/nfs-ganesha/pkg-plist
+++ b/net/nfs-ganesha/pkg-plist
@@ -68,7 +68,7 @@ bin/get_clientids
 bin/grace_period
 bin/ganesha.nfsd
 lib/libntirpc.so.1.7
-lib/libntirpc.so.1.7.0_rc1
+lib/libntirpc.so.1.7.0
 lib/libntirpc.so
 lib/ganesha/libfsalmem.so.4
 lib/ganesha/libfsalnull.so
@@ -102,7 +102,7 @@ lib/python2.7/site-packages/Ganesha/client_mgr.pyc
 lib/python2.7/site-packages/Ganesha/log_mgr.pyc
 lib/python2.7/site-packages/Ganesha/export_mgr.pyc
 lib/python2.7/site-packages/Ganesha/client_mgr.py
-lib/python2.7/site-packages/ganeshactl-2.7_rc1-py2.7.egg-info
+lib/python2.7/site-packages/ganeshactl-2.7.0-py2.7.egg-info
 libdata/pkgconfig/libntirpc.pc
 share/doc/ganesha/config_samples/vfs.conf
 share/doc/ganesha/config_samples/config.txt