CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 21 Jul 2026 12:55:54 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jul 21 12:55:54 UTC 2026

Modified Files:
        pkgsrc/devel/gettext: Makefile Makefile.common distinfo
        pkgsrc/devel/gettext-lib: Makefile PLIST distinfo
        pkgsrc/devel/gettext-m4: Makefile PLIST
        pkgsrc/devel/gettext-tools: Makefile PLIST
Added Files:
        pkgsrc/devel/gettext/patches: patch-Makefile.in
            patch-gettext-runtime_Makefile.in patch-gettext-runtime_configure
            patch-gettext-tools_Makefile.in patch-gettext-tools_configure
            patch-gettext-tools_gnulib-lib_Makefile.in
            patch-gettext-tools_po_Makefile.in.in
Removed Files:
        pkgsrc/devel/gettext/patches: patch-aa patch-ad patch-ae patch-ag
            patch-aj patch-al patch-an
            patch-gettext-runtime_gnulib-lib_localename-unsafe.c
            patch-gettext-runtime_intl_gnulib-lib_localename-unsafe.c
            patch-gettext-tools_gnulib-lib_localename-unsafe.c

Log Message:
gettext: updated to 1.0

Version 1.0 - January 2026

Improvements for maintainers and distributors:
* In a po/ directory, the PO files are now exactly those that the
  translators submitted or committed in version control, or a
  translation project's daemon committed on behalf of the translators.
  They are no longer regularly updated with respect to the POT file
  in the same directory.

  The advantage for maintainers is that the maintainer may commit the
  PO files in version control, without getting
    - lots of modified files shown by "git status",
    - frequent merge conflicts when merging between branches,
    - a voluminous version control history.

  The advantage for distributors is that the role of files in a
  release tarball are clearer: The PO files are source code, whereas
  the POT file and the *.gmo files are generated files.

  ATTENTION translators!
  Translators who work directly on a package's source code (without
  going through a translation project) now need to run "msginit"
  before starting work on a PO file.

* A new program 'po-fetch' is provided, that fetches the translated
  PO files from a translation project's site on the internet, and
  updates the LINGUAS file accordingly.

* In a po/ directory, a new script 'fetch-po' is now added by 'gettextize'.
  It provides the standard interface for fetching the translated PO files.
  It typically either invokes the 'po-fetch' program or does nothing.

Improvements for translators:
* msginit:
  - When the PO file already exists, 'msginit' now updates it w.r.t. the
    POT file, like 'msgmerge' would do. Previously, 'msginit' failed with
    an error message in this situation.

* Pretranslation:
  - Two new programs, 'msgpre' and 'spit', are provided, that implement
    machine translation through a locally installed Large Language Model
    (LLM).  'msgpre' applies to an entire PO file, 'spit' to a single
    message.
  - The documentation has a new chapter "Pretranslation".

Improvements for maintainers:
* xgettext:
  - The refactoring suggestion when a translatable string contains an URL
    or email address can now be inhibited through a command-line option
    '--no-check=url' or '--no-check=email', or through a comment in the
    source code of the form
        /* xgettext: no-url-check */
    or
        /* xgettext: no-email-check */

Programming languages support:
* OCaml:
  - xgettext now supports OCaml.
  - 'msgfmt -c' now verifies the syntax of translations of OCaml format
    strings.
  - A new example 'hello-ocaml' has been added.
* Rust:
  - xgettext now recognizes 'gettextrs::gettext' invocations, like 'gettext'
    invocations.

libgettextpo library:
* The function 'po_message_get_format' now supports distinguishing whether
  a negative format string mark, such as 'no-c-format', is set or not.
* The new functions
    po_message_has_workflow_flag
    po_message_set_workflow_flag
    po_message_workflow_flags_iterator, po_flag_next, po_flag_iterator_free
  can be used to manipulate or inspect the workflow flags of a message.
