CVS commit: pkgsrc/editors/ted

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 18 14:56:55 UTC 2026

Modified Files:
        pkgsrc/editors/ted: distinfo
        pkgsrc/editors/ted/patches: patch-textEncoding_textConverter.c

Log Message:
ted: Handle the case where GNU libiconv gets pulled in.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/editors/ted/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/editors/ted/patches/patch-textEncoding_textConverter.c

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

Modified files:

Index: pkgsrc/editors/ted/distinfo
diff -u pkgsrc/editors/ted/distinfo:1.22 pkgsrc/editors/ted/distinfo:1.23
--- pkgsrc/editors/ted/distinfo:1.22    Thu Dec 18 09:14:40 2025
+++ pkgsrc/editors/ted/distinfo Thu Jun 18 14:56:55 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2025/12/18 09:14:40 nia Exp $
+$NetBSD: distinfo,v 1.23 2026/06/18 14:56:55 nia Exp $
 
 BLAKE2s (ted-2.23.src.tar.gz) = 5f32fde6f8ea58a0bf505784e5bb998341db78241ed7f0c13e53589170e950c2
 SHA512 (ted-2.23.src.tar.gz) = c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
 Size (ted-2.23.src.tar.gz) = 4672208 bytes
 SHA1 (patch-Ted_configure) = e307c07ba3cfa30879a974bf93e153c0b37e28c5
 SHA1 (patch-bitmap_configure) = 36dcc05b25828f02168edf1800cf0f2860103039
-SHA1 (patch-textEncoding_textConverter.c) = 2d811c60aedab837b84c86f425a183af6d577c47
+SHA1 (patch-textEncoding_textConverter.c) = 9723870fe7e5924e250905747a0ba8ba77464aae

Index: pkgsrc/editors/ted/patches/patch-textEncoding_textConverter.c
diff -u pkgsrc/editors/ted/patches/patch-textEncoding_textConverter.c:1.1 pkgsrc/editors/ted/patches/patch-textEncoding_textConverter.c:1.2
--- pkgsrc/editors/ted/patches/patch-textEncoding_textConverter.c:1.1   Thu Dec 18 09:14:40 2025
+++ pkgsrc/editors/ted/patches/patch-textEncoding_textConverter.c       Thu Jun 18 14:56:55 2026
@@ -1,10 +1,13 @@
-$NetBSD: patch-textEncoding_textConverter.c,v 1.1 2025/12/18 09:14:40 nia Exp $
+$NetBSD: patch-textEncoding_textConverter.c,v 1.2 2026/06/18 14:56:55 nia Exp $
 
 Support non-POSIX iconv in SunOS and old NetBSD.
 
---- textEncoding/textConverter.c.orig  2025-12-18 08:30:05.458713346 +0000
+Making sure to carefully handle the case of an external iconv being
+pulled in from GNU libiconv.
+
+--- textEncoding/textConverter.c.orig  2013-02-01 12:11:08.000000000 +0000
 +++ textEncoding/textConverter.c
-@@ -20,6 +20,15 @@
+@@ -20,6 +20,13 @@
  #   include   "uniLegacyEncoding.h"
  #   include   "uniLegacyMapping.h"
  
@@ -12,19 +15,17 @@ Support non-POSIX iconv in SunOS and old
 +#include <sys/param.h>
 +#if __NetBSD_Prereq__(9,99,17)
 +#define NETBSD_POSIX_ICONV 1
-+#else
-+#define NETBSD_POSIX_ICONV 0
 +#endif
 +#endif
 +
  void textConverterSetNativeEncodingName(      TextConverter * tc,
                                                const char *    encodingName )
      {
-@@ -265,7 +274,11 @@ static int textConverterConvertIconv(     TextConverter * 
+@@ -265,7 +272,11 @@ static int textConverterConvertIconv(     TextConverter * 
            /*  return value is irrelevant: Just tells that the */
            /*  conversion was incomplete. So does ileft > 0.   */
  
-+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++#if (defined(__NetBSD__) || defined(__sun)) && !defined(NETBSD_POSIX_ICONV) && !defined(_LIBICONV_VERSION)
 +          (void)iconv( ico, (const char **)&ibuf, &ileft, &obuf, &oleft );
 +#else
            (void)iconv( ico, &ibuf, &ileft, &obuf, &oleft );