CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 28 Jun 2023 21:14:11 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun 28 21:14:11 UTC 2023

Modified Files:
        pkgsrc/devel/gettext: Makefile.common distinfo
        pkgsrc/devel/gettext-lib: distinfo
        pkgsrc/devel/gettext-m4: PLIST
        pkgsrc/devel/gettext-tools: PLIST
        pkgsrc/devel/gettext/patches: patch-aa patch-ad patch-ae patch-ag
            patch-gettext-tools_tests_Makefile.in

Log Message:
gettext*: update to 0.22

Version 0.22 - June 2023

* PO file format:
  - When a #: line contains references to file names that contain spaces,
    these file names are surrounded by Unicode characters U+2068 and U+2069.
    This makes it possible to parse such references correctly.

* Improvements for maintainers:
  - The AM_GNU_GETTEXT macro now defines two variables localedir_c and
    localedir_c_make, that can be used in C code or in Makefiles,
    respectively, for representing the value of the --localedir configure
    option.

* Programming languages support:
  - C, C++:
    o xgettext now supports gettext-like functions that take wide strings
      (of type 'const wchar_t *', 'const char16_t *', or 'const char32_t *')
      as arguments.
    o xgettext now recognizes numbers with digit separators, as defined by
      ISO C 23, as tokens.
    o xgettext and msgfmt now recognize the format string directive %b
      (for binary integer output, as defined by ISO C 23) in format strings.
    o xgettext and msgfmt now recognize the argument size specifiers
      w8, w16, w32, w64, wf8, wf16, wf32, wf64 (as defined by ISO C 23)
      in format strings.
    o xgettext and msgfmt now recognize C++ format strings, as defined by
      ISO C++ 20.  They are marked as 'c++-format' in POT and PO files.
      A new example has been added, 'hello-c++20', that illustrates how
      to use these format strings with gettext.
  - Java:
    o The build system and tools now also support Java versions newer than
      Java 11. This is known to work up to Java 20, at least. On the other
      hand, support for old versions of Java (Java 1.5 and GCJ) has been
      dropped.
  - Tcl: xgettext now supports the \x, \u, and \U escapes as defined in
    Tcl 8.6.

* Portability:
  - On systems with musl libc, the *gettext() functions in libc now work
    with MO files generated from PO files with an encoding other than UTF-8.
    To this effect, the msgfmt program now converts the messages to UTF-8
    encoding before storing them in a MO file.  You can prevent this by
    using the msgfmt --no-convert option.
  - On systems with musl libc, the *gettext() functions in libc now work
    with MO files generated from PO files with ISO C 99 <inttypes.h> format
    string directive macros.  To this effect, the msgfmt program pre-expands
    strings with such macros.  You can prevent this by using the msgfmt
    --no-redundancy option.

* xgettext:
  - The xgettext option '--sorted-output' is now deprecated.
  - xgettext input files of type PO that are not all ASCII and not UTF-8
    encoded are now handled correctly.

* The base Unicode standard is now updated to 15.0.0.

* Emacs PO mode:
  Fix an incompatibility with Emacs version 29 or newer.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/gettext/Makefile.common
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/gettext/distinfo
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/gettext-lib/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/gettext-m4/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/gettext-tools/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/gettext/patches/patch-aa
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/gettext/patches/patch-ad
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-ae
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/gettext/patches/patch-ag
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gettext/Makefile.common
diff -u pkgsrc/devel/gettext/Makefile.common:1.21 pkgsrc/devel/gettext/Makefile.common:1.22
--- pkgsrc/devel/gettext/Makefile.common:1.21   Tue Jan  3 16:32:42 2023
+++ pkgsrc/devel/gettext/Makefile.common        Wed Jun 28 21:14:10 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2023/01/03 16:32:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2023/06/28 21:14:10 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.21.1
+DISTNAME=      gettext-0.22
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=gettext/}
 

Index: pkgsrc/devel/gettext/distinfo
diff -u pkgsrc/devel/gettext/distinfo:1.43 pkgsrc/devel/gettext/distinfo:1.44
--- pkgsrc/devel/gettext/distinfo:1.43  Tue Jan  3 16:32:42 2023
+++ pkgsrc/devel/gettext/distinfo       Wed Jun 28 21:14:10 2023
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.43 2023/01/03 16:32:42 wiz Exp $
+$NetBSD: distinfo,v 1.44 2023/06/28 21:14:10 wiz Exp $
 