* The new functions
    po_message_has_sticky_flag
    po_message_set_sticky_flag
    po_message_sticky_flags_iterator, po_flag_next, po_flag_iterator_free
  can be used to manipulate or inspect the sticky flags of a messsage.

Emacs PO mode:
Restore syntax highlighting in Emacs version 30 or newer.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/devel/gettext/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/gettext/Makefile.common
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/gettext/distinfo
cvs rdiff -u -r1.61 -r1.62 pkgsrc/devel/gettext-lib/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/gettext-lib/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/gettext-lib/distinfo
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/gettext-m4/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/gettext-m4/PLIST
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/gettext-tools/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/gettext-tools/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gettext/patches/patch-Makefile.in \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_Makefile.in \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_Makefile.in \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_configure \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile.in \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_po_Makefile.in.in
cvs rdiff -u -r1.15 -r0 pkgsrc/devel/gettext/patches/patch-aa
cvs rdiff -u -r1.8 -r0 pkgsrc/devel/gettext/patches/patch-ad \
    pkgsrc/devel/gettext/patches/patch-ae
cvs rdiff -u -r1.14 -r0 pkgsrc/devel/gettext/patches/patch-ag
cvs rdiff -u -r1.7 -r0 pkgsrc/devel/gettext/patches/patch-aj
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/gettext/patches/patch-al
cvs rdiff -u -r1.6 -r0 pkgsrc/devel/gettext/patches/patch-an
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_gnulib-lib_localename-unsafe.c \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_intl_gnulib-lib_localename-unsafe.c \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_gnulib-lib_localename-unsafe.c

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
diff -u pkgsrc/devel/gettext/Makefile:1.88 pkgsrc/devel/gettext/Makefile:1.89
--- pkgsrc/devel/gettext/Makefile:1.88  Wed Jul  2 11:00:57 2025
+++ pkgsrc/devel/gettext/Makefile       Tue Jul 21 12:55:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2025/07/02 11:00:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.89 2026/07/21 12:55:53 adam Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -6,7 +6,6 @@ COMMENT=        Tools for providing messages in
 
 DEPENDS+=      gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4
 DEPENDS+=      gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools
-BUILDLINK_API_DEPENDS.gettext+=        gettext-lib>=0.18
 
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
@@ -26,7 +25,7 @@ BROKEN_GETTEXT_DETECTION=     yes
 USE_BUILTIN.gettext=           no # force use of pkgsrc gettext-lib
 
 do-install:
-       cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR}
+       cd ${WRKSRC}/gettext-tools && ${MAKE} install-pkgdataSCRIPTS DESTDIR=${DESTDIR}
        cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR}
        cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR}
 

Index: pkgsrc/devel/gettext/Makefile.common
diff -u pkgsrc/devel/gettext/Makefile.common:1.28 pkgsrc/devel/gettext/Makefile.common:1.29
--- pkgsrc/devel/gettext/Makefile.common:1.28   Wed Jul  2 11:00:57 2025
+++ pkgsrc/devel/gettext/Makefile.common        Tue Jul 21 12:55:53 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2025/07/02 11:00:57 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.29 2026/07/21 12:55:53 adam 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.22.5
+DISTNAME=      gettext-1.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=gettext/}
 
@@ -19,6 +19,8 @@ CONFLICTS=    gettext<=0.10.35
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_STRICT=  no # several sub-configures
+# Fix for faulty detection of iconv.
+CONFIGURE_ENV.Darwin=  am_cv_func_iconv_works=yes
 
 TEST_TARGET=   check
 

Index: pkgsrc/devel/gettext/distinfo
diff -u pkgsrc/devel/gettext/distinfo:1.50 pkgsrc/devel/gettext/distinfo:1.51
--- pkgsrc/devel/gettext/distinfo:1.50  Thu Apr  9 08:50:03 2026
+++ pkgsrc/devel/gettext/distinfo       Tue Jul 21 12:55:53 2026
@@ -1,17 +1,14 @@
-$NetBSD: distinfo,v 1.50 2026/04/09 08:50:03 jperkin Exp $
+$NetBSD: distinfo,v 1.51 2026/07/21 12:55:53 adam Exp $
 
