Update to 0.20.1

Changelog:
Version 0.20.1 - May 2019

* Important bug fix:
  - Fixed a wrong shared library versioning of libintl.so.

Version 0.20 - May 2019

* Support for reproducible builds:
  - msgfmt now eliminates the POT-Creation-Date header field from .mo files.

* Improvements for translators:
  - update-po target in Makefile.in.in now uses msgmerge --previous.

* Improvements for maintainers:
  - msgmerge now has an option --for-msgfmt, that produces a PO file meant
    for use by msgfmt only.  This option saves processing time, in particular
    by omitting fuzzy matching that is not useful in this situation.
  - The .pot file in a 'po' directory is now erased by "make maintainer-clean".
  - It is now possible to override xgettext options from the po/Makefile.in.in
    through options in XGETTEXT_OPTIONS (declared in po/Makevars).
  - The --intl option of the gettextize program (deprecated since 2010) is
    no longer available. Instead of including the intl sources in your package,
    we suggest making the libintl library an optional prerequisite of your
    package. This will simplify the build system of your package.
  - Accordingly, the Autoconf macro AM_GNU_GETTEXT_INTL_SUBDIR is gone as well.

* Programming languages support:
  - C, C++:
    xgettext now supports strings in u8"..." syntax, as specified in C11
    and C++11.
  - C, C++:
    xgettext now supports 'p'/'P' exponent markers in number tokens, as
    specified in C99 and C++17.
  - C++:
    xgettext now supports underscores in number tokens.
  - C++:
    xgettext now supports single-quotes in number tokens, as specified in
    C++14.
  - Shell:
    o The programs 'gettext', 'ngettext' now support a --context argument.
    o gettext.sh contains new function eval_pgettext and eval_npgettext
      for producing translations of messages with context.
  - Java:
    o xgettext now supports UTF-8 encoded .properties files (a new feature
      of Java 9).
    o The build system and tools now support Java 9, 10, and 11. On the
      other hand, support for old versions of Java (Java 5 and older,
      GCJ 4.2.x and older) has been dropped.
  - Perl:
    o Native support for context functions (pgettext, dpgettext, dcpgettext,
      npgettext, dnpgettext, dcnpgettext).
    o better detection of question mark and slash as operators (as opposed
      to regular expression delimiters).
  - Scheme:
    xgettext now parses the syntax for specialized byte vectors (#u8(...),
    #vu8(...), etc.) correctly.
  - Pascal:
    xgettext can now extract strings from .rsj files, produced by the
    Free Pascal compiler version 3.0.0 or newer.
  - Vala:
    xgettext now parses escape sequences in strings more accurately.
  - JavaScript:
    xgettext now parses template literals correctly.

* Runtime behaviour:
  - The interpretation of the language preferences on macOS has been fixed.
  - Per-thread locales are now also supported on Solaris 11.4.
  - The replacements for the printf()/fprintf()/... functions that are
    provided through <libintl.h> on native Windows and NetBSD are now POSIX
    compliant.  There is no conflict any more between these replacements
    and other possible replacements provided by gnulib or mingw.

* Libtextstyle:
  - This package installs a new library 'libtextstyle', together with a new
    header file <textstyle.h>.  It is a library for styling text output sent
    to a console or terminal emulator.
    Packagers: please see the suggested packaging hints in the file PACKAGING.

10 files changed, 44 insertions, 131 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 8b9c964c864..9d070be0b62 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2017/06/26 21:22:49 joerg Exp $
+# $NetBSD: Makefile,v 1.85 2019/05/27 13:21:41 ryoon Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -20,7 +20,7 @@ CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JIKES_IN_PATH=
 CONFIGURE_ENV+=		ac_cv_libexpat=no
 
-INSTALLATION_DIRS+=	lib/gettext ${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	lib
 TEST_TARGET=		check
 
 BROKEN_GETTEXT_DETECTION=	yes
@@ -37,8 +37,6 @@ do-install:
 	cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR}
 	cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR}
 	cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR}
