Pullup ticket #5966 - requested by gutteridge

misc/mate-utils: build fix

Revisions pulled up:
- misc/mate-utils/Makefile                                      1.17
- misc/mate-utils/PLIST                                         1.6
- misc/mate-utils/distinfo                                      1.7
- misc/mate-utils/patches/patch-gsearchtool_help_Makefile.in    1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Wed Apr 10 01:07:10 UTC 2019

   Modified Files:
           pkgsrc/misc/mate-utils: Makefile PLIST distinfo
   Added Files:
           pkgsrc/misc/mate-utils/patches: patch-gsearchtool_help_Makefile.in

   Log Message:
   mate-utils: work around issue with itstool failures

   Disable the pt translations for one mate-utils component for now, to
   work around an issue where itstool is intermittently failing. This
   addresses PR pkg/54071. Okay youri@.


   To generate a diff of this commit:
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/mate-utils/Makefile
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/mate-utils/PLIST
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/mate-utils/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/misc/mate-utils/patches/patch-gsearchtool_help_Makefile.in

4 files changed, 22 insertions, 6 deletions

diff --git a/misc/mate-utils/Makefile b/misc/mate-utils/Makefile
index 45aa609f7ad..f0157fa6258 100644
--- a/misc/mate-utils/Makefile
+++ b/misc/mate-utils/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2019/03/27 04:48:45 gutteridge Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2019/06/02 18:15:08 spz Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=	mate-utils-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 
 COMMENT=	Utilities for MATE Desktop
diff --git a/misc/mate-utils/PLIST b/misc/mate-utils/PLIST
index 971d0529eb7..fbb0cc310ab 100644
--- a/misc/mate-utils/PLIST
+++ b/misc/mate-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/03/06 07:58:24 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.5.2.1 2019/06/02 18:15:08 spz Exp $
 bin/mate-dictionary
 bin/mate-disk-usage-analyzer
 bin/mate-panel-screenshot
@@ -2404,9 +2404,6 @@ share/help/pt/mate-disk-usage-analyzer/figures/baobab_treemaps.png
 share/help/pt/mate-disk-usage-analyzer/figures/baobab_window.png
 share/help/pt/mate-disk-usage-analyzer/index.docbook
 share/help/pt/mate-disk-usage-analyzer/legal.xml
-share/help/pt/mate-search-tool/figures/mate-search-tool_window.png
-share/help/pt/mate-search-tool/index.docbook
-share/help/pt/mate-search-tool/legal.xml
 share/help/pt/mate-system-log/figures/syslog_window.png
 share/help/pt/mate-system-log/index.docbook
 share/help/pt/mate-system-log/legal.xml
diff --git a/misc/mate-utils/distinfo b/misc/mate-utils/distinfo
index aa7f85b4150..71846f24e2e 100644
--- a/misc/mate-utils/distinfo
+++ b/misc/mate-utils/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2019/03/06 07:58:24 gutteridge Exp $
+$NetBSD: distinfo,v 1.6.2.1 2019/06/02 18:15:08 spz Exp $
 
 SHA1 (mate-utils-1.22.0.tar.xz) = fe21875689db1563e021a103e9f3968239141a8b
 RMD160 (mate-utils-1.22.0.tar.xz) = 6c0ef499454833d05b4e465f2dd61e458a6240ab
 SHA512 (mate-utils-1.22.0.tar.xz) = 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
 Size (mate-utils-1.22.0.tar.xz) = 7300112 bytes
+SHA1 (patch-gsearchtool_help_Makefile.in) = 0f206122e9e35da0f79d224982c00529c2514b30
 SHA1 (patch-logview_src_logview-utils.c) = 218670ddcc013c31d75e7654acf138e4153c0be9
diff --git a/misc/mate-utils/patches/patch-gsearchtool_help_Makefile.in b/misc/mate-utils/patches/patch-gsearchtool_help_Makefile.in
new file mode 100644
index 00000000000..481d54f9abe
--- /dev/null
+++ b/misc/mate-utils/patches/patch-gsearchtool_help_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-gsearchtool_help_Makefile.in,v 1.2.2.2 2019/06/02 18:15:08 spz Exp $
+
+Disable the pt translation, since it causes itstool to fail at random.
+This is PR pkg/54071 in pkgsrc.
+Upstream is https://github.com/itstool/itstool/issues/36
+
+--- gsearchtool/help/Makefile.in.orig	2019-02-25 18:52:25.000000000 +0000
++++ gsearchtool/help/Makefile.in
+@@ -338,7 +338,7 @@ HELP_FILES = index.docbook legal.xml
+ HELP_MEDIA = figures/mate-search-tool_window.png
+ 
+ # Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+-IGNORE_HELP_LINGUAS = 
++IGNORE_HELP_LINGUAS = pt
+ HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+ 	$(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+ 	$(subst /,,$(dir $(wildcard */*.po))) )