-BLAKE2s (gettext-0.22.5.tar.gz) = f56914dd8748aa7601d8d4262294a45a0f1851f29b70fd13104ef95f750f1e26
-SHA512 (gettext-0.22.5.tar.gz) = d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
-Size (gettext-0.22.5.tar.gz) = 26861674 bytes
-SHA1 (patch-aa) = 83e1314a01623b9ac68e4787983d42964be67869
-SHA1 (patch-ad) = 030dc7d1b02ac01898cf456f79115c395cd36bcd
-SHA1 (patch-ae) = 3e83e3cdebd1205b515a58cb838a5eb3fb2fe389
-SHA1 (patch-ag) = 1e2ae3e92fa4b530649ec938cffee6743219ce1c
-SHA1 (patch-aj) = bf45d1093d8156615670bd6c781796b62ad79b92
-SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
-SHA1 (patch-an) = 2284bfe8a44873776970af7fc70a419fa2a10054
-SHA1 (patch-gettext-runtime_gnulib-lib_localename-unsafe.c) = 09187959e2ec6d06ff0280079b08fc6a4a051195
-SHA1 (patch-gettext-runtime_intl_gnulib-lib_localename-unsafe.c) = 44201509ff850f8e3391d5c27ee1155b61d34a65
+BLAKE2s (gettext-1.0.tar.gz) = 9277ec2cb3676b657eb719c952d0b2481dd0991aa3253eac350db9c2d2575cb5
+SHA512 (gettext-1.0.tar.gz) = 664c3b1985cb7d1e7ed443e036a6c7f8c1f47354720d13c2db2c2cf8a85136d0ffc2cc920dce1240d688f706653f647749ce29f69eb0bb659e043b499f9c47eb
+Size (gettext-1.0.tar.gz) = 32694085 bytes
+SHA1 (patch-Makefile.in) = 19682afa60efca5afc1cf3abcf2d721885a8b27c
+SHA1 (patch-gettext-runtime_Makefile.in) = 5ce6a74d4c594280699bc51a5b0a491dd3620bcd
+SHA1 (patch-gettext-runtime_configure) = c1f0718f1c16a99fc2e747d8c8d48ec145eaeaee
 SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
-SHA1 (patch-gettext-tools_gnulib-lib_localename-unsafe.c) = f7e3ea175399aaf32595e16e656ac61f40859f90
+SHA1 (patch-gettext-tools_Makefile.in) = f93519ba8e17d905bbc5abac25caf3d756805230
+SHA1 (patch-gettext-tools_configure) = 0ff7557c41db2adee0cba7fa82a7d192efe86a7e
+SHA1 (patch-gettext-tools_gnulib-lib_Makefile.in) = 1e2ae3e92fa4b530649ec938cffee6743219ce1c
+SHA1 (patch-gettext-tools_po_Makefile.in.in) = a425dd4b5e9705438d01f4ebb92e4c74f0ec1579
 SHA1 (patch-gettext-tools_tests_Makefile.in) = af9c9ecbecfafc1c34d0bd3347d3d399122aaa80

Index: pkgsrc/devel/gettext-lib/Makefile
diff -u pkgsrc/devel/gettext-lib/Makefile:1.61 pkgsrc/devel/gettext-lib/Makefile:1.62
--- pkgsrc/devel/gettext-lib/Makefile:1.61      Tue Nov  7 10:51:11 2023
+++ pkgsrc/devel/gettext-lib/Makefile   Tue Jul 21 12:55:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2023/11/07 10:51:11 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2026/07/21 12:55:54 adam Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -19,13 +19,7 @@ CFLAGS.gnu-iconv+=   -DHAVE_GNU_ICONV
 INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} localedir=${EGDIR}
 INSTALL_MAKE_FLAGS+=   includedir=${PREFIX}/include/gettext
 