-	cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data DESTDIR=${DESTDIR}
-	cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data DESTDIR=${DESTDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-asprintf/buildlink3.mk"
diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
index 3cb52a33d7e..d00d4b36758 100644
--- a/devel/gettext/Makefile.common
+++ b/devel/gettext/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2016/06/11 18:26:15 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/05/27 13:21:41 ryoon 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.19.8.1
+DISTNAME=	gettext-0.20.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST
index 9aee7fcb508..342c7f46d65 100644
--- a/devel/gettext/PLIST
+++ b/devel/gettext/PLIST
@@ -1,72 +1,7 @@
-@comment $NetBSD: PLIST,v 1.19 2017/06/26 21:22:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2019/05/27 13:21:41 ryoon Exp $
 ${PLIST.glibc}lib/preloadable_libintl.so
 share/gettext/ABOUT-NLS
 share/gettext/config.rpath
-share/gettext/intl/COPYING.LIB
-share/gettext/intl/Makefile.in
-share/gettext/intl/VERSION
-share/gettext/intl/bindtextdom.c
-share/gettext/intl/config.charset
-share/gettext/intl/dcgettext.c
-share/gettext/intl/dcigettext.c
-share/gettext/intl/dcngettext.c
-share/gettext/intl/dgettext.c
-share/gettext/intl/dngettext.c
-share/gettext/intl/eval-plural.h
-share/gettext/intl/explodename.c
-share/gettext/intl/export.h
-share/gettext/intl/finddomain.c
-share/gettext/intl/gettext.c
-share/gettext/intl/gettextP.h
-share/gettext/intl/gmo.h
-share/gettext/intl/hash-string.c
-share/gettext/intl/hash-string.h
-share/gettext/intl/intl-compat.c
-share/gettext/intl/intl-exports.c
-share/gettext/intl/l10nflist.c
-share/gettext/intl/langprefs.c
-share/gettext/intl/libgnuintl.in.h
-share/gettext/intl/libintl.rc
-share/gettext/intl/loadinfo.h
-share/gettext/intl/loadmsgcat.c
-share/gettext/intl/localcharset.c
-share/gettext/intl/localcharset.h
-share/gettext/intl/locale.alias
-share/gettext/intl/localealias.c
-share/gettext/intl/localename.c
-share/gettext/intl/lock.c
-share/gettext/intl/lock.h
-share/gettext/intl/log.c
-share/gettext/intl/ngettext.c
-share/gettext/intl/os2compat.c
-share/gettext/intl/os2compat.h
-share/gettext/intl/osdep.c
-share/gettext/intl/plural-exp.c
-share/gettext/intl/plural-exp.h
-share/gettext/intl/plural.c
-share/gettext/intl/plural.y
-share/gettext/intl/printf-args.c
-share/gettext/intl/printf-args.h
-share/gettext/intl/printf-parse.c
-share/gettext/intl/printf-parse.h
-share/gettext/intl/printf.c
-share/gettext/intl/ref-add.sin
-share/gettext/intl/ref-del.sin
-share/gettext/intl/relocatable.c
-share/gettext/intl/relocatable.h
-share/gettext/intl/setlocale.c
-share/gettext/intl/textdomain.c
-share/gettext/intl/threadlib.c
-share/gettext/intl/tsearch.c
-share/gettext/intl/tsearch.h
-share/gettext/intl/vasnprintf.c
-share/gettext/intl/vasnprintf.h
-share/gettext/intl/vasnwprintf.h
-share/gettext/intl/verify.h
-share/gettext/intl/version.c
-share/gettext/intl/wprintf-parse.h
-share/gettext/intl/xsize.c
-share/gettext/intl/xsize.h
 share/gettext/projects/GNOME/team-address
 share/gettext/projects/GNOME/teams.html
 share/gettext/projects/GNOME/teams.url
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 44b1d8ce35e..dffdfb4dc88 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,18 +1,16 @@
-$NetBSD: distinfo,v 1.36 2018/12/27 15:09:53 joerg Exp $
+$NetBSD: distinfo,v 1.37 2019/05/27 13:21:41 ryoon Exp $
 
-SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784
-RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b
-SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes
+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 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
-SHA1 (patch-ab) = caf95d3fa21ce5cab9febc9f6e9164e633ab39e0
-SHA1 (patch-ad) = 3e04eca9d824ed1bed282f3d49d5ce60ebac576f
+SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563
 SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c
-SHA1 (patch-ag) = 57cd120015eeddcb8ca1d7605c42af3374755c96
-SHA1 (patch-aj) = d5e66478ddf343ad74eb8429de47c567a81a8481
-SHA1 (patch-ak) = 05b06eae21fcf49af91479a63c5b9bbc1388101c
+SHA1 (patch-ag) = 339abdfbbd0f2f87de2a5f554bc1c13443551451
+SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92
 SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
-SHA1 (patch-an) = ec67e2bf66950190b2077b3d888efdf5ca2d6785
+SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054
 SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f
 SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
 SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
deleted file mode 100644
index e04b4b8ab02..00000000000
--- a/devel/gettext/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2013/01/31 21:45:04 adam Exp $
-
---- gettext-tools/misc/Makefile.in.orig	2010-06-06 20:12:31.000000000 +0000
-+++ gettext-tools/misc/Makefile.in
-@@ -1719,7 +1719,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-gettextsrcDATA install-lispLISP
-+install-data-am: install-gettextsrcDATA
- 
- install-dvi: install-dvi-am
- 
diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad
index ee60764804d..d12667ea7e4 100644
--- a/devel/gettext/patches/patch-ad
+++ b/devel/gettext/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.6 2016/02/01 14:56:30 adam Exp $
+$NetBSD: patch-ad,v 1.7 2019/05/27 13:21:41 ryoon Exp $
 
---- gettext-tools/Makefile.in.orig	2015-12-27 23:09:39.000000000 +0000
+--- gettext-tools/Makefile.in.orig	2019-05-12 15:09:14.000000000 +0000
 +++ gettext-tools/Makefile.in
-@@ -1865,7 +1865,7 @@ top_builddir = @top_builddir@
+@@ -2016,7 +2016,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po man tests
+-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po man tests system-tests doc
  
  # Allow users to use "gnulib-tool --update".
  
-@@ -2370,8 +2370,7 @@ info: info-recursive
+@@ -2522,8 +2522,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag
index 9f4140ee8b9..b540ebb32ee 100644
--- a/devel/gettext/patches/patch-ag
+++ b/devel/gettext/patches/patch-ag
@@ -1,17 +1,17 @@
-$NetBSD: patch-ag,v 1.9 2013/01/31 21:45:04 adam Exp $
+$NetBSD: patch-ag,v 1.10 2019/05/27 13:21:41 ryoon Exp $
 
---- gettext-tools/gnulib-lib/Makefile.in.orig	2012-12-25 05:33:32.000000000 +0000
+--- gettext-tools/gnulib-lib/Makefile.in.orig	2019-05-12 15:09:15.000000000 +0000
 +++ gettext-tools/gnulib-lib/Makefile.in
-@@ -2935,7 +2935,7 @@ check: $(BUILT_SOURCES)
+@@ -3255,7 +3255,7 @@ check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
+ 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)
-@@ -3007,7 +3007,7 @@ info: info-am
+@@ -3326,13 +3326,13 @@ info: info-am
  
  info-am:
  
