CVS commit: pkgsrc/editors/dte

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Mar 17 15:39:51 UTC 2026

Modified Files:
        pkgsrc/editors/dte: Makefile distinfo
Added Files:
        pkgsrc/editors/dte/patches: patch-src_convert.c

Log Message:
dte: Fix iconv usage.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/dte/Makefile \
    pkgsrc/editors/dte/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/dte/patches/patch-src_convert.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/dte/Makefile
diff -u pkgsrc/editors/dte/Makefile:1.6 pkgsrc/editors/dte/Makefile:1.7
--- pkgsrc/editors/dte/Makefile:1.6     Fri Jan  5 14:41:20 2024
+++ pkgsrc/editors/dte/Makefile Tue Mar 17 15:39:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/01/05 14:41:20 bacon Exp $
+# $NetBSD: Makefile,v 1.7 2026/03/17 15:39:51 nia Exp $
 
 DISTNAME=      dte-1.11.1
 CATEGORIES=    editors
@@ -18,4 +18,6 @@ MAKE_FLAGS+=  LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=   prefix=${PREFIX}
 MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
 
+LDFLAGS.SunOS+=        -liconv
+
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/dte/distinfo
diff -u pkgsrc/editors/dte/distinfo:1.6 pkgsrc/editors/dte/distinfo:1.7
--- pkgsrc/editors/dte/distinfo:1.6     Fri Jan  5 14:41:20 2024
+++ pkgsrc/editors/dte/distinfo Tue Mar 17 15:39:51 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2024/01/05 14:41:20 bacon Exp $
+$NetBSD: distinfo,v 1.7 2026/03/17 15:39:51 nia Exp $
 
 BLAKE2s (dte-1.11.1.tar.gz) = 1930bd74fe54962a8a808bf48a171bc19aabedc624b328fa02a1d777d32e7437
 SHA512 (dte-1.11.1.tar.gz) = bdc2100d1d9db8ed24fd5df37154c681625f1d8af66b3e544450f25fa90341d2ff151504b3718e7b2a69ebc28dac41a1841d1024cab9a60c82cc4807b88a4887
 Size (dte-1.11.1.tar.gz) = 415294 bytes
 SHA1 (patch-GNUmakefile) = f8de9c3a3d84d89c996f72bad933a72ca2ad734a
 SHA1 (patch-src_buffer.c) = 0118730fde1e72a7f86cbcebc20f3061eda478a2
+SHA1 (patch-src_convert.c) = afa6e5969701b31462fb96a0ac505e4cdbbea028

Added files:

Index: pkgsrc/editors/dte/patches/patch-src_convert.c
diff -u /dev/null pkgsrc/editors/dte/patches/patch-src_convert.c:1.1
--- /dev/null   Tue Mar 17 15:39:52 2026
+++ pkgsrc/editors/dte/patches/patch-src_convert.c      Tue Mar 17 15:39:51 2026
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_convert.c,v 1.1 2026/03/17 15:39:51 nia Exp $
+
+Handle NetBSD and SunOS iconv variations.
+
+--- src/convert.c.orig 2026-03-17 15:25:37.047494095 +0000
++++ src/convert.c
+@@ -11,6 +11,15 @@
+ #include "util/xmalloc.h"
+ #include "util/xreadwrite.h"
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif
++#endif
++
+ struct FileEncoder {
+     struct cconv *cconv;
+     unsigned char *nbuf;
+@@ -193,7 +202,7 @@ static size_t iconv_wrapper (
+ ) {
+     // POSIX defines the second parameter of iconv(3) as "char **restrict"
+     // but NetBSD declares it as "const char **restrict"
+-#ifdef __NetBSD__
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
+     const char **restrict in = inbuf;
+ #else
+     char **restrict in = (char **restrict)inbuf;