-#CONFIGURE_DIRS=       gettext-runtime
 BUILD_DIRS=            gettext-runtime/intl
-EGDIR=                 ${PREFIX}/share/examples/gettext
-LOCALEDIR=             ${PREFIX}/${PKGLOCALEDIR}/locale
-
-REQD_DIRS+=            ${LOCALEDIR}
-REQD_FILES+=           ${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gettext-lib/PLIST
diff -u pkgsrc/devel/gettext-lib/PLIST:1.6 pkgsrc/devel/gettext-lib/PLIST:1.7
--- pkgsrc/devel/gettext-lib/PLIST:1.6  Wed Aug 29 09:01:01 2012
+++ pkgsrc/devel/gettext-lib/PLIST      Tue Jul 21 12:55:54 2026
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.6 2012/08/29 09:01:01 sbd Exp $
+@comment $NetBSD: PLIST,v 1.7 2026/07/21 12:55:54 adam Exp $
 include/gettext/libintl.h
 lib/libintl.la
-share/examples/gettext/locale.alias

Index: pkgsrc/devel/gettext-lib/distinfo
diff -u pkgsrc/devel/gettext-lib/distinfo:1.46 pkgsrc/devel/gettext-lib/distinfo:1.47
--- pkgsrc/devel/gettext-lib/distinfo:1.46      Thu Apr  9 08:48:44 2026
+++ pkgsrc/devel/gettext-lib/distinfo   Tue Jul 21 12:55:54 2026
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.46 2026/04/09 08:48:44 jperkin Exp $
+$NetBSD: distinfo,v 1.47 2026/07/21 12:55:54 adam Exp $
 
-BLAKE2s (gettext-0.22.5.tar.gz) = f56914dd8748aa7601d8d4262294a45a0f1851f29b70fd13104ef95f750f1e26
-SHA512 (gettext-0.22.5.tar.gz) = d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
-Size (gettext-0.22.5.tar.gz) = 26861674 bytes
-SHA1 (patch-gettext-runtime_intl_configure) = 6b873572ad946e069f2a999c5795c9618688d7a1
-SHA1 (patch-gettext-runtime_intl_gnulib-lib_localename-unsafe.c) = f6d4a936e46bed40d3f69b67f50a7eb7675dd803
-SHA1 (patch-gettext-runtime_intl_intl-compat.c) = aea23c1e93711514db567f7db51e9e72ab2266f8
+BLAKE2s (gettext-1.0.tar.gz) = 9277ec2cb3676b657eb719c952d0b2481dd0991aa3253eac350db9c2d2575cb5
+SHA512 (gettext-1.0.tar.gz) = 664c3b1985cb7d1e7ed443e036a6c7f8c1f47354720d13c2db2c2cf8a85136d0ffc2cc920dce1240d688f706653f647749ce29f69eb0bb659e043b499f9c47eb
+Size (gettext-1.0.tar.gz) = 32694085 bytes

Index: pkgsrc/devel/gettext-m4/Makefile
diff -u pkgsrc/devel/gettext-m4/Makefile:1.27 pkgsrc/devel/gettext-m4/Makefile:1.28
--- pkgsrc/devel/gettext-m4/Makefile:1.27       Mon Apr 20 08:37:14 2020
+++ pkgsrc/devel/gettext-m4/Makefile    Tue Jul 21 12:55:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/04/20 08:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/07/21 12:55:54 adam Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -24,7 +24,6 @@ GNULIB_M4_FILES=              \
        lib-prefix.m4           \
        lock.m4                 \
        threadlib.m4            \
-       wchar_t.m4              \
        wint_t.m4
 
 do-install:

Index: pkgsrc/devel/gettext-m4/PLIST
diff -u pkgsrc/devel/gettext-m4/PLIST:1.14 pkgsrc/devel/gettext-m4/PLIST:1.15
--- pkgsrc/devel/gettext-m4/PLIST:1.14  Wed Jun 28 21:14:11 2023
+++ pkgsrc/devel/gettext-m4/PLIST       Tue Jul 21 12:55:54 2026
@@ -1,20 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2023/06/28 21:14:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2026/07/21 12:55:54 adam Exp $
 share/aclocal/build-to-host.m4
 share/aclocal/codeset.m4
 share/aclocal/exported.m4
 share/aclocal/extern-inline.m4
-share/aclocal/fcntl-o.m4
-share/aclocal/flexmember.m4
 share/aclocal/gettext.m4
 share/aclocal/glibc2.m4
 share/aclocal/host-cpu-c-abi.m4
 share/aclocal/hostname.m4
-share/aclocal/iconv.m4
-share/aclocal/intdiv0.m4
-share/aclocal/intl.m4
-share/aclocal/intlmacosx.m4
-share/aclocal/intmax.m4
-share/aclocal/inttypes_h.m4
 share/aclocal/lcmessage.m4
 share/aclocal/lib-ld.m4
 share/aclocal/lib-link.m4
@@ -23,14 +15,6 @@ share/aclocal/locale-de.m4
 share/aclocal/lock.m4
 share/aclocal/nls.m4
 share/aclocal/po.m4
-share/aclocal/printf-posix.m4
 share/aclocal/progtest.m4
-share/aclocal/siginfo.m4
-share/aclocal/size_max.m4
-share/aclocal/stdint_h.m4
 share/aclocal/threadlib.m4
-share/aclocal/uintmax_t.m4
-share/aclocal/visibility.m4
-share/aclocal/wchar_t.m4
 share/aclocal/wint_t.m4
-share/aclocal/xsize.m4

Index: pkgsrc/devel/gettext-tools/Makefile
diff -u pkgsrc/devel/gettext-tools/Makefile:1.48 pkgsrc/devel/gettext-tools/Makefile:1.49
--- pkgsrc/devel/gettext-tools/Makefile:1.48    Wed Jul  2 11:01:31 2025
+++ pkgsrc/devel/gettext-tools/Makefile Tue Jul 21 12:55:54 2026
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2025/07/02 11:01:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2026/07/21 12:55:54 adam Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-tools-/}
-PKGREVISION=   1
 COMMENT=       Tools for providing messages in different languages
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo
@@ -14,17 +13,16 @@ USE_TOOLS+=         xz:run
 USE_PKGLOCALEDIR=      yes
 CONFIGURE_ARGS+=       --disable-csharp
 CONFIGURE_ARGS+=       --disable-java
