Wed Jun 28 21:14:11 2023 UTC ()
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.


(wiz)
diff -r1.21 -r1.22 pkgsrc/devel/gettext/Makefile.common
diff -r1.43 -r1.44 pkgsrc/devel/gettext/distinfo
diff -r1.39 -r1.40 pkgsrc/devel/gettext-lib/distinfo
diff -r1.13 -r1.14 pkgsrc/devel/gettext-m4/PLIST
diff -r1.15 -r1.16 pkgsrc/devel/gettext-tools/PLIST
diff -r1.13 -r1.14 pkgsrc/devel/gettext/patches/patch-aa
diff -r1.7 -r1.8 pkgsrc/devel/gettext/patches/patch-ad
diff -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-ae
diff -r1.12 -r1.13 pkgsrc/devel/gettext/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in

cvs diff -r1.21 -r1.22 pkgsrc/devel/gettext/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/gettext/Makefile.common 2023/01/03 16:32:42 1.21
+++ pkgsrc/devel/gettext/Makefile.common 2023/06/28 21:14:10 1.22
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile.common,v 1.21 2023/01/03 16:32:42 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.22 2023/06/28 21:14:10 wiz Exp $
2# 2#
3# used by devel/gettext/Makefile 3# used by devel/gettext/Makefile
4# used by devel/gettext-asprintf/Makefile 4# used by devel/gettext-asprintf/Makefile
5# used by devel/gettext-lib/Makefile 5# used by devel/gettext-lib/Makefile
6# used by devel/gettext-m4/Makefile 6# used by devel/gettext-m4/Makefile
7# used by devel/gettext-tools/Makefile 7# used by devel/gettext-tools/Makefile
8 8
9DISTNAME= gettext-0.21.1 9DISTNAME= gettext-0.22
10CATEGORIES= devel 10CATEGORIES= devel
11MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} 11MASTER_SITES= ${MASTER_SITE_GNU:=gettext/}
12 12
13MAINTAINER?= pkgsrc-users@NetBSD.org 13MAINTAINER?= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://www.gnu.org/software/gettext/gettext.html 14HOMEPAGE= https://www.gnu.org/software/gettext/gettext.html
15LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
16 16
17CONFLICTS= gettext<=0.10.35 17CONFLICTS= gettext<=0.10.35
18 18
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21GNU_CONFIGURE_STRICT= no # several sub-configures 21GNU_CONFIGURE_STRICT= no # several sub-configures

cvs diff -r1.43 -r1.44 pkgsrc/devel/gettext/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gettext/distinfo 2023/01/03 16:32:42 1.43
+++ pkgsrc/devel/gettext/distinfo 2023/06/28 21:14:10 1.44
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1$NetBSD: distinfo,v 1.43 2023/01/03 16:32:42 wiz Exp $ 1$NetBSD: distinfo,v 1.44 2023/06/28 21:14:10 wiz Exp $
2 2
3BLAKE2s (gettext-0.21.1.tar.gz) = ac628eb0776bbfd93f71fd6f6b59efb1738f05b956d77281b513c828dbf2450d 3BLAKE2s (gettext-0.22.tar.gz) = 6b3b0b9824a6c8d58b28717b2d9089ed4895bbf4a1f7b0979117d8449a28b4ba
4SHA512 (gettext-0.21.1.tar.gz) = ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 4SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04
5Size (gettext-0.21.1.tar.gz) = 25248473 bytes 5Size (gettext-0.22.tar.gz) = 26105696 bytes
6SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2 6SHA1 (patch-aa) = 8bf684967fe7dc50d63c70665068c28911e8f53c
7SHA1 (patch-ad) = 56222fbc6f1db47a70457bb06d0b82f06f286563 7SHA1 (patch-ad) = 030dc7d1b02ac01898cf456f79115c395cd36bcd
8SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c 8SHA1 (patch-ae) = bcfde6f6b70fbb383df08e0e3987874d2029cc52
9SHA1 (patch-ag) = 7aa7375507a0aed0bf251101a1a3fecb1660c8b6 9SHA1 (patch-ag) = 69b28fe217a9ac61d72f84fdfdd06e5b7158ad75
10SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92 10SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92
11SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c 11SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
12SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054 12SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054
13SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f 
14SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4 13SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
15SHA1 (patch-gettext-tools_src_write-mo.c) = e0d3512fd60b5d471248ffe9998d272bdc0a60ef 14SHA1 (patch-gettext-tools_src_write-mo.c) = e0d3512fd60b5d471248ffe9998d272bdc0a60ef
16SHA1 (patch-gettext-tools_tests_Makefile.in) = 17dbffc987536d56d2792cf5f459a3a0eccd33dc 15SHA1 (patch-gettext-tools_tests_Makefile.in) = af9c9ecbecfafc1c34d0bd3347d3d399122aaa80

