CVS commit: pkgsrc/textproc/gsed

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 11:59:43 UTC 2025

Modified Files:
        pkgsrc/textproc/gsed: Makefile distinfo
Added Files:
        pkgsrc/textproc/gsed/patches: patch-gnulib-tests_pselect.c
            patch-sed_compile.c

Log Message:
textproc/gsed: Fix building on QNX


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/textproc/gsed/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/textproc/gsed/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/gsed/patches/patch-gnulib-tests_pselect.c \
    pkgsrc/textproc/gsed/patches/patch-sed_compile.c

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

Modified files:

Index: pkgsrc/textproc/gsed/Makefile
diff -u pkgsrc/textproc/gsed/Makefile:1.65 pkgsrc/textproc/gsed/Makefile:1.66
--- pkgsrc/textproc/gsed/Makefile:1.65  Wed May  1 22:44:09 2024
+++ pkgsrc/textproc/gsed/Makefile       Sun Oct  5 11:59:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2024/05/01 22:44:09 cheusov Exp $
+# $NetBSD: Makefile,v 1.66 2025/10/05 11:59:43 js Exp $
 
 DISTNAME=      sed-4.9
 PKGNAME=       g${DISTNAME}
@@ -33,12 +33,16 @@ CONFIGURE_ARGS+=    --program-prefix=g
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.if ${OPSYS} == "QNX"
+LIBS+=                 -lgetopt
+.endif
+
 _MAINTAINER_MANPAGE?=  no
 .if !empty(_MAINTAINER_MANPAGE:M[Yy][Ee][Ss])
 MAKE_ENV+=             PKGSRC_MAINTAINER_MANPAGE=yes
 USE_TOOLS+=            perl
 .else
-pre-build: non-maintainer-manpage
+post-configure: non-maintainer-manpage
 .PHONY: non-maintainer-manpage
 non-maintainer-manpage:
        ${RM} -f ${WRKSRC}/doc/sed.1
@@ -52,4 +56,7 @@ post-install:
        ${LN} -sf ${PREFIX}/${g} ${DESTDIR}${PREFIX}/${n}
 .endfor
 
+.if ${OPSYS} == "QNX"
+.include "../../devel/libgetopt/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/gsed/distinfo
diff -u pkgsrc/textproc/gsed/distinfo:1.33 pkgsrc/textproc/gsed/distinfo:1.34
--- pkgsrc/textproc/gsed/distinfo:1.33  Fri May 19 14:12:18 2023
+++ pkgsrc/textproc/gsed/distinfo       Sun Oct  5 11:59:43 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2023/05/19 14:12:18 jperkin Exp $
+$NetBSD: distinfo,v 1.34 2025/10/05 11:59:43 js Exp $
 
 BLAKE2s (gsed-4.9.1) = da49be3990ff24471ce17cacc9174bac9defafc7561e06635988665e94367a76
 SHA512 (gsed-4.9.1) = 3194b79d852c9692e336892acf172be654123c63a6a03b36420c4515758ce4012d2c4aa0aa58b63c12b7eafbb0d17eac89ba1ff1aba4ce052026fab3a5c3de7b
@@ -7,4 +7,6 @@ BLAKE2s (sed-4.9.tar.xz) = 106e94f33309f
 SHA512 (sed-4.9.tar.xz) = 36157a4b4a2430cf421b7bd07f1675d680d9f1616be96cf6ad6ee74a9ec0fe695f8d0b1e1f0b008bbb33cc7fcde5e1c456359bbbc63f8aebdd4fedc3982cf6dc
 Size (sed-4.9.tar.xz) = 1397092 bytes
 SHA1 (patch-Makefile.in) = fb8766d941af00f0f66d903ee7fa4016e987cce2
+SHA1 (patch-gnulib-tests_pselect.c) = d25ce77076386804a01a0085d6619c9896ecf5d3
 SHA1 (patch-gnulib-tests_vma-iter.c) = fc021e079c623a352a2f2c98f94794c7c0ce2197
+SHA1 (patch-sed_compile.c) = 692265f5d3dacda9b54339f168e00546cb36a94d

Added files:

Index: pkgsrc/textproc/gsed/patches/patch-gnulib-tests_pselect.c
diff -u /dev/null pkgsrc/textproc/gsed/patches/patch-gnulib-tests_pselect.c:1.1
--- /dev/null   Sun Oct  5 11:59:43 2025
+++ pkgsrc/textproc/gsed/patches/patch-gnulib-tests_pselect.c   Sun Oct  5 11:59:43 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-gnulib-tests_pselect.c,v 1.1 2025/10/05 11:59:43 js Exp $
+
+--- gnulib-tests/pselect.c.orig        2022-07-02 18:22:03.000000000 +0000
++++ gnulib-tests/pselect.c
+@@ -21,6 +21,7 @@
+ 
+ #include <config.h>
+ 
++#include <time.h>
+ #include <sys/select.h>
+ 
+ #include <errno.h>
Index: pkgsrc/textproc/gsed/patches/patch-sed_compile.c
diff -u /dev/null pkgsrc/textproc/gsed/patches/patch-sed_compile.c:1.1
--- /dev/null   Sun Oct  5 11:59:43 2025
+++ pkgsrc/textproc/gsed/patches/patch-sed_compile.c    Sun Oct  5 11:59:43 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-sed_compile.c,v 1.1 2025/10/05 11:59:43 js Exp $
+
+Fix "error: #pragma GCC diagnostic not allowed inside functions"
+
+--- sed/compile.c.orig 2022-10-23 17:52:23.000000000 +0000
++++ sed/compile.c
+@@ -198,17 +198,17 @@ static struct output *file_read = NULL;
+ static struct output *file_write = NULL;
+ 
+ /* Complain about an unknown command and exit. */
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ static void
+ bad_command (char ch)
+ {
+   const char *msg = _(UNKNOWN_CMD);
+   char *unknown_cmd = xmalloc (strlen (msg));
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+   sprintf (unknown_cmd, msg, ch);
+-#pragma GCC diagnostic pop
+   bad_prog (unknown_cmd);
+ }
++#pragma GCC diagnostic pop
+ 
+ /* Complain about a programming error and exit. */
+ void