+CONFIGURE_ARGS+=       --disable-openmp
 CONFIGURE_ARGS+=       --with-included-libcroco
-CONFIGURE_ARGS+=       --without-git
 CONFIGURE_ARGS+=       --with-xz
-CONFIGURE_ARGS+=       --without-included-gettext
+CONFIGURE_ARGS+=       --without-git
 CONFIGURE_ARGS+=       --without-emacs
-CONFIGURE_ARGS+=       --disable-openmp
+CONFIGURE_ARGS+=       --without-included-gettext
 CONFIGURE_ENV+=                GCJ= ac_cv_prog_GCJ= ac_cv_prog_JAR=
 CONFIGURE_ENV+=                HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=                HAVE_JAVAC_IN_PATH=
 CONFIGURE_ENV+=                HAVE_JIKES_IN_PATH=
-GNU_CONFIGURE_STRICT=  no # because of gettext-runtime
 LDFLAGS.AIX+=          -Wl,-brtl
 
 # This is defined in the source but broken include ordering means it is not
@@ -61,6 +59,8 @@ PLIST_VARS+=  glibc
 PLIST.glibc=   yes
 .endif
 
+REPLACE_PYTHON=        gettext-tools/src/spit.py.in
+
 post-install:
        cd ${WRKSRC}/gettext-tools/its && ${MAKE} install DESTDIR=${DESTDIR}
        cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install DESTDIR=${DESTDIR}
