CVS commit: pkgsrc/lang/gforth

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 20 09:18:51 UTC 2025

Modified Files:
        pkgsrc/lang/gforth: Makefile distinfo
Added Files:
        pkgsrc/lang/gforth/patches: patch-engine_forth.h

Log Message:
gforth: add evct prototype in case the operating system doesn't provide one

Fixes build on NetBSD 10.

With help from upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/gforth/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gforth/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gforth/patches/patch-engine_forth.h

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

Modified files:

Index: pkgsrc/lang/gforth/Makefile
diff -u pkgsrc/lang/gforth/Makefile:1.50 pkgsrc/lang/gforth/Makefile:1.51
--- pkgsrc/lang/gforth/Makefile:1.50    Tue Jun 28 11:34:11 2022
+++ pkgsrc/lang/gforth/Makefile Thu Mar 20 09:18:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2022/06/28 11:34:11 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2025/03/20 09:18:51 wiz Exp $
 
 DISTNAME=              gforth-0.7.3
 PKGREVISION=           10
@@ -59,7 +59,7 @@ PLIST_SUBST+= KERNEL_FI=${KERNEL_FI_cmd:
 # Owing to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=31152,
 # demand at least gcc 4.3 for arm.
 .include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_ARCH:Marm*) || !empty(MACHINE_ARCH:Mearm*)
+.if ${MACHINE_ARCH:Marm*} || ${MACHINE_ARCH:Mearm*}
 .  if !empty(PKGSRC_COMPILER:Mgcc)
 GCC_REQD+=     4.3
 .  endif

Index: pkgsrc/lang/gforth/distinfo
diff -u pkgsrc/lang/gforth/distinfo:1.14 pkgsrc/lang/gforth/distinfo:1.15
--- pkgsrc/lang/gforth/distinfo:1.14    Tue Oct 26 10:51:36 2021
+++ pkgsrc/lang/gforth/distinfo Thu Mar 20 09:18:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:51:36 nia Exp $
+$NetBSD: distinfo,v 1.15 2025/03/20 09:18:51 wiz Exp $
 
 BLAKE2s (gforth-0.7.3.tar.gz) = 714cad264dfa2a1055825ecac4eda82304990c282f1da1d8907b1dbfbec2163b
 SHA512 (gforth-0.7.3.tar.gz) = f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4
@@ -8,3 +8,4 @@ SHA1 (patch-ae) = 5ed4c1b54d6c2af5558018
 SHA1 (patch-configure) = 405b75bc920f5709fcaa90aa63d91d10c23f5b32
 SHA1 (patch-configure.in) = 9f916f1d40817f2781baeed7197d1a6336c39a2a
 SHA1 (patch-engine_Makefile.in) = 3403d2c2c5a2594a35894df2950dc28d36a701aa
+SHA1 (patch-engine_forth.h) = 0de02917e04709b23ab9b06210665d0e40e40d40

Added files:

Index: pkgsrc/lang/gforth/patches/patch-engine_forth.h
diff -u /dev/null pkgsrc/lang/gforth/patches/patch-engine_forth.h:1.1
--- /dev/null   Thu Mar 20 09:18:51 2025
+++ pkgsrc/lang/gforth/patches/patch-engine_forth.h     Thu Mar 20 09:18:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-engine_forth.h,v 1.1 2025/03/20 09:18:51 wiz Exp $
+
+Provide evct prototype.
+
+--- engine/forth.h.orig        2025-03-20 09:14:27.952948108 +0000
++++ engine/forth.h
+@@ -490,7 +490,7 @@ extern double asinh(double r1);
+ extern double acosh(double r1);
+ #endif
+ #ifndef HAVE_ECVT
+-/* extern char* ecvt(double x, int len, int* exp, int* sign);*/
++extern char* ecvt(double x, int len, int* exp, int* sign);
+ #endif
+ #ifndef HAVE_MEMMOVE
+ /* extern char *memmove(char *dest, const char *src, long n); */