Since it doesn't seem to want to build with its own argp, use regular

external one. Restore patch to unbreak build with cwrappers. Bump
revision.

4 files changed, 32 insertions, 3 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 41cf47a0761..a1ae59d8442 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2015/12/05 21:25:42 adam Exp $
+# $NetBSD: Makefile,v 1.59 2015/12/10 02:55:58 joerg Exp $
 
 DISTNAME=	glusterfs-3.7.6
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
@@ -116,6 +116,7 @@ CONFIGURE_ARGS+=	--enable-debug
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/userspace-rcu/buildlink3.mk"
+.include "../../devel/argp/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 4b7fe584597..9eba4f2eb84 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.45 2015/11/09 04:13:56 manu Exp $
+$NetBSD: distinfo,v 1.46 2015/12/10 02:55:58 joerg Exp $
 
 SHA1 (glusterfs-3.7.6.tar.gz) = e611726b87f55e91041d4e8e6aa8c50e861f0957
 RMD160 (glusterfs-3.7.6.tar.gz) = 58a9e1cc6b6c80caf03d0f495ff7c98673e816ea
 Size (glusterfs-3.7.6.tar.gz) = 7690697 bytes
+SHA1 (patch-glusterfsd_src_Makefile.in) = 2ddb8d1817e4b4acae01215f16b576015806071e
+SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = bfc093b482edc1e95f95152ab407633bdf7d0f55
diff --git a/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in b/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in
new file mode 100644
index 00000000000..a185df4d6c3
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-glusterfsd_src_Makefile.in,v 1.3 2015/12/10 02:55:59 joerg Exp $
+
+--- glusterfsd/src/Makefile.in.orig	2015-11-28 18:55:07.000000000 +0000
++++ glusterfsd/src/Makefile.in
+@@ -319,7 +319,7 @@ glusterfsd_LDADD = $(top_builddir)/libgl
+ 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+ 	$(top_builddir)/rpc/xdr/src/libgfxdr.la ${GF_LDADD}
+ 
+-glusterfsd_LDFLAGS = $(GF_LDFLAGS)
++glusterfsd_LDFLAGS = $(GF_LDFLAGS) -largp
+ noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h glusterfsd-messages.h
+ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+ 	-I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \
diff --git a/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in b/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in
new file mode 100644
index 00000000000..ff15d8f2dbe
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.6 2015/12/10 02:55:59 joerg Exp $
+
+--- xlators/mgmt/glusterd/src/Makefile.in.orig	2015-11-08 21:58:06.000000000 +0000
++++ xlators/mgmt/glusterd/src/Makefile.in
+@@ -409,7 +409,7 @@ noinst_HEADERS = glusterd.h glusterd-uti
+ 	glusterd-server-quorum.h glusterd-errno.h
+ 
+ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+-	-I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \
++	-I$(CONTRIBDIR)/rbtree \
+ 	-I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \
+ 	-I$(CONTRIBDIR)/mount \
+ 	-I$(CONTRIBDIR)/userspace-rcu \