@@ -70,5 +70,6 @@ post-install:
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gettext-tools/PLIST
diff -u pkgsrc/devel/gettext-tools/PLIST:1.17 pkgsrc/devel/gettext-tools/PLIST:1.18
--- pkgsrc/devel/gettext-tools/PLIST:1.17       Sun Feb 25 15:42:06 2024
+++ pkgsrc/devel/gettext-tools/PLIST    Tue Jul 21 12:55:54 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2024/02/25 15:42:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2026/07/21 12:55:54 adam Exp $
 bin/autopoint
 bin/envsubst
 bin/gettext
@@ -16,27 +16,31 @@ bin/msgfmt
 bin/msggrep
 bin/msginit
 bin/msgmerge
+bin/msgpre
 bin/msgunfmt
 bin/msguniq
 bin/ngettext
+bin/po-fetch
+bin/printf_gettext
+bin/printf_ngettext
 bin/recode-sr-latin
+bin/spit
 bin/xgettext
 include/gettext-po.h
 include/textstyle.h
-include/textstyle/stdbool.h
 include/textstyle/version.h
 include/textstyle/woe32dll.h
 info/gettext.info
 info/libtextstyle.info
-lib/gettext/cldr-plurals
-lib/gettext/hostname
-lib/gettext/project-id
-lib/gettext/urlget
-lib/gettext/user-email
 lib/libgettextlib.la
 lib/libgettextpo.la
 lib/libgettextsrc.la
 lib/libtextstyle.la
+libexec/gettext/cldr-plurals
+libexec/gettext/hostname
+libexec/gettext/project-id
+libexec/gettext/urlget
+libexec/gettext/user-email
 man/man1/autopoint.1
 man/man1/envsubst.1
 man/man1/gettext.1
@@ -53,10 +57,15 @@ man/man1/msgfmt.1
 man/man1/msggrep.1
 man/man1/msginit.1
 man/man1/msgmerge.1
+man/man1/msgpre.1
 man/man1/msgunfmt.1
 man/man1/msguniq.1
 man/man1/ngettext.1
+man/man1/po-fetch.1
+man/man1/printf_gettext.1
+man/man1/printf_ngettext.1
 man/man1/recode-sr-latin.1
+man/man1/spit.1
 man/man1/xgettext.1
 man/man3/bind_textdomain_codeset.3
 man/man3/bindtextdomain.3
@@ -98,6 +107,8 @@ share/doc/gettext/gettext_28.html
 share/doc/gettext/gettext_29.html
 share/doc/gettext/gettext_3.html
 share/doc/gettext/gettext_30.html
+share/doc/gettext/gettext_31.html
+share/doc/gettext/gettext_32.html
 share/doc/gettext/gettext_4.html
 share/doc/gettext/gettext_5.html
 share/doc/gettext/gettext_6.html
@@ -120,11 +131,16 @@ share/doc/gettext/msgfmt.1.html
 share/doc/gettext/msggrep.1.html
 share/doc/gettext/msginit.1.html
 share/doc/gettext/msgmerge.1.html
+share/doc/gettext/msgpre.1.html
 share/doc/gettext/msgunfmt.1.html
 share/doc/gettext/msguniq.1.html
 share/doc/gettext/ngettext.1.html
 share/doc/gettext/ngettext.3.html
+share/doc/gettext/po-fetch.1.html
+share/doc/gettext/printf_gettext.1.html
+share/doc/gettext/printf_ngettext.1.html
 share/doc/gettext/recode-sr-latin.1.html
+share/doc/gettext/spit.1.html
 share/doc/gettext/textdomain.3.html
 share/doc/gettext/tutorial.html
 share/doc/gettext/xgettext.1.html
@@ -137,6 +153,9 @@ share/doc/libtextstyle/libtextstyle_6.ht
 share/doc/libtextstyle/libtextstyle_7.html
 share/doc/libtextstyle/libtextstyle_abt.html
 share/doc/libtextstyle/libtextstyle_toc.html