-BLAKE2s (gettext-0.21.1.tar.gz) = ac628eb0776bbfd93f71fd6f6b59efb1738f05b956d77281b513c828dbf2450d
-SHA512 (gettext-0.21.1.tar.gz) = ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
-Size (gettext-0.21.1.tar.gz) = 25248473 bytes
-SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
-SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563
-SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c
-SHA1 (patch-ag) = 7aa7375507a0aed0bf251101a1a3fecb1660c8b6
+BLAKE2s (gettext-0.22.tar.gz) = 6b3b0b9824a6c8d58b28717b2d9089ed4895bbf4a1f7b0979117d8449a28b4ba
+SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04
+Size (gettext-0.22.tar.gz) = 26105696 bytes
+SHA1 (patch-aa) = 8bf684967fe7dc50d63c70665068c28911e8f53c
+SHA1 (patch-ad) = 030dc7d1b02ac01898cf456f79115c395cd36bcd
+SHA1 (patch-ae) = bcfde6f6b70fbb383df08e0e3987874d2029cc52
+SHA1 (patch-ag) = 69b28fe217a9ac61d72f84fdfdd06e5b7158ad75
 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_src_write-mo.c) = e0d3512fd60b5d471248ffe9998d272bdc0a60ef
-SHA1 (patch-gettext-tools_tests_Makefile.in) = 17dbffc987536d56d2792cf5f459a3a0eccd33dc
+SHA1 (patch-gettext-tools_tests_Makefile.in) = af9c9ecbecfafc1c34d0bd3347d3d399122aaa80

Index: pkgsrc/devel/gettext-lib/distinfo
diff -u pkgsrc/devel/gettext-lib/distinfo:1.39 pkgsrc/devel/gettext-lib/distinfo:1.40
--- pkgsrc/devel/gettext-lib/distinfo:1.39      Tue Jan  3 16:32:42 2023
+++ pkgsrc/devel/gettext-lib/distinfo   Wed Jun 28 21:14:11 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.39 2023/01/03 16:32:42 wiz Exp $
+$NetBSD: distinfo,v 1.40 2023/06/28 21:14:11 wiz Exp $
 
-BLAKE2s (gettext-0.21.1.tar.gz) = ac628eb0776bbfd93f71fd6f6b59efb1738f05b956d77281b513c828dbf2450d
-SHA512 (gettext-0.21.1.tar.gz) = ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
-Size (gettext-0.21.1.tar.gz) = 25248473 bytes
+BLAKE2s (gettext-0.22.tar.gz) = 6b3b0b9824a6c8d58b28717b2d9089ed4895bbf4a1f7b0979117d8449a28b4ba
+SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04
+Size (gettext-0.22.tar.gz) = 26105696 bytes

Index: pkgsrc/devel/gettext-m4/PLIST
diff -u pkgsrc/devel/gettext-m4/PLIST:1.13 pkgsrc/devel/gettext-m4/PLIST:1.14
--- pkgsrc/devel/gettext-m4/PLIST:1.13  Tue Jan  3 16:32:42 2023
+++ pkgsrc/devel/gettext-m4/PLIST       Wed Jun 28 21:14:11 2023
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.13 2023/01/03 16:32:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2023/06/28 21:14:11 wiz Exp $
+share/aclocal/build-to-host.m4
 share/aclocal/codeset.m4
 share/aclocal/exported.m4
 share/aclocal/extern-inline.m4

Index: pkgsrc/devel/gettext-tools/PLIST
diff -u pkgsrc/devel/gettext-tools/PLIST:1.15 pkgsrc/devel/gettext-tools/PLIST:1.16
--- pkgsrc/devel/gettext-tools/PLIST:1.15       Mon Apr 20 08:37:15 2020
+++ pkgsrc/devel/gettext-tools/PLIST    Wed Jun 28 21:14:11 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2020/04/20 08:37:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2023/06/28 21:14:11 wiz Exp $
 bin/autopoint
 bin/envsubst
 bin/gettext
