CVS commit: pkgsrc/devel/gettext

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jul 28 16:21:27 UTC 2026

Modified Files:
        pkgsrc/devel/gettext: distinfo
        pkgsrc/devel/gettext/patches: patch-gettext-runtime_configure
            patch-gettext-tools_configure
Added Files:
        pkgsrc/devel/gettext/patches: patch-gettext-runtime_intl_configure

Log Message:
gettext: Add missing USE_INCLUDED_LIBINTL patch.

Fixes build of gettext-tools.  While here try to reduce some pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/gettext/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_intl_configure

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/distinfo
diff -u pkgsrc/devel/gettext/distinfo:1.51 pkgsrc/devel/gettext/distinfo:1.52
--- pkgsrc/devel/gettext/distinfo:1.51  Tue Jul 21 12:55:53 2026
+++ pkgsrc/devel/gettext/distinfo       Tue Jul 28 16:21:26 2026
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.51 2026/07/21 12:55:53 adam Exp $
+$NetBSD: distinfo,v 1.52 2026/07/28 16:21:26 jperkin Exp $
 
 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_configure) = d8a8899768f1f2aa73a578e60766c2d7d748358c
+SHA1 (patch-gettext-runtime_intl_configure) = 6bbc0bcc3cadd0bc98eefc8c5fd77abc5dae7473
 SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
 SHA1 (patch-gettext-tools_Makefile.in) = f93519ba8e17d905bbc5abac25caf3d756805230
-SHA1 (patch-gettext-tools_configure) = 0ff7557c41db2adee0cba7fa82a7d192efe86a7e
+SHA1 (patch-gettext-tools_configure) = dea3e01e3b8cd01c56fa0397afab937bc00640cf
 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/patches/patch-gettext-runtime_configure
diff -u pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure:1.1 pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure:1.2
--- pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure:1.1    Tue Jul 21 12:55:53 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-runtime_configure        Tue Jul 28 16:21:26 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-gettext-runtime_configure,v 1.1 2026/07/21 12:55:53 adam Exp $
+$NetBSD: patch-gettext-runtime_configure,v 1.2 2026/07/28 16:21:26 jperkin Exp $
+
+Do not use bundled libintl.
 
 --- gettext-runtime/configure.orig     2026-01-28 23:39:29.000000000 +0000
 +++ gettext-runtime/configure
Index: pkgsrc/devel/gettext/patches/patch-gettext-tools_configure
diff -u pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.1 pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.2
--- pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.1      Tue Jul 21 12:55:54 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_configure  Tue Jul 28 16:21:26 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-gettext-tools_configure,v 1.1 2026/07/21 12:55:54 adam Exp $
+$NetBSD: patch-gettext-tools_configure,v 1.2 2026/07/28 16:21:26 jperkin Exp $
+
+Do not use bundled libintl.
 
 --- gettext-tools/configure.orig       2026-01-28 23:37:49.000000000 +0000
 +++ gettext-tools/configure

Added files:

Index: pkgsrc/devel/gettext/patches/patch-gettext-runtime_intl_configure
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-runtime_intl_configure:1.1
--- /dev/null   Tue Jul 28 16:21:27 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-runtime_intl_configure   Tue Jul 28 16:21:26 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-gettext-runtime_intl_configure,v 1.1 2026/07/28 16:21:26 jperkin Exp $
+
+Do not use bundled libintl.
+
+--- gettext-runtime/intl/configure.orig        2026-07-28 15:53:45.712657369 +0000
++++ gettext-runtime/intl/configure
+@@ -20138,13 +20138,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" \