cvs diff -r1.39 -r1.40 pkgsrc/devel/gettext-lib/distinfo (expand / switch to unified diff)

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

cvs diff -r1.13 -r1.14 pkgsrc/devel/gettext-m4/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext-m4/PLIST 2023/01/03 16:32:42 1.13
+++ pkgsrc/devel/gettext-m4/PLIST 2023/06/28 21:14:11 1.14
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.13 2023/01/03 16:32:42 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.14 2023/06/28 21:14:11 wiz Exp $
 2share/aclocal/build-to-host.m4
2share/aclocal/codeset.m4 3share/aclocal/codeset.m4
3share/aclocal/exported.m4 4share/aclocal/exported.m4
4share/aclocal/extern-inline.m4 5share/aclocal/extern-inline.m4
5share/aclocal/fcntl-o.m4 6share/aclocal/fcntl-o.m4
6share/aclocal/flexmember.m4 7share/aclocal/flexmember.m4
7share/aclocal/gettext.m4 8share/aclocal/gettext.m4
8share/aclocal/glibc2.m4 9share/aclocal/glibc2.m4
9share/aclocal/host-cpu-c-abi.m4 10share/aclocal/host-cpu-c-abi.m4
10share/aclocal/hostname.m4 11share/aclocal/hostname.m4
11share/aclocal/iconv.m4 12share/aclocal/iconv.m4
12share/aclocal/intdiv0.m4 13share/aclocal/intdiv0.m4
13share/aclocal/intl.m4 14share/aclocal/intl.m4
14share/aclocal/intlmacosx.m4 15share/aclocal/intlmacosx.m4