@@ -180,6 +180,7 @@ share/locale/ga/LC_MESSAGES/gettext-runt
 share/locale/gl/LC_MESSAGES/gettext-runtime.mo
 share/locale/gl/LC_MESSAGES/gettext-tools.mo
 share/locale/hr/LC_MESSAGES/gettext-runtime.mo
+share/locale/hr/LC_MESSAGES/gettext-tools.mo
 share/locale/hu/LC_MESSAGES/gettext-runtime.mo
 share/locale/id/LC_MESSAGES/gettext-runtime.mo
 share/locale/id/LC_MESSAGES/gettext-tools.mo
@@ -187,6 +188,7 @@ share/locale/it/LC_MESSAGES/gettext-runt
 share/locale/it/LC_MESSAGES/gettext-tools.mo
 share/locale/ja/LC_MESSAGES/gettext-runtime.mo
 share/locale/ja/LC_MESSAGES/gettext-tools.mo
+share/locale/ka/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-tools.mo
 share/locale/nb/LC_MESSAGES/gettext-runtime.mo

Index: pkgsrc/devel/gettext/patches/patch-aa
diff -u pkgsrc/devel/gettext/patches/patch-aa:1.13 pkgsrc/devel/gettext/patches/patch-aa:1.14
--- pkgsrc/devel/gettext/patches/patch-aa:1.13  Thu Jan 31 21:45:04 2013
+++ pkgsrc/devel/gettext/patches/patch-aa       Wed Jun 28 21:14:10 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.13 2013/01/31 21:45:04 adam Exp $
+$NetBSD: patch-aa,v 1.14 2023/06/28 21:14:10 wiz Exp $
 
---- gettext-runtime/configure.orig     2010-06-06 20:11:32.000000000 +0000
+--- gettext-runtime/configure.orig     2023-06-17 11:53:59.000000000 +0000
 +++ gettext-runtime/configure
-@@ -19798,10 +19798,6 @@ $as_echo "$ac_res" >&6; }
+@@ -22782,10 +22782,6 @@ printf "%s\n" "$ac_res" >&6; }
+       fi
  
        if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                 BUILD_INCLUDED_LIBINTL=yes
