6 files changed, 13 insertions, 49 deletions
diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
index 71de5a1977a..8dc5e253c81 100644
--- a/devel/gettext-lib/distinfo
+++ b/devel/gettext-lib/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.35 2020/04/20 08:37:14 wiz Exp $
+$NetBSD: distinfo,v 1.36 2020/07/29 07:00:15 wiz Exp $
 
-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
+SHA1 (gettext-0.21.tar.gz) = e6c0a0cba5b00a604c9118403a8199c77a538526
+RMD160 (gettext-0.21.tar.gz) = 93b5bf20f0cb7f0fb5342a948b86d55682b99521
+SHA512 (gettext-0.21.tar.gz) = bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
+Size (gettext-0.21.tar.gz) = 24181849 bytes
diff --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa
deleted file mode 100644
index 923d502f7cf..00000000000
--- a/devel/gettext-lib/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2013/01/31 21:45:04 adam Exp $
-
---- gettext-runtime/intl/localcharset.c.orig	2012-12-24 00:33:38.000000000 +0000
-+++ gettext-runtime/intl/localcharset.c
-@@ -19,6 +19,10 @@
- 
- #include <config.h>
- 
-+#if !defined(HAVE_GNU_ICONV)
-+
-+/* Provide our variant only if we don't use the GNU iconv library.  */
-+
- /* Specification.  */
- #include "localcharset.h"
- 
-@@ -556,3 +560,4 @@ locale_charset (void)
- 
-   return codeset;
- }
-+#endif
diff --git a/devel/gettext-lib/patches/patch-ab b/devel/gettext-lib/patches/patch-ab
deleted file mode 100644
index 1302d938567..00000000000
--- a/devel/gettext-lib/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2019/05/27 13:21:41 ryoon Exp $
-
---- gettext-runtime/intl/Makefile.in.orig	2019-05-12 15:08:36.000000000 +0000
-+++ gettext-runtime/intl/Makefile.in
-@@ -1939,7 +1939,7 @@ intl-compat.lo:      ../config.h $(srcdi
- @USE_INCLUDED_LIBINTL_TRUE@install-exec-libintl: libintl.la
- @USE_INCLUDED_LIBINTL_TRUE@	$(mkdir_p) $(DESTDIR)$(libdir)
- @USE_INCLUDED_LIBINTL_TRUE@	$(LIBTOOL) --mode=install \
--@USE_INCLUDED_LIBINTL_TRUE@	  $(INSTALL_DATA) libintl.la $(DESTDIR)$(libdir)/libintl.la; \
-+@USE_INCLUDED_LIBINTL_TRUE@	  $(BSD_INSTALL_LIB) libintl.la $(DESTDIR)$(libdir)/libintl.la; \
- @USE_INCLUDED_LIBINTL_TRUE@	if test "@RELOCATABLE@" = yes; then \
- @USE_INCLUDED_LIBINTL_TRUE@	  dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
- @USE_INCLUDED_LIBINTL_TRUE@	  if test -n "$$dependencies"; then \
diff --git a/devel/gettext-m4/PLIST b/devel/gettext-m4/PLIST
index 53fa00a65bf..b32a21855f1 100644
--- a/devel/gettext-m4/PLIST
+++ b/devel/gettext-m4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2020/04/20 08:37:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2020/07/29 07:00:16 wiz Exp $
 share/aclocal/codeset.m4
 share/aclocal/exported.m4
 share/aclocal/extern-inline.m4
@@ -14,7 +14,6 @@ share/aclocal/intdiv0.m4
 share/aclocal/intl.m4
 share/aclocal/intlmacosx.m4
 share/aclocal/intmax.m4
-share/aclocal/inttypes-pri.m4
 share/aclocal/inttypes_h.m4
 share/aclocal/lcmessage.m4
 share/aclocal/lib-ld.m4
diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
index 71075116772..146e3ea5a1b 100644
--- a/devel/gettext/Makefile.common
+++ b/devel/gettext/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2020/05/13 03:38:24 rillig Exp $
+# $NetBSD: Makefile.common,v 1.19 2020/07/29 07:00:15 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.2
+DISTNAME=	gettext-0.21
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index fc5072e76d6..b3ce64c6871 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38 2020/04/20 08:37:14 wiz Exp $
+$NetBSD: distinfo,v 1.39 2020/07/29 07:00:15 wiz Exp $
 
-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 (gettext-0.21.tar.gz) = e6c0a0cba5b00a604c9118403a8199c77a538526
+RMD160 (gettext-0.21.tar.gz) = 93b5bf20f0cb7f0fb5342a948b86d55682b99521
+SHA512 (gettext-0.21.tar.gz) = bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
+Size (gettext-0.21.tar.gz) = 24181849 bytes
 SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
 SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563
 SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c