cvs diff -r1.15 -r1.16 pkgsrc/devel/gettext-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext-tools/PLIST 2020/04/20 08:37:15 1.15
+++ pkgsrc/devel/gettext-tools/PLIST 2023/06/28 21:14:11 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2020/04/20 08:37:15 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.16 2023/06/28 21:14:11 wiz Exp $
2bin/autopoint 2bin/autopoint
3bin/envsubst 3bin/envsubst
4bin/gettext 4bin/gettext
5bin/gettext.sh 5bin/gettext.sh
6bin/gettextize 6bin/gettextize
7bin/msgattrib 7bin/msgattrib
8bin/msgcat 8bin/msgcat
9bin/msgcmp 9bin/msgcmp
10bin/msgcomm 10bin/msgcomm
11bin/msgconv 11bin/msgconv
12bin/msgen 12bin/msgen
13bin/msgexec 13bin/msgexec
14bin/msgfilter 14bin/msgfilter
@@ -170,33 +170,35 @@ share/locale/eo/LC_MESSAGES/gettext-runt @@ -170,33 +170,35 @@ share/locale/eo/LC_MESSAGES/gettext-runt
170share/locale/es/LC_MESSAGES/gettext-runtime.mo 170share/locale/es/LC_MESSAGES/gettext-runtime.mo
171share/locale/es/LC_MESSAGES/gettext-tools.mo 171share/locale/es/LC_MESSAGES/gettext-tools.mo
172share/locale/et/LC_MESSAGES/gettext-runtime.mo 172share/locale/et/LC_MESSAGES/gettext-runtime.mo
173share/locale/et/LC_MESSAGES/gettext-tools.mo 173share/locale/et/LC_MESSAGES/gettext-tools.mo
174share/locale/eu/LC_MESSAGES/gettext-tools.mo 174share/locale/eu/LC_MESSAGES/gettext-tools.mo
175share/locale/fi/LC_MESSAGES/gettext-runtime.mo 175share/locale/fi/LC_MESSAGES/gettext-runtime.mo
176share/locale/fi/LC_MESSAGES/gettext-tools.mo 176share/locale/fi/LC_MESSAGES/gettext-tools.mo
177share/locale/fr/LC_MESSAGES/gettext-runtime.mo 177share/locale/fr/LC_MESSAGES/gettext-runtime.mo
178share/locale/fr/LC_MESSAGES/gettext-tools.mo 178share/locale/fr/LC_MESSAGES/gettext-tools.mo
179share/locale/ga/LC_MESSAGES/gettext-runtime.mo 179share/locale/ga/LC_MESSAGES/gettext-runtime.mo
180share/locale/gl/LC_MESSAGES/gettext-runtime.mo 180share/locale/gl/LC_MESSAGES/gettext-runtime.mo
181share/locale/gl/LC_MESSAGES/gettext-tools.mo 181share/locale/gl/LC_MESSAGES/gettext-tools.mo
182share/locale/hr/LC_MESSAGES/gettext-runtime.mo 182share/locale/hr/LC_MESSAGES/gettext-runtime.mo
 183share/locale/hr/LC_MESSAGES/gettext-tools.mo
183share/locale/hu/LC_MESSAGES/gettext-runtime.mo 184share/locale/hu/LC_MESSAGES/gettext-runtime.mo
184share/locale/id/LC_MESSAGES/gettext-runtime.mo 185share/locale/id/LC_MESSAGES/gettext-runtime.mo
185share/locale/id/LC_MESSAGES/gettext-tools.mo 186share/locale/id/LC_MESSAGES/gettext-tools.mo
186share/locale/it/LC_MESSAGES/gettext-runtime.mo 187share/locale/it/LC_MESSAGES/gettext-runtime.mo
187share/locale/it/LC_MESSAGES/gettext-tools.mo 188share/locale/it/LC_MESSAGES/gettext-tools.mo
188share/locale/ja/LC_MESSAGES/gettext-runtime.mo 189share/locale/ja/LC_MESSAGES/gettext-runtime.mo
189share/locale/ja/LC_MESSAGES/gettext-tools.mo 190share/locale/ja/LC_MESSAGES/gettext-tools.mo
 191share/locale/ka/LC_MESSAGES/gettext-runtime.mo
190share/locale/ko/LC_MESSAGES/gettext-runtime.mo 192share/locale/ko/LC_MESSAGES/gettext-runtime.mo
191share/locale/ko/LC_MESSAGES/gettext-tools.mo 193share/locale/ko/LC_MESSAGES/gettext-tools.mo
192share/locale/nb/LC_MESSAGES/gettext-runtime.mo 194share/locale/nb/LC_MESSAGES/gettext-runtime.mo
193share/locale/nb/LC_MESSAGES/gettext-tools.mo 195share/locale/nb/LC_MESSAGES/gettext-tools.mo
194share/locale/nl/LC_MESSAGES/gettext-runtime.mo 196share/locale/nl/LC_MESSAGES/gettext-runtime.mo
195share/locale/nl/LC_MESSAGES/gettext-tools.mo 197share/locale/nl/LC_MESSAGES/gettext-tools.mo
196share/locale/nn/LC_MESSAGES/gettext-runtime.mo 198share/locale/nn/LC_MESSAGES/gettext-runtime.mo
197share/locale/nn/LC_MESSAGES/gettext-tools.mo 199share/locale/nn/LC_MESSAGES/gettext-tools.mo
198share/locale/pa/LC_MESSAGES/gettext-tools.mo 200share/locale/pa/LC_MESSAGES/gettext-tools.mo
199share/locale/pl/LC_MESSAGES/gettext-runtime.mo 201share/locale/pl/LC_MESSAGES/gettext-runtime.mo
200share/locale/pl/LC_MESSAGES/gettext-tools.mo 202share/locale/pl/LC_MESSAGES/gettext-tools.mo
201share/locale/pt/LC_MESSAGES/gettext-runtime.mo 203share/locale/pt/LC_MESSAGES/gettext-runtime.mo
202share/locale/pt/LC_MESSAGES/gettext-tools.mo 204share/locale/pt/LC_MESSAGES/gettext-tools.mo