--        USE_INCLUDED_LIBINTL=yes
+-                USE_INCLUDED_LIBINTL=yes
 -        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV $LIBTHREAD"
 -        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV $LTLIBTHREAD"
 -        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`

Index: pkgsrc/devel/gettext/patches/patch-ad
diff -u pkgsrc/devel/gettext/patches/patch-ad:1.7 pkgsrc/devel/gettext/patches/patch-ad:1.8
--- pkgsrc/devel/gettext/patches/patch-ad:1.7   Mon May 27 13:21:41 2019
+++ pkgsrc/devel/gettext/patches/patch-ad       Wed Jun 28 21:14:10 2023
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.7 2019/05/27 13:21:41 ryoon Exp $
+$NetBSD: patch-ad,v 1.8 2023/06/28 21:14:10 wiz Exp $
 
---- gettext-tools/Makefile.in.orig     2019-05-12 15:09:14.000000000 +0000
+--- gettext-tools/Makefile.in.orig     2023-06-17 11:54:40.000000000 +0000
 +++ gettext-tools/Makefile.in
-@@ -2016,7 +2016,7 @@ top_builddir = @top_builddir@
+@@ -3277,7 +3277,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 = 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
+-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = gnulib-lib libgrep src libgettextpo po man tests system-tests doc
  
  # Allow users to use "gnulib-tool --update".
  
-@@ -2522,8 +2522,7 @@ info: info-recursive
+@@ -3788,8 +3788,7 @@ info: info-recursive
  
  info-am:
  

Index: pkgsrc/devel/gettext/patches/patch-ae
diff -u pkgsrc/devel/gettext/patches/patch-ae:1.6 pkgsrc/devel/gettext/patches/patch-ae:1.7
--- pkgsrc/devel/gettext/patches/patch-ae:1.6   Thu Jan 31 21:45:04 2013
+++ pkgsrc/devel/gettext/patches/patch-ae       Wed Jun 28 21:14:10 2023
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.6 2013/01/31 21:45:04 adam Exp $
+$NetBSD: patch-ae,v 1.7 2023/06/28 21:14:10 wiz Exp $
 
---- gettext-tools/configure.orig       2012-12-25 05:33:28.000000000 +0000
+--- gettext-tools/configure.orig       2023-06-17 11:54:38.000000000 +0000
 +++ gettext-tools/configure
-@@ -21811,10 +21811,6 @@ $as_echo "$ac_res" >&6; }
+@@ -26146,10 +26146,6 @@ printf "%s\n" "$ac_res" >&6; }
+       fi
  
        if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                 BUILD_INCLUDED_LIBINTL=yes
--        USE_INCLUDED_LIBINTL=yes
--        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV $LIBTHREAD"
--        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV $LTLIBTHREAD"
+-                USE_INCLUDED_LIBINTL=yes
+-        LIBINTL="\${top_builddir}/../gettext-runtime/intl/libintl.la $LIBICONV $LIBTHREAD"
+-        LTLIBINTL="\${top_builddir}/../gettext-runtime/intl/libintl.la $LTLIBICONV $LTLIBTHREAD"
 -        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
        fi
  

Index: pkgsrc/devel/gettext/patches/patch-ag
diff -u pkgsrc/devel/gettext/patches/patch-ag:1.12 pkgsrc/devel/gettext/patches/patch-ag:1.13
--- pkgsrc/devel/gettext/patches/patch-ag:1.12  Tue Jan  3 16:32:42 2023
+++ pkgsrc/devel/gettext/patches/patch-ag       Wed Jun 28 21:14:10 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.12 2023/01/03 16:32:42 wiz Exp $
+$NetBSD: patch-ag,v 1.13 2023/06/28 21:14:10 wiz Exp $
 
---- gettext-tools/gnulib-lib/Makefile.in.orig  2022-10-09 21:32:08.000000000 +0000
+--- gettext-tools/gnulib-lib/Makefile.in.orig  2023-06-17 11:54:41.000000000 +0000
 +++ gettext-tools/gnulib-lib/Makefile.in
-@@ -4264,13 +4264,13 @@ info: info-am
+@@ -6186,13 +6186,13 @@ info: info-am
  
  info-am:
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.12 2023/01/03 16:3
  
  install-html: install-html-am
  
-@@ -4552,14 +4552,6 @@ fcntl.h: fcntl.in.h $(top_builddir)/conf
+@@ -6538,14 +6538,6 @@ fcntl.h: fcntl.in.h $(top_builddir)/conf
  @GL_GENERATE_GETOPT_CDEFS_H_FALSE@getopt-cdefs.h: $(top_builddir)/config.status
  @GL_GENERATE_GETOPT_CDEFS_H_FALSE@    rm -f $@
  
@@ -30,6 +30,6 @@ $NetBSD: patch-ag,v 1.12 2023/01/03 16:3
 -        *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \
 -      esac
 -
- # 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)
+ malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
+       $(AM_V_GEN)$(MKDIR_P) 'malloc'
+       $(AM_V_at)$(SED_HEADER_STDOUT) \

Index: pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in
diff -u pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in:1.2 pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in:1.3
--- pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in:1.2      Mon Apr 20 08:37:14 2020
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in  Wed Jun 28 21:14:10 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.2 2020/04/20 08:37:14 wiz Exp $
+$NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.3 2023/06/28 21:14:10 wiz Exp $
 
---- gettext-tools/tests/Makefile.in.orig       2020-04-14 04:46:33.000000000 +0000
+--- gettext-tools/tests/Makefile.in.orig       2023-06-17 11:54:44.000000000 +0000
 +++ gettext-tools/tests/Makefile.in
-@@ -2613,7 +2613,12 @@ AM_CPPFLAGS = \
+@@ -3786,7 +3786,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.
@@ -12,6 +12,6 @@ $NetBSD: patch-gettext-tools_tests_Makef
 +.else
  LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
 +.endif
- LDADD_yes = ../intl/libintl.la @LTLIBTHREAD@
- LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
+ LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTLIBTHREAD@
+ LDADD_no = ../../gettext-runtime/intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
  tstgettext_SOURCES = \

Prev by Date: CVS commit: pkgsrc/devel/cutter
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/cutter
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index