+share/gettext-${PKGVERSION}/its/docbook.loc
+share/gettext-${PKGVERSION}/its/docbook4.its
+share/gettext-${PKGVERSION}/its/docbook5.its
 share/gettext-${PKGVERSION}/its/glade.loc
 share/gettext-${PKGVERSION}/its/glade1.its
 share/gettext-${PKGVERSION}/its/glade2.its
@@ -146,7 +165,29 @@ share/gettext-${PKGVERSION}/its/gtkbuild
 share/gettext-${PKGVERSION}/its/metainfo.its
 share/gettext-${PKGVERSION}/its/metainfo.loc
 share/gettext/archive.dir.tar.xz
+share/gettext/disclaim-translations.txt
 share/gettext/msgunfmt.tcl
+share/gettext/po/Makefile.in.in
+share/gettext/po/Makevars.template
+share/gettext/po/Rules-quot
+share/gettext/po/boldquot.sed
+share/gettext/po/en@boldquot.header
+share/gettext/po/en@quot.header
+share/gettext/po/fetch-po
+share/gettext/po/insert-header.sed
+share/gettext/po/quot.sed
+share/gettext/po/remove-potcdate.sed
+share/gettext/schema/its-extensions.xsd
+share/gettext/schema/its.xsd10
+share/gettext/schema/its.xsd11
+share/gettext/schema/locating-rules.xsd10
+share/gettext/schema/locating-rules.xsd11
+share/gettext/styles/po-default.css
+share/gettext/styles/po-emacs-x.css
+share/gettext/styles/po-emacs-xterm.css
+share/gettext/styles/po-emacs-xterm16.css
+share/gettext/styles/po-emacs-xterm256.css
+share/gettext/styles/po-vim.css
 share/locale/ast/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-tools.mo
@@ -162,10 +203,6 @@ share/locale/de/LC_MESSAGES/gettext-runt
 share/locale/de/LC_MESSAGES/gettext-tools.mo
 share/locale/el/LC_MESSAGES/gettext-runtime.mo
 share/locale/el/LC_MESSAGES/gettext-tools.mo
-share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
-share/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
-share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
-share/locale/en@quot/LC_MESSAGES/gettext-tools.mo
 share/locale/eo/LC_MESSAGES/gettext-runtime.mo
 share/locale/es/LC_MESSAGES/gettext-runtime.mo
 share/locale/es/LC_MESSAGES/gettext-tools.mo

Added files:

