gettext*: update to 0.20.2

Version 0.20.2 - April 2020

* Improvements for maintainers:
  - A dependency bug in po/Makefile.in.in has been fixed.

* Programming languages support:
  - Shell:
    o The programs 'gettext', 'ngettext', when invoked with option -e, now
      expand '\\' and octal escape sequences, instead of swallowing them.
      (Bug present since the beginning.)
    o xgettext now recognizes 'gettext' program invocations with the '-e'
      option, such as
        gettext -e 'some\nstring\n'
  - Python:
    xgettext now assumes a Python source file is in UTF-8 encoding by default,
    as stated in PEP 3120.
  - Desktop Entry:
    The value of the 'Icon' property is no longer extracted into the POT file
    by xgettext.  The documentation explains how to localize icons.

* Runtime behaviour:
  - The interpretation of the language preferences on macOS has been improved,
    especially in the case where a system locale does not exist for the
    combination of the selected primary language and the selected territory.
  - Fixed a multithread-safety bug on Cygwin and native Windows.

8 files changed, 36 insertions, 48 deletions

diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
index 4c5a2a4cf8c..71de5a1977a 100644
--- a/devel/gettext-lib/distinfo
+++ b/devel/gettext-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2019/05/27 13:21:41 ryoon Exp $
+$NetBSD: distinfo,v 1.35 2020/04/20 08:37:14 wiz Exp $
 
-SHA1 (gettext-0.20.1.tar.gz) = 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
-RMD160 (gettext-0.20.1.tar.gz) = 6915ebc852a910c6ab64bffa88f580b64543c239
-SHA512 (gettext-0.20.1.tar.gz) = af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-Size (gettext-0.20.1.tar.gz) = 23267473 bytes
+SHA1 (gettext-0.20.2.tar.gz) = 3cb11e9648bacee4c56660d34de3ae3e8b143078
+RMD160 (gettext-0.20.2.tar.gz) = 32e99c55361970315dd9d43f9e36dd43f05fc09e
+SHA512 (gettext-0.20.2.tar.gz) = 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
+Size (gettext-0.20.2.tar.gz) = 23717789 bytes
 SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7
 SHA1 (patch-ab) = 85ac0357dd3f977550fd0d51fce87e9ddbe42d07
diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index d3953af2606..702c17488f9 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2019/12/16 14:44:56 kim Exp $
+# $NetBSD: Makefile,v 1.27 2020/04/20 08:37:14 wiz Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-m4-/}
-PKGREVISION=	1
 COMMENT=	Autoconf/automake m4 files for GNU NLS library
 LICENSE=	gnu-gpl-v2
 
@@ -15,7 +14,7 @@ NO_CONFIGURE=		yes
 
 INSTALLATION_DIRS+=	share/aclocal
 
-GNULIB_M4_FILES=			\
+GNULIB_M4_FILES=		\
 	codeset.m4		\
 	extern-inline.m4	\
 	host-cpu-c-abi.m4	\
@@ -24,10 +23,9 @@ GNULIB_M4_FILES=			\
 	lib-link.m4		\
 	lib-prefix.m4		\
 	lock.m4			\
-	longlong.m4		\
 	threadlib.m4		\
 	wchar_t.m4		\
-	wint_t.m4		\
+	wint_t.m4
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \
diff --git a/devel/gettext-m4/PLIST b/devel/gettext-m4/PLIST
index b051ae6bd87..53fa00a65bf 100644
--- a/devel/gettext-m4/PLIST
+++ b/devel/gettext-m4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/12/16 14:44:56 kim Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/04/20 08:37:14 wiz Exp $
 share/aclocal/codeset.m4
 share/aclocal/exported.m4
 share/aclocal/extern-inline.m4
@@ -22,7 +22,6 @@ share/aclocal/lib-link.m4
 share/aclocal/lib-prefix.m4
 share/aclocal/locale-de.m4
 share/aclocal/lock.m4
-share/aclocal/longlong.m4
 share/aclocal/nls.m4
 share/aclocal/po.m4
 share/aclocal/printf-posix.m4
diff --git a/devel/gettext-tools/PLIST b/devel/gettext-tools/PLIST
index 2d655e44cbd..f7d775c0171 100644
--- a/devel/gettext-tools/PLIST
+++ b/devel/gettext-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/05/27 13:21:41 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/04/20 08:37:15 wiz Exp $
 bin/autopoint
 bin/envsubst
 bin/gettext
@@ -137,14 +137,14 @@ share/doc/libtextstyle/libtextstyle_6.html
 share/doc/libtextstyle/libtextstyle_7.html
 share/doc/libtextstyle/libtextstyle_abt.html
 share/doc/libtextstyle/libtextstyle_toc.html
-share/gettext-0.20/its/glade.loc
-share/gettext-0.20/its/glade1.its
-share/gettext-0.20/its/glade2.its
-share/gettext-0.20/its/gsettings.its
-share/gettext-0.20/its/gsettings.loc
-share/gettext-0.20/its/gtkbuilder.its
-share/gettext-0.20/its/metainfo.its
-share/gettext-0.20/its/metainfo.loc
+share/gettext-${PKGVERSION}/its/glade.loc
+share/gettext-${PKGVERSION}/its/glade1.its
+share/gettext-${PKGVERSION}/its/glade2.its
+share/gettext-${PKGVERSION}/its/gsettings.its
+share/gettext-${PKGVERSION}/its/gsettings.loc
+share/gettext-${PKGVERSION}/its/gtkbuilder.its
+share/gettext-${PKGVERSION}/its/metainfo.its
+share/gettext-${PKGVERSION}/its/metainfo.loc
 share/gettext/archive.dir.tar.xz
 share/gettext/msgunfmt.tcl
 share/locale/ast/LC_MESSAGES/gettext-runtime.mo
diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
index 3c312504fc7..51edaff849d 100644
--- a/devel/gettext/Makefile.common
+++ b/devel/gettext/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2020/01/18 23:30:28 rillig Exp $
+# $NetBSD: Makefile.common,v 1.17 2020/04/20 08:37:14 wiz Exp $
 #
 # used by devel/gettext/Makefile
 # used by devel/gettext-asprintf/Makefile
@@ -6,7 +6,7 @@
 # used by devel/gettext-m4/Makefile
 # used by devel/gettext-tools/Makefile
 
-DISTNAME=	gettext-0.20.1
+DISTNAME=	gettext-0.20.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index dffdfb4dc88..fc5072e76d6 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.37 2019/05/27 13:21:41 ryoon Exp $
+$NetBSD: distinfo,v 1.38 2020/04/20 08:37:14 wiz Exp $
 
-SHA1 (gettext-0.20.1.tar.gz) = 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
-RMD160 (gettext-0.20.1.tar.gz) = 6915ebc852a910c6ab64bffa88f580b64543c239
-SHA512 (gettext-0.20.1.tar.gz) = af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-Size (gettext-0.20.1.tar.gz) = 23267473 bytes
+SHA1 (gettext-0.20.2.tar.gz) = 3cb11e9648bacee4c56660d34de3ae3e8b143078
+RMD160 (gettext-0.20.2.tar.gz) = 32e99c55361970315dd9d43f9e36dd43f05fc09e
+SHA512 (gettext-0.20.2.tar.gz) = 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d
+Size (gettext-0.20.2.tar.gz) = 23717789 bytes
 SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
 SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563
 SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c
-SHA1 (patch-ag) = 339abdfbbd0f2f87de2a5f554bc1c13443551451
+SHA1 (patch-ag) = ccb339cd8a652a9078ce69c78711734fb61ea352
 SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92
 SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
 SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054
 SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f
 SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
-SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679
+SHA1 (patch-gettext-tools_tests_Makefile.in) = 17dbffc987536d56d2792cf5f459a3a0eccd33dc
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag
index b540ebb32ee..66c27acc44e 100644
--- a/devel/gettext/patches/patch-ag
+++ b/devel/gettext/patches/patch-ag
@@ -1,21 +1,12 @@
-$NetBSD: patch-ag,v 1.10 2019/05/27 13:21:41 ryoon Exp $
+$NetBSD: patch-ag,v 1.11 2020/04/20 08:37:14 wiz Exp $
 
---- gettext-tools/gnulib-lib/Makefile.in.orig	2019-05-12 15:09:15.000000000 +0000
+--- gettext-tools/gnulib-lib/Makefile.in.orig	2020-04-14 04:46:29.000000000 +0000
 +++ gettext-tools/gnulib-lib/Makefile.in
-@@ -3255,7 +3255,7 @@ check: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)" "$(DESTDIR)$(pkgdatadir)"; do \
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
-@@ -3326,13 +3326,13 @@ info: info-am
+@@ -3483,13 +3483,13 @@ info: info-am
  
  info-am:
  
--install-data-am: install-gettextsrcDATA install-pkgdataDATA
+-install-data-am: install-pkgdataDATA
 +install-data-am:
  
  install-dvi: install-dvi-am
@@ -27,7 +18,7 @@ $NetBSD: patch-ag,v 1.10 2019/05/27 13:21:41 ryoon Exp $
  
  install-html: install-html-am
  
-@@ -3608,14 +3608,6 @@ getopt-cdefs.h: getopt-cdefs.in.h $(top_
+@@ -3767,14 +3767,6 @@ getopt-cdefs.h: getopt-cdefs.in.h $(top_
  	} > $@-t && \
  	mv -f $@-t $@
  
diff --git a/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in b/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in
index 7b41da77e48..b80132e1a84 100644
--- a/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in
+++ b/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.1 2014/07/17 13:41:57 ryoon Exp $
+$NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.2 2020/04/20 08:37:14 wiz Exp $
 
---- gettext-tools/tests/Makefile.in.orig	2014-01-07 06:18:52.000000000 +0000
+--- gettext-tools/tests/Makefile.in.orig	2020-04-14 04:46:33.000000000 +0000
 +++ gettext-tools/tests/Makefile.in
-@@ -1937,7 +1937,12 @@ AM_CPPFLAGS = \
+@@ -2613,7 +2613,12 @@ AM_CPPFLAGS = \
  
  # INTL_MACOSX_LIBS is needed because the programs depend on libintl.la
  # but libtool doesn't put -Wl,-framework options into .la files.
@@ -14,4 +14,4 @@ $NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.1 2014/07/17 13:41:57 ryoon E
 +.endif
  LDADD_yes = ../intl/libintl.la @LTLIBTHREAD@
  LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
- tstgettext_SOURCES = tstgettext.c setlocale.c
+ tstgettext_SOURCES = \