cvs diff -r1.13 -r1.14 pkgsrc/devel/gettext/patches/patch-aa (expand / switch to unified diff)

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

cvs diff -r1.7 -r1.8 pkgsrc/devel/gettext/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-ad 2019/05/27 13:21:41 1.7
+++ pkgsrc/devel/gettext/patches/patch-ad 2023/06/28 21:14:10 1.8
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ad,v 1.7 2019/05/27 13:21:41 ryoon Exp $ 1$NetBSD: patch-ad,v 1.8 2023/06/28 21:14:10 wiz Exp $
2 2
3--- gettext-tools/Makefile.in.orig 2019-05-12 15:09:14.000000000 +0000 3--- gettext-tools/Makefile.in.orig 2023-06-17 11:54:40.000000000 +0000
4+++ gettext-tools/Makefile.in 4+++ gettext-tools/Makefile.in
5@@ -2016,7 +2016,7 @@ top_builddir = @top_builddir@ 5@@ -3277,7 +3277,7 @@ top_builddir = @top_builddir@
6 top_srcdir = @top_srcdir@ 6 top_srcdir = @top_srcdir@
7 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies 7 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
8 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 8 ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
9-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc 9-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
10+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po man tests system-tests doc 10+SUBDIRS = gnulib-lib libgrep src libgettextpo po man tests system-tests doc
11  11
12 # Allow users to use "gnulib-tool --update". 12 # Allow users to use "gnulib-tool --update".
13  13
14@@ -2522,8 +2522,7 @@ info: info-recursive 14@@ -3788,8 +3788,7 @@ info: info-recursive
15  15
16 info-am: 16 info-am:
17  17
18-install-data-am: install-examplesbuildauxDATA \ 18-install-data-am: install-examplesbuildauxDATA \
19- install-gettextsrcSCRIPTS 19- install-gettextsrcSCRIPTS
20+install-data-am: 20+install-data-am:
21  21
22 install-dvi: install-dvi-recursive 22 install-dvi: install-dvi-recursive
23  23

cvs diff -r1.6 -r1.7 pkgsrc/devel/gettext/patches/patch-ae (expand / switch to unified diff)

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

