nickle: fix build with upstream help

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: nickle: fix build with upstream help
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Wed, 30 Apr 2025 09:15:14 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Apr 30 11:14:45 2025 +0200
Changeset:	78617f01ae67349fa234e98e0886cf9afc635879

Modified Files:
	nickle/Makefile
	nickle/PLIST
	nickle/distinfo
Added Files:
	nickle/patches/patch-test_math-tables.sh

Log Message:
nickle: fix build with upstream help

switch to readline because editline support would need a pkg-config
file, which pkgsrc doesn't provide

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78617f01ae67349fa234e98e0886cf9afc635879

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

diffstat:
 nickle/Makefile                          |  8 ++-
 nickle/PLIST                             | 18 ++-----
 nickle/distinfo                          |  1 +
 nickle/patches/patch-test_math-tables.sh | 86 ++++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+), 16 deletions(-)

diffs:
diff --git a/nickle/Makefile b/nickle/Makefile
index 8aab1a0988..0dca216464 100644
--- a/nickle/Makefile
+++ b/nickle/Makefile
@@ -14,7 +14,13 @@ TEST_TARGET=	check
 
 REPLACE_SH+=	bench/runbench.sh
 
+USE_TOOLS+=	pkg-config
+
 .include "../../devel/meson/build.mk"
-.include "../../mk/readline.buildlink3.mk"
+#MESON_ARGS+=	-Dlibedit=true
+# does support editline, but only with a pkg-config file, which pkgsrc
+# does not provide
+#.include "../../mk/readline.buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/nickle/PLIST b/nickle/PLIST
index fdf31acde8..83c2cc8d20 100644
--- a/nickle/PLIST
+++ b/nickle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2024/01/14 08:41:57 wiz Exp $
+@comment $NetBSD$
 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
diff --git a/nickle/distinfo b/nickle/distinfo
index dc90c76738..54967e560d 100644
--- a/nickle/distinfo
+++ b/nickle/distinfo
@@ -4,3 +4,4 @@ BLAKE2s (nickle-2.103.tar.xz) = 69a14501cccdbee6317799edeaaa8e61b044f8030ba81caa
 SHA512 (nickle-2.103.tar.xz) = e60fa993b0c4d732106fcddfd7139c32bbf8bb443f8032c1344ea668fa0ee3cec1852c9dc674791ddf31220f38da6093d7f7a444341baf107592aef42bd8b9b0
 Size (nickle-2.103.tar.xz) = 2190800 bytes
 SHA1 (patch-meson.build) = ddef6402062da4950d1bcb3fc1bb7102e1baa353
+SHA1 (patch-test_math-tables.sh) = 283036db256dfbc746d6321c1b2902a4cd728bdd
diff --git a/nickle/patches/patch-test_math-tables.sh b/nickle/patches/patch-test_math-tables.sh
new file mode 100644
index 0000000000..5c789b2b39
--- /dev/null
+++ b/nickle/patches/patch-test_math-tables.sh
@@ -0,0 +1,86 @@
+$NetBSD$
+
+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"`
Prev by Date: py-nomadnet: Cope with setuptools instability
Next by Date: nickle: remove, used for updating math/nickle
Previous by Thread: py-nomadnet: Cope with setuptools instability
Next by Thread: nickle: remove, used for updating math/nickle
Indexes:
Home | Main Index | Thread Index | Old Index