CVS commit: pkgsrc/math/nickle

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 30 11:43:13 UTC 2025

Modified Files:
        pkgsrc/math/nickle: Makefile PLIST distinfo
Added Files:
        pkgsrc/math/nickle/patches: patch-meson.build patch-test_math-tables.sh
Removed Files:
        pkgsrc/math/nickle/patches: patch-gram.y

Log Message:
nickle: update to 2.103.

New in 2.103:

    Switch 'bool' in %union to 'boolean' for C23 compatibility


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/math/nickle/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/nickle/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/math/nickle/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/math/nickle/patches/patch-gram.y
cvs rdiff -u -r0 -r1.1 pkgsrc/math/nickle/patches/patch-meson.build \
    pkgsrc/math/nickle/patches/patch-test_math-tables.sh

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.34 pkgsrc/math/nickle/Makefile:1.35
--- pkgsrc/math/nickle/Makefile:1.34    Sun Jan 14 08:41:57 2024
+++ pkgsrc/math/nickle/Makefile Wed Apr 30 11:43:13 2025
@@ -1,25 +1,24 @@
-# $NetBSD: Makefile,v 1.34 2024/01/14 08:41:57 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2025/04/30 11:43:13 wiz Exp $
 
-DISTNAME=      nickle-2.97
+DISTNAME=      nickle-2.103
 CATEGORIES=    math lang
 MASTER_SITES=  http://nickle.org/release/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://nickle.org/
 COMMENT=       Desk calculator language
 LICENSE=       mit
 
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.editlinereadline}
-CONFIGURE_ARGS+=       CC_FOR_BUILD=${NATIVE_CC:Q:U${CC:Q}}
-
-# suppress detection of DOCBOOK
-CONFIGURE_ENV+=        ac_cv_path_DOCBOOK2PDF=
+MESON_ARGS+=   -Dlibedit=true
 
 TEST_TARGET=   check
 
 REPLACE_SH+=   bench/runbench.sh
 
+USE_TOOLS+=    pkg-config
+
+.include "../../devel/meson/build.mk"
 .include "../../mk/readline.buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/nickle/PLIST
diff -u pkgsrc/math/nickle/PLIST:1.10 pkgsrc/math/nickle/PLIST:1.11
--- pkgsrc/math/nickle/PLIST:1.10       Sun Jan 14 08:41:57 2024
+++ pkgsrc/math/nickle/PLIST    Wed Apr 30 11:43:13 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2024/01/14 08:41:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/04/30 11:43:13 wiz Exp $
 bin/nickle
 include/nickle/builtin-namespaces.h
 include/nickle/builtin.h
@@ -12,22 +12,8 @@ include/nickle/ref.h
 include/nickle/stack.h
 include/nickle/value.h
 man/man1/nickle.1
-share/nickle/COPYING
 share/nickle/abort.5c
 share/nickle/arc4.5c
-share/nickle/bench/choose.5c
-share/nickle/bench/choose.bc
-share/nickle/bench/choose.c
-share/nickle/bench/composite.5c
-share/nickle/bench/composite.bc
-share/nickle/bench/composite.c
-share/nickle/bench/ifact.5c
-share/nickle/bench/ifact.bc
-share/nickle/bench/ifact.c
-share/nickle/bench/rfact.5c
-share/nickle/bench/rfact.bc
-share/nickle/bench/rfact.c
-share/nickle/bench/runbench.sh
 share/nickle/builtin.5c
 share/nickle/cha-cha.5c
 share/nickle/command.5c
@@ -55,6 +41,7 @@ share/nickle/examples/rsa.5c
 share/nickle/examples/skiplisttest.5c
 share/nickle/examples/smlng/COPYING
 share/nickle/examples/smlng/context.5c
+share/nickle/examples/smlng/data.sgml
 share/nickle/examples/smlng/generate.5c
 share/nickle/examples/smlng/parse.5c
 share/nickle/examples/smlng/test.5c