cvs diff -r1.12 -r1.13 pkgsrc/devel/gettext/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-ag 2023/01/03 16:32:42 1.12
+++ pkgsrc/devel/gettext/patches/patch-ag 2023/06/28 21:14:10 1.13
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-ag,v 1.12 2023/01/03 16:32:42 wiz Exp $ 1$NetBSD: patch-ag,v 1.13 2023/06/28 21:14:10 wiz Exp $
2 2
3--- gettext-tools/gnulib-lib/Makefile.in.orig 2022-10-09 21:32:08.000000000 +0000 3--- gettext-tools/gnulib-lib/Makefile.in.orig 2023-06-17 11:54:41.000000000 +0000
4+++ gettext-tools/gnulib-lib/Makefile.in 4+++ gettext-tools/gnulib-lib/Makefile.in
5@@ -4264,13 +4264,13 @@ info: info-am 5@@ -6186,13 +6186,13 @@ info: info-am
6  6
7 info-am: 7 info-am:
8  8
9-install-data-am: install-pkgdataDATA 9-install-data-am: install-pkgdataDATA
10+install-data-am: 10+install-data-am:
11  11
12 install-dvi: install-dvi-am 12 install-dvi: install-dvi-am
13  13
14 install-dvi-am: 14 install-dvi-am:
15  15
16-install-exec-am: install-exec-local install-libLTLIBRARIES 16-install-exec-am: install-exec-local install-libLTLIBRARIES
17+install-exec-am: install-libLTLIBRARIES 17+install-exec-am: install-libLTLIBRARIES
18  18
19 install-html: install-html-am 19 install-html: install-html-am
20  20
21@@ -4552,14 +4552,6 @@ fcntl.h: fcntl.in.h $(top_builddir)/conf 21@@ -6538,14 +6538,6 @@ fcntl.h: fcntl.in.h $(top_builddir)/conf
22 @GL_GENERATE_GETOPT_CDEFS_H_FALSE@getopt-cdefs.h: $(top_builddir)/config.status 22 @GL_GENERATE_GETOPT_CDEFS_H_FALSE@getopt-cdefs.h: $(top_builddir)/config.status
23 @GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@ 23 @GL_GENERATE_GETOPT_CDEFS_H_FALSE@ rm -f $@
24  24
25-# No need to install libgettextlib.a, except on AIX. 25-# No need to install libgettextlib.a, except on AIX.
26-install-exec-local: install-libLTLIBRARIES install-exec-clean 26-install-exec-local: install-libLTLIBRARIES install-exec-clean
27-install-exec-clean: 27-install-exec-clean:
28- case "@host_os@" in \ 28- case "@host_os@" in \
29- aix*) ;; \ 29- aix*) ;; \
30- *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \ 30- *) rm -f $(DESTDIR)$(libdir)/libgettextlib.a ;; \
31- esac 31- esac
32- 32-
33 # We need the following in order to create <iconv.h> when the system 33 malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
34 # doesn't have one that works with the given compiler. 34 $(AM_V_GEN)$(MKDIR_P) 'malloc'
35 @GL_GENERATE_ICONV_H_TRUE@iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) 35 $(AM_V_at)$(SED_HEADER_STDOUT) \

cvs diff -r1.2 -r1.3 pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in 2020/04/20 08:37:14 1.2
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_tests_Makefile.in 2023/06/28 21:14:10 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.2 2020/04/20 08:37:14 wiz Exp $ 1$NetBSD: patch-gettext-tools_tests_Makefile.in,v 1.3 2023/06/28 21:14:10 wiz Exp $
2 2
3--- gettext-tools/tests/Makefile.in.orig 2020-04-14 04:46:33.000000000 +0000 3--- gettext-tools/tests/Makefile.in.orig 2023-06-17 11:54:44.000000000 +0000
4+++ gettext-tools/tests/Makefile.in 4+++ gettext-tools/tests/Makefile.in
5@@ -2613,7 +2613,12 @@ AM_CPPFLAGS = \ 5@@ -3786,7 +3786,12 @@ AM_CPPFLAGS = \
6  6
7 # INTL_MACOSX_LIBS is needed because the programs depend on libintl.la 7 # INTL_MACOSX_LIBS is needed because the programs depend on libintl.la
8 # but libtool doesn't put -Wl,-framework options into .la files. 8 # but libtool doesn't put -Wl,-framework options into .la files.
9+OS != uname -s 9+OS != uname -s
10+.if ${OS} == SCO_SV 10+.if ${OS} == SCO_SV
11+LDADD = # empty 11+LDADD = # empty
12+.else 12+.else
13 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@ 13 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@
14+.endif 14+.endif
15 LDADD_yes = ../intl/libintl.la @LTLIBTHREAD@ 15 LDADD_yes = ../../gettext-runtime/intl/libintl.la @LTLIBTHREAD@
16 LDADD_no = ../intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@ 16 LDADD_no = ../../gettext-runtime/intl/libgnuintl.la @LTLIBTHREAD@ @LTLIBINTL@
17 tstgettext_SOURCES = \ 17 tstgettext_SOURCES = \