@@ -20,7 +20,14 @@ $NetBSD: patch-ag,v 1.9 2013/01/31 21:45:04 adam Exp $
  
  install-dvi: install-dvi-am
  
-@@ -3300,13 +3300,6 @@ getopt.h: getopt.in.h $(top_builddir)/co
+ install-dvi-am:
+ 
+-install-exec-am: install-exec-local install-libLTLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
+ install-html: install-html-am
+ 
+@@ -3608,14 +3608,6 @@ getopt-cdefs.h: getopt-cdefs.in.h $(top_
  	} > $@-t && \
  	mv -f $@-t $@
  
@@ -31,6 +38,7 @@ $NetBSD: patch-ag,v 1.9 2013/01/31 21:45:04 adam Exp $
 -	  aix*) ;; \
 -	  *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \
 -	esac
- # This is a Makefile rule that generates multiple files at once; see the
- # automake documentation, node "Multiple Outputs", for details.
- html-ostream.h : $(top_srcdir)/../build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
+-
+ # We need the following in order to create <iconv.h> when the system
+ # doesn't have one that works with the given compiler.
+ @GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj
index 4e3b26b1948..67d7215897e 100644
--- a/devel/gettext/patches/patch-aj
+++ b/devel/gettext/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.6 2013/01/31 21:45:04 adam Exp $
+$NetBSD: patch-aj,v 1.7 2019/05/27 13:21:41 ryoon Exp $
 
 --- gettext-runtime/Makefile.in.orig	2012-12-25 05:30:40.000000000 +0000
 +++ gettext-runtime/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.6 2013/01/31 21:45:04 adam Exp $
  # specified.
  @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf
 -SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
-+SUBDIRS = doc gnulib-lib src po man m4 tests
++SUBDIRS = doc intl gnulib-lib src po man m4 tests
  
  # Allow users to use "gnulib-tool --update".
  
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
deleted file mode 100644
index 482e7e5c8ff..00000000000
--- a/devel/gettext/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2013/01/31 21:45:04 adam Exp $
-
---- gettext-runtime/intl/Makefile.in.orig	2012-12-25 05:16:50.000000000 +0000
-+++ gettext-runtime/intl/Makefile.in
-@@ -378,7 +378,7 @@ check: all
- # separate library.
- # If you want to use the one which comes with this version of the
- # package, you have to use "configure --with-included-gettext".
--install: install-exec install-data
-+install:
- install-exec: all
- 	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
- 	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
diff --git a/devel/gettext/patches/patch-an b/devel/gettext/patches/patch-an
index 580910e77a7..78bf3536db4 100644
--- a/devel/gettext/patches/patch-an
+++ b/devel/gettext/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.5 2016/02/01 14:56:30 adam Exp $
+$NetBSD: patch-an,v 1.6 2019/05/27 13:21:41 ryoon Exp $
 
---- Makefile.in.orig	2015-12-27 23:09:49.000000000 +0000
+--- Makefile.in.orig	2019-05-12 15:09:24.000000000 +0000
 +++ Makefile.in
-@@ -312,7 +312,7 @@ top_builddir = @top_builddir@
+@@ -308,7 +308,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = gnulib-local gettext-runtime gettext-tools
-+SUBDIRS = gettext-runtime gettext-tools
+-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
++SUBDIRS = gettext-runtime libtextstyle gettext-tools
  changelog_etc = \
    gettext-runtime/ChangeLog.0 \
    gettext-runtime/doc/ChangeLog.0 \