Index: pkgsrc/devel/gettext/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-Makefile.in:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-Makefile.in      Tue Jul 21 12:55:53 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.in,v 1.1 2026/07/21 12:55:53 adam Exp $
+
+--- Makefile.in.orig   2026-01-28 23:39:52.000000000 +0000
++++ Makefile.in
+@@ -323,7 +323,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu
+ ACLOCAL_AMFLAGS = -I m4
+-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 \
Index: pkgsrc/devel/gettext/patches/patch-gettext-runtime_Makefile.in
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-runtime_Makefile.in:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-runtime_Makefile.in      Tue Jul 21 12:55:53 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-gettext-runtime_Makefile.in,v 1.1 2026/07/21 12:55:53 adam Exp $
+
+--- gettext-runtime/Makefile.in.orig   2026-01-28 23:39:31.000000000 +0000
++++ gettext-runtime/Makefile.in
+@@ -2362,7 +2362,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnul
+ # The list of subdirectories depends on whether --disable-libasprintf was
+ # specified.
+ @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf
+-SUBDIRS = doc intl intl-java intl-csharp intl-d intl-modula2 gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests install-tests
++SUBDIRS = doc intl gnulib-lib src po man m4 tests install-tests
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
+@@ -2833,7 +2833,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-gettextsrcDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
Index: pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure        Tue Jul 21 12:55:53 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-gettext-runtime_configure,v 1.1 2026/07/21 12:55:53 adam Exp $
+
+--- gettext-runtime/configure.orig     2026-01-28 23:39:29.000000000 +0000
++++ gettext-runtime/configure
+@@ -26035,13 +26035,6 @@ printf "%s\n" "$ac_res" >&6; }
+       fi
+ 
+ 
+-      if test "$gt_cv_use_gnu_libintl" = "yes" \
+-         || case "$host_os" in cygwin*) true;; *) false;; esac; then
+-                                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/ $//'`
+-      fi
+ 
+       CATOBJEXT=
+       if test "$gt_use_preinstalled_gnugettext" = "yes" \
Index: pkgsrc/devel/gettext/patches/patch-gettext-tools_Makefile.in
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-tools_Makefile.in:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_Makefile.in        Tue Jul 21 12:55:53 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-gettext-tools_Makefile.in,v 1.1 2026/07/21 12:55:53 adam Exp $
+
+Don't install stuff handled by devel/gettext, and skip examples.
+
+--- gettext-tools/Makefile.in.orig     2026-01-28 23:39:43.000000000 +0000
++++ gettext-tools/Makefile.in
+@@ -4014,7 +4014,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -I tests/gnulib-m4
+-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles wizard autotools misc emacs man m4 tests system-tests gnulib-tests install-tests examples doc
++SUBDIRS = gnulib-lib libgrep src libgettextpo po its styles wizard autotools misc emacs man tests system-tests gnulib-tests install-tests doc
+ 
+ # Files imported from tree-sitter.
+ 
+@@ -4631,7 +4631,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-examplesbuildauxDATA install-pkgdataSCRIPTS
++install-data-am:
+ 
+ install-dvi: install-dvi-recursive
+ 
Index: pkgsrc/devel/gettext/patches/patch-gettext-tools_configure
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_configure  Tue Jul 21 12:55:54 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-gettext-tools_configure,v 1.1 2026/07/21 12:55:54 adam Exp $
+
+--- gettext-tools/configure.orig       2026-01-28 23:37:49.000000000 +0000
++++ gettext-tools/configure
+@@ -29958,13 +29958,6 @@ printf "%s\n" "$ac_res" >&6; }
+       fi
+ 
+ 
+-      if test "$gt_cv_use_gnu_libintl" = "yes" \
+-         || case "$host_os" in cygwin*) true;; *) false;; esac; then
+-                                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
+ 
+       CATOBJEXT=
+       if test "$gt_use_preinstalled_gnugettext" = "yes" \
Index: pkgsrc/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile.in
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile.in:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_gnulib-lib_Makefile.in     Tue Jul 21 12:55:54 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-gettext-tools_gnulib-lib_Makefile.in,v 1.1 2026/07/21 12:55:54 adam Exp $
+
+--- gettext-tools/gnulib-lib/Makefile.in.orig  2023-11-19 20:23:04.000000000 +0000
++++ gettext-tools/gnulib-lib/Makefile.in
+@@ -6571,7 +6571,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-pkgdataDATA
++install-data-am:
+ 
+ install-dvi: install-dvi-am
+ 
Index: pkgsrc/devel/gettext/patches/patch-gettext-tools_po_Makefile.in.in
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-tools_po_Makefile.in.in:1.1
--- /dev/null   Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_po_Makefile.in.in  Tue Jul 21 12:55:54 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-gettext-tools_po_Makefile.in.in,v 1.1 2026/07/21 12:55:54 adam Exp $
+
+--- gettext-tools/po/Makefile.in.in.orig       2026-01-28 23:36:19.000000000 +0000
++++ gettext-tools/po/Makefile.in.in
+@@ -366,7 +366,7 @@ $(POFILES):
+       fi
+ 
+ 
+-install: install-exec install-data
++install: install-exec install-data-@USE_NLS@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ install-data-no: all

Follow-Ups:
- Re: CVS commit: pkgsrc/devel
  - From: Tobias Nygren

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

Home | Main Index | Thread Index | Old Index