summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2022-06-11 02:55:14 +0000
committergutteridge <gutteridge@pkgsrc.org>2022-06-11 02:55:14 +0000
commit89bf54e53ccc897b352bd3d79ba2dd5a712b28f0 (patch)
tree48c00ed4213be62804720e772c86a45efc8aae6b
parent0062779232726c836a02ce2f3c28bf30d4f027aa (diff)
downloadpkgsrc-89bf54e53ccc897b352bd3d79ba2dd5a712b28f0.tar.gz
rarian: avoid unnecessary error output
This package expects GNU getopt, as it uses the -n option. Restore a patch that addresses this, so we don't get a bunch of logging spam from non-GNU versions during the install phase of various dependant packages. (The package already explicitly depends on GNU getopt from pkgsrc.) Addresses PR pkg/56871 from Yasushi Oshima, who provided the analysis.
-rw-r--r--textproc/rarian/Makefile4
-rw-r--r--textproc/rarian/distinfo3
-rw-r--r--textproc/rarian/patches/patch-util_rarian-sk-update.in24
3 files changed, 28 insertions, 3 deletions
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index e703f10ec76..ca70d50a290 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/04/18 19:12:12 adam Exp $
+# $NetBSD: Makefile,v 1.20 2022/06/11 02:55:14 gutteridge Exp $
#
DISTNAME= rarian-0.8.1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= textproc
MASTER_SITES= https://rarian.freedesktop.org/Releases/
MASTER_SITES+= ${MASTER_SITE_GNOME:=sources/rarian/0.8/}
diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo
index 49868531fed..395942ae509 100644
--- a/textproc/rarian/distinfo
+++ b/textproc/rarian/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:23:19 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/06/11 02:55:14 gutteridge Exp $
BLAKE2s (rarian-0.8.1.tar.bz2) = 1744c122dfb4b40f0716a743fe3afe5b3a744bfd7a575bd2d650326df30e614b
SHA512 (rarian-0.8.1.tar.bz2) = 64f3e7fbe423e45a59453805fe6b4116e0ffad43c7e88fe362d76a326c70936c6b46c4a4dc57cf43e3535c16f2f07fa1b2affa0aaeae637ee3ede48850c1fc60
Size (rarian-0.8.1.tar.bz2) = 324441 bytes
SHA1 (patch-librarian_Makefile.in) = 0f41cbaacd43a8f3358671dc9604a1092b7ba971
+SHA1 (patch-util_rarian-sk-update.in) = fe0b5c9303e31bcb4a04385c560c5075f0e04637
diff --git a/textproc/rarian/patches/patch-util_rarian-sk-update.in b/textproc/rarian/patches/patch-util_rarian-sk-update.in
new file mode 100644
index 00000000000..ca78f8f915f
--- /dev/null
+++ b/textproc/rarian/patches/patch-util_rarian-sk-update.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-util_rarian-sk-update.in,v 1.1 2022/06/11 02:55:14 gutteridge Exp $
+
+Use the GNU version of getopt, so the -n option is available. Avoids
+significant output spamming from versions of getopt that don't support
+it, e.g., the version NetBSD includes in base.
+
+--- util/rarian-sk-update.in.orig 2008-09-01 18:40:21.000000000 +0000
++++ util/rarian-sk-update.in
+@@ -264,7 +264,7 @@ process_directory ()
+ # They are inherited from scrollkeeper :(
+
+ # We use TEMP as set -- seems to nuke the return value of getopt
+-TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
++TEMP=`${prefix}/bin/getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
+ -- "$@"` \
+ || print_usage
+
+@@ -422,4 +422,4 @@ then
+ fi
+ rm -rf $tmpdir
+
+-fi # ENABLE_OMF_READ
+\ No newline at end of file
++fi # ENABLE_OMF_READ