CVS commit: pkgsrc/devel/gettext

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Aug 19 16:24:05 UTC 2026

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

Log Message:
gettext-tools: do not autodetect libcurl and libjson-c

Fixes build on OpenIndiana. The libraries are shipped
with base but at least some of the headers seem absent.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/gettext/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/gettext/patches/patch-gettext-tools_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.52 pkgsrc/devel/gettext/distinfo:1.53
--- pkgsrc/devel/gettext/distinfo:1.52  Tue Jul 28 16:21:26 2026
+++ pkgsrc/devel/gettext/distinfo       Wed Aug 19 16:24:05 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2026/07/28 16:21:26 jperkin Exp $
+$NetBSD: distinfo,v 1.53 2026/08/19 16:24:05 tnn Exp $
 
 BLAKE2s (gettext-1.0.tar.gz) = 9277ec2cb3676b657eb719c952d0b2481dd0991aa3253eac350db9c2d2575cb5
 SHA512 (gettext-1.0.tar.gz) = 664c3b1985cb7d1e7ed443e036a6c7f8c1f47354720d13c2db2c2cf8a85136d0ffc2cc920dce1240d688f706653f647749ce29f69eb0bb659e043b499f9c47eb
@@ -9,7 +9,7 @@ SHA1 (patch-gettext-runtime_configure) =
 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) = dea3e01e3b8cd01c56fa0397afab937bc00640cf
+SHA1 (patch-gettext-tools_configure) = 64a1e6cabd7d244c5dc6a33008f26bf61beaa245
 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-tools_configure
diff -u pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.2 pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.3
--- pkgsrc/devel/gettext/patches/patch-gettext-tools_configure:1.2      Tue Jul 28 16:21:26 2026
+++ pkgsrc/devel/gettext/patches/patch-gettext-tools_configure  Wed Aug 19 16:24:05 2026
@@ -1,6 +1,7 @@
-$NetBSD: patch-gettext-tools_configure,v 1.2 2026/07/28 16:21:26 jperkin Exp $
+$NetBSD: patch-gettext-tools_configure,v 1.3 2026/08/19 16:24:05 tnn Exp $
 
 Do not use bundled libintl.
+Do not autodetect libcurl and libjson.
 
 --- gettext-tools/configure.orig       2026-01-28 23:37:49.000000000 +0000
 +++ gettext-tools/configure
@@ -18,3 +19,48 @@ Do not use bundled libintl.
  
        CATOBJEXT=
        if test "$gt_use_preinstalled_gnugettext" = "yes" \
+@@ -123846,7 +123839,7 @@ printf %s "checking for the libjson-c li
+ LIBJSON_C=?
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <json-c/json_c_version.h>
++#include <_/json-c/json_c_version.h>
+        int version_check[2 * (JSON_C_MAJOR_VERSION + (JSON_C_MINOR_VERSION >= 13) > 0) - 1];
+ 
+ int
+@@ -123871,7 +123864,7 @@ if test "$LIBJSON_C" = "?"; then
+   LIBS="$LIBS -ljson-c"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <json-c/json_c_version.h>
++#include <_/json-c/json_c_version.h>
+ int
+ main (void)
+ {
+@@ -123899,7 +123892,7 @@ if test -n "$LIBJSON_C"; then
+ 
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <json-c/json_c_version.h>
++#include <_/json-c/json_c_version.h>
+ _ACEOF
+                 case "$host_os" in
+     aix*) gl_absname_cpp="$ac_cpp -C" ;;
+@@ -123949,7 +123942,7 @@ INCCURL=
+ LIBCURL=?
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <curl/curlver.h>
++#include <_/curl/curlver.h>
+ int
+ main (void)
+ {
+@@ -123972,7 +123965,7 @@ if test "$LIBCURL" = "?"; then
+   LIBS="$LIBS -lcurl"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <curl/curl.h>
++#include <_/curl/curl.h>
+ int
+ main (void)
+ {