Update glusterfs: add full dependency, fix formatting

[Alexander Schreiber <als%thangorodrim.ch@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Alexander Schreiber <als%thangorodrim.ch@localhost>
Pushed By:	als
Date:		Mon Mar 6 21:49:30 2023 +0000
Changeset:	b4e6b9d03e337d44ad3e6984a1330021ec3056fd

Modified Files:
	glusterfs/Makefile
	glusterfs/distinfo
	glusterfs/patches/patch-configure.ac_no_bash

Log Message:
Update glusterfs: add full dependency, fix formatting

- add shells/bash as full dependency (needed for both
  build and running)
- formatting fixups by pkglint

Signed-off-by: Alexander Schreiber <als%thangorodrim.ch@localhost>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b4e6b9d03e337d44ad3e6984a1330021ec3056fd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 glusterfs/Makefile                           | 11 ++++++-----
 glusterfs/distinfo                           |  2 +-
 glusterfs/patches/patch-configure.ac_no_bash |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diffs:
diff --git a/glusterfs/Makefile b/glusterfs/Makefile
index 1718e21590..8dd38b3d8c 100644
--- a/glusterfs/Makefile
+++ b/glusterfs/Makefile
@@ -9,16 +9,17 @@ HOMEPAGE=	https://www.gluster.org/
 COMMENT=	Cluster filesystem
 LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		flex bison pkg-config bash autoconf autoreconf automake
+DEPENDS+=	bash>=4:../../shells/bash
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	flex bison pkg-config bash autoconf autoreconf automake
 
 CONFIGURE_ARGS+=	--disable-fusermount
 CONFIGURE_ARGS+=	--disable-fuse-notifications
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--without-tcmalloc
 # libtirpc not in pkgsrc (yet)
-CONFIGURE_ARGS+=        --without-libtirpc
+CONFIGURE_ARGS+=	--without-libtirpc
 
 # Upstream glusterfs effectively dropped support for 32bit platforms
 # somewhere between 8.2 (works on e.g. NetBSD/i386) and 10.3 as various
@@ -28,7 +29,7 @@ CONFIGURE_ARGS+=        --without-libtirpc
 # drop of 32bit and eventually it just happened. See
 # https://github.com/gluster/glusterfs/issues/3911#issuecomment-1451711686
 # for a more detailed explanation.
-BROKEN_ON_PLATFORM=   ${LP32PLATFORMS}
+BROKEN_ON_PLATFORM=	${LP32PLATFORMS}
 
 # Make sure we do not attept to link with -lfl
 # Only libfl.a is available, and libtool wants libfl.so
diff --git a/glusterfs/distinfo b/glusterfs/distinfo
index 32cc2244f0..311118d16b 100644
--- a/glusterfs/distinfo
+++ b/glusterfs/distinfo
@@ -3,6 +3,6 @@ $NetBSD: distinfo,v 1.73 2021/10/26 10:25:29 nia Exp $
 BLAKE2s (glusterfs-10.3.tar.gz) = c2f9b5670d1df7a787e445207caa421a949f1fb98cafb587441925efe8d9e25a
 SHA512 (glusterfs-10.3.tar.gz) = af7c8a15db48196a5f7022e4da87ae8d8d43a12c8968b242f40fb43ea562d1d214e75b3a67800f8594c97847e15c01367b6d464964252551d6f8d3e93fb0f832
 Size (glusterfs-10.3.tar.gz) = 8283537 bytes
-SHA1 (patch-configure.ac_no_bash) = b188c9ea883677e4515ae0f48b6afffdc8b4c183
+SHA1 (patch-configure.ac_no_bash) = eea22135006c11a25ad94eaf04ee1cbe8ac2ea9b
 SHA1 (patch-configure.ac_time_t) = 2bf7b3d6845216429d0064b4b5c47c9daf328c94
 SHA1 (patch-libglusterfs-src-glusterfs-dict.h) = ebfdfe6ffbdda3532d15fe108d4214b1e9596304
diff --git a/glusterfs/patches/patch-configure.ac_no_bash b/glusterfs/patches/patch-configure.ac_no_bash
index e743a929b4..bb1a2a7bd5 100644
--- a/glusterfs/patches/patch-configure.ac_no_bash
+++ b/glusterfs/patches/patch-configure.ac_no_bash
@@ -5,9 +5,9 @@ Defang bash 4.0 syntax in configure.
 upstream bugs
  - (bash) https://github.com/gluster/glusterfs/issues/3940
 
---- configure.ac.orig   2023-01-01 23:19:38.254216893 +0100
-+++ configure.ac        2023-01-02 15:14:21.968041528 +0100
-@@ -1896,10 +1901,10 @@
+--- configure.ac.orig   2022-09-20 12:24:29.568820624 +0200
++++ configure.ac        2023-03-06 22:45:21.897057433 +0100
+@@ -1896,10 +1896,10 @@
  echo "Building with LTO    : $LTO_BUILD"
  echo