@@ -86,6 +73,7 @@ share/nickle/test/arraytest.5c
 share/nickle/test/chacha_test.5c
 share/nickle/test/datetest.5c
 share/nickle/test/factorial.5c
+share/nickle/test/fround.5c
 share/nickle/test/gcdtest.5c
 share/nickle/test/hashtest.5c
 share/nickle/test/inttest.5c

Index: pkgsrc/math/nickle/distinfo
diff -u pkgsrc/math/nickle/distinfo:1.29 pkgsrc/math/nickle/distinfo:1.30
--- pkgsrc/math/nickle/distinfo:1.29    Mon Apr 28 19:15:19 2025
+++ pkgsrc/math/nickle/distinfo Wed Apr 30 11:43:13 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.29 2025/04/28 19:15:19 tnn Exp $
+$NetBSD: distinfo,v 1.30 2025/04/30 11:43:13 wiz Exp $
 
-BLAKE2s (nickle-2.97.tar.gz) = e250335262308dc00ee5c2b0e0d7dcedcb58a4ad244106bfa0d5debcc1514f12
-SHA512 (nickle-2.97.tar.gz) = 8add9b0b908a3273fecc00d76aaaabfb3b86872c3dab9a9fe7dae45c98c2c45dca16c2234887c195733360db6a3377041a8b4428b64686792aa08e9c8c561309
-Size (nickle-2.97.tar.gz) = 2553393 bytes
-SHA1 (patch-gram.y) = f59a2327e4fdd207b96d5f1328914e662e6cc1b8
+BLAKE2s (nickle-2.103.tar.xz) = 69a14501cccdbee6317799edeaaa8e61b044f8030ba81caa55ebd9308acd5c19
+SHA512 (nickle-2.103.tar.xz) = e60fa993b0c4d732106fcddfd7139c32bbf8bb443f8032c1344ea668fa0ee3cec1852c9dc674791ddf31220f38da6093d7f7a444341baf107592aef42bd8b9b0
+Size (nickle-2.103.tar.xz) = 2190800 bytes
+SHA1 (patch-meson.build) = 9d3311f4aa3e3e2ffcb6fa0f968fd7e3a8a1368d
+SHA1 (patch-test_math-tables.sh) = 283036db256dfbc746d6321c1b2902a4cd728bdd

Added files:

