CVS commit: pkgsrc/math/nickle

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Apr 20 11:10:26 UTC 2023

Modified Files:
        pkgsrc/math/nickle: Makefile distinfo
Added Files:
        pkgsrc/math/nickle/patches: patch-configure patch-main.c

Log Message:
nickle: fix configure checks instead

This is likely to trip up builtin readline on old NetBSD releases
too since macOS base ships a fork of NetBSD readline.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/math/nickle/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/math/nickle/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/nickle/patches/patch-configure \
    pkgsrc/math/nickle/patches/patch-main.c

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

Modified files:

Index: pkgsrc/math/nickle/Makefile
diff -u pkgsrc/math/nickle/Makefile:1.23 pkgsrc/math/nickle/Makefile:1.24
--- pkgsrc/math/nickle/Makefile:1.23    Thu Apr 20 10:13:41 2023
+++ pkgsrc/math/nickle/Makefile Thu Apr 20 11:10:26 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2023/04/20 10:13:41 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2023/04/20 11:10:26 tnn Exp $
 
 DISTNAME=      nickle-2.91
 CATEGORIES=    math lang
@@ -16,11 +16,4 @@ CONFIGURE_ENV+=      ac_cv_path_DOCBOOK2PDF=
 
 TEST_TARGET=   check
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-.include "../../devel/readline/buildlink3.mk"
-.else
-.include "../../mk/readline.buildlink3.mk"
-.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/nickle/distinfo
diff -u pkgsrc/math/nickle/distinfo:1.19 pkgsrc/math/nickle/distinfo:1.20
--- pkgsrc/math/nickle/distinfo:1.19    Tue Apr 18 21:31:08 2023
+++ pkgsrc/math/nickle/distinfo Thu Apr 20 11:10:26 2023
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.19 2023/04/18 21:31:08 wiz Exp $
+$NetBSD: distinfo,v 1.20 2023/04/20 11:10:26 tnn Exp $
 
 BLAKE2s (nickle-2.91.tar.gz) = 0c68e83c11f48e370c413811804d20dd331ae08b003d65fd26ebded8b1a9d38f
 SHA512 (nickle-2.91.tar.gz) = 4741cdfad83c84da2c232b965cef52deb7c04f04db9ba1255d420ecd51ba63f9ad249e2e7b5ee4e0be855fdf611d5f5311f2c3cd6631f1211ce65d1e78b0d60f
 Size (nickle-2.91.tar.gz) = 2505408 bytes
 SHA1 (patch-aa) = 4cbb563244883f6c9f7a3594875052f8d9a9e9b3
 SHA1 (patch-builtin-date.c) = 1aa792b5a91f4b808208e73ee38bd539ab0c12fb
+SHA1 (patch-configure) = fbbe0e41f4b9b3617eeb77879623bcdd48864af2
 SHA1 (patch-float.c) = f157fc605b617e7b5bdaa192d48e679b596a9228
 SHA1 (patch-lex.c) = f9d5f3f282f97a94195730062525e9f6310bb316
+SHA1 (patch-main.c) = 3f6d009255cdf51d6e5dcfb8ae3c0d49f6991694

Added files:

Index: pkgsrc/math/nickle/patches/patch-configure
diff -u /dev/null pkgsrc/math/nickle/patches/patch-configure:1.1
--- /dev/null   Thu Apr 20 11:10:26 2023
+++ pkgsrc/math/nickle/patches/patch-configure  Thu Apr 20 11:10:26 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-configure,v 1.1 2023/04/20 11:10:26 tnn Exp $
+
+Add missing configure check for rl_echo_signal_char.
+
+--- configure.orig     2023-04-20 11:05:02.150741396 +0000
++++ configure
+@@ -6508,6 +6508,14 @@ then :
+ printf "%s\n" "#define HAVE_RL_CLEANUP_AFTER_SIGNAL 1" >>confdefs.h
+ 
+ fi
++    ac_fn_check_decl "$LINENO" "rl_echo_signal_char" "ac_cv_have_decl_rl_echo_signal_char" "#include <readline/readline.h>
++" "$ac_c_undeclared_builtin_options" "CFLAGS"
++if test "x$ac_cv_have_decl_rl_echo_signal_char" = xyes
++then :
++
++printf "%s\n" "#define HAVE_RL_ECHO_SIGNAL_CHAR 1" >>confdefs.h
++
++fi
+ fi
+ 
+ if test "x$prefix" = xNONE; then
Index: pkgsrc/math/nickle/patches/patch-main.c
diff -u /dev/null pkgsrc/math/nickle/patches/patch-main.c:1.1
--- /dev/null   Thu Apr 20 11:10:26 2023
+++ pkgsrc/math/nickle/patches/patch-main.c     Thu Apr 20 11:10:26 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-main.c,v 1.1 2023/04/20 11:10:26 tnn Exp $
+
+Fix wrong configure checks.
+
+--- main.c.orig        2020-12-15 05:07:29.000000000 +0000
++++ main.c
+@@ -179,7 +179,9 @@ stop (int sig)
+ 
+ #if HAVE_RL_CLEANUP_AFTER_SIGNAL
+     if (stdin_in_readline) {
++#if HAVE_RL_ECHO_SIGNAL_CHAR
+       rl_echo_signal_char(sig);
++#endif
+       rl_cleanup_after_signal();
+     }
+ #endif
+@@ -197,7 +199,7 @@ stop (int sig)
+     catchSignal (sig, stop);
+     IoStart ();
+ 
+-#if HAVE_RL_CLEANUP_AFTER_SIGNAL
++#if HAVE_RL_RESET_AFTER_SIGNAL
+     if (stdin_in_readline)
+       rl_reset_after_signal();
+ #endif