Index: pkgsrc/math/nickle/patches/patch-meson.build
diff -u /dev/null pkgsrc/math/nickle/patches/patch-meson.build:1.1
--- /dev/null   Wed Apr 30 11:43:13 2025
+++ pkgsrc/math/nickle/patches/patch-meson.build        Wed Apr 30 11:43:13 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-meson.build,v 1.1 2025/04/30 11:43:13 wiz Exp $
+
+Do not hardcode C++23, it's not really needed.
+
+--- meson.build.orig   2025-04-29 07:13:33.386241589 +0000
++++ meson.build
+@@ -7,7 +7,6 @@
+ project('nickle', 'c',
+       default_options: [
+         'buildtype=debugoptimized',
+-        'c_std=gnu23',
+         'warning_level=2',
+       ],
+       license : 'BSD',
Index: pkgsrc/math/nickle/patches/patch-test_math-tables.sh
diff -u /dev/null pkgsrc/math/nickle/patches/patch-test_math-tables.sh:1.1
--- /dev/null   Wed Apr 30 11:43:13 2025
+++ pkgsrc/math/nickle/patches/patch-test_math-tables.sh        Wed Apr 30 11:43:13 2025
@@ -0,0 +1,86 @@
+$NetBSD: patch-test_math-tables.sh,v 1.1 2025/04/30 11:43:13 wiz Exp $
+
+From fc36b91c5d783d718f89debea1a1d4933ef844e2 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp%keithp.com@localhost>
+Date: Tue, 29 Apr 2025 22:34:06 -0700
+Subject: [PATCH] test: Use fmt -w 500 instead of fmt --width=500
+
+--width appears to be a GNU extension.
+
+Signed-off-by: Keith Packard <keithp%keithp.com@localhost>
+
+--- test/math-tables.sh.orig   2025-04-28 22:56:10.000000000 +0000
++++ test/math-tables.sh
+@@ -61,10 +61,10 @@ echo "sin_cos_t[] sin_cos_table = {"
+ 
+ a="-800"
+ while [ "$a" -le "800" -a $make_sin = "y" ]; do
+-    sin=`echo "s($a / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
+-    cos=`echo "c($a / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
+-    psin=`echo "s(p * $a / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
+-    pcos=`echo "c(p * $a / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++    sin=`echo "s($a / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
++    cos=`echo "c($a / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
++    psin=`echo "s(p * $a / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
++    pcos=`echo "c(p * $a / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+     echo "    { .angle = $a / 100.0,"
+     echo "      .sin = $sin,"
+     echo "      .cos = $cos },"
+@@ -83,8 +83,8 @@ echo "asin_acos_t[] asin_acos_table = {"
+ 
+ r="-200"
+ while [ "$r" -le 200 -a $make_asin = "y" ]; do
+-    asin=`echo "b($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
+-    acos=`echo "d($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++    asin=`echo "b($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
++    acos=`echo "d($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+     echo "    { .ratio = $r / 100,"
+     echo "      .asin = $asin,"
+     echo "      .acos = $acos },"
+@@ -100,8 +100,8 @@ echo "tan_t[] tan_table = {"
+ 
+ a="-800"
+ while [ "$a" -le 800 -a $make_tan = "y" ]; do
+-    tan=`echo "t($a / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
+-    ptan=`echo "t(p * $a / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++    tan=`echo "t($a / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
++    ptan=`echo "t(p * $a / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+     echo "    { .angle = $a / 100.0,"
+     echo "      .tan = $tan },"
+     echo "    { .angle = π * $a / 100.0,"
+@@ -117,7 +117,7 @@ echo "atan_t[] atan_table = {"
+ 
+ r="-1000"
+ while [ "$r" -le 1000 -a $make_atan = "y" ]; do
+-    atan=`echo "a($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++    atan=`echo "a($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+     echo "    { .ratio = $r / 100,"
+     echo "      .atan = $atan },"
+     r=`expr "$r" + "$inc"`
+@@ -134,7 +134,7 @@ while [ "$y" -le 30 -a "$make_atan" = "y
+       x="-30"
+       while [ "$x" -le 30 ]; do
+         x=`expr "$x" + "$ainc"`
+-        atan2=`echo "u($y / 100, $x / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++        atan2=`echo "u($y / 100, $x / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+         echo "    { .y = $y / 100.0, .x = $x / 100.0,"
+         echo "      .atan2 = $atan2 },"
+       done
+@@ -150,7 +150,7 @@ echo "log_t[] log_table = {"
+ r="0"
+ while [ "$r" -le 66 -a "$make_log" = "y" ]; do
+     in=`echo "2 ^ $r" | bc`
+-    log=`echo "l($in / 1000000)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++    log=`echo "l($in / 1000000)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+     echo "    { .in = $in / 1000000.0,"
+     echo "      .log = $log },"
+     r=`expr "$r" + "$ainc"`
+@@ -164,7 +164,7 @@ echo "exp_t[] exp_table = {"
+ 
+ r="-1000"
+ while [ "$r" -le 1000 -a $make_exp = "y" ]; do
+-    exp=`echo "e($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt --width=500 | tr -d '\\\n ' `
++    exp=`echo "e($r / 100)" | bc -l "$dir"/math-funcs.bc | fmt -w 500 | tr -d '\\\n ' `
+     echo "    { .in = $r / 100.0,"
+     echo "      .exp = $exp },"
+     r=`expr "$r" + "$inc"`