CVS commit: pkgsrc/lang/js

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan  3 10:37:18 UTC 2026

Modified Files:
        pkgsrc/lang/js: Makefile distinfo
Added Files:
        pkgsrc/lang/js/patches: patch-configure patch-src_mrgsort.c
            patch-src_mrgsort.h

Log Message:
js: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/js/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/js/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/js/patches/patch-configure \
    pkgsrc/lang/js/patches/patch-src_mrgsort.c \
    pkgsrc/lang/js/patches/patch-src_mrgsort.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/js/Makefile
diff -u pkgsrc/lang/js/Makefile:1.11 pkgsrc/lang/js/Makefile:1.12
--- pkgsrc/lang/js/Makefile:1.11        Wed Aug 16 20:45:40 2017
+++ pkgsrc/lang/js/Makefile     Sat Jan  3 10:37:18 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/08/16 20:45:40 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.12 2026/01/03 10:37:18 wiz Exp $
 
 DISTNAME=              js-0.2.5
 PKGREVISION=           2
@@ -18,4 +17,7 @@ USE_LIBTOOL=          yes
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
 
+CFLAGS+=               -Wno-builtin-declaration-mismatch
+CFLAGS+=               -Wno-implicit-function-declaration
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/js/distinfo
diff -u pkgsrc/lang/js/distinfo:1.6 pkgsrc/lang/js/distinfo:1.7
--- pkgsrc/lang/js/distinfo:1.6 Tue Oct 26 10:51:39 2021
+++ pkgsrc/lang/js/distinfo     Sat Jan  3 10:37:18 2026
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:51:39 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/01/03 10:37:18 wiz Exp $
 
 BLAKE2s (js-0.2.5.tar.gz) = 479a9617d32728fcedcfd0711a27592af52e1a27344211d18992a8db1b15c823
 SHA512 (js-0.2.5.tar.gz) = 963b873c8c9351751f7216554318fe5cebf2d44e7735c43b02ffd540cb6653a12d0d8f0889c46333416d7243e514d5485b83573eb9c86d418cd1a9bfe1b9a6e0
 Size (js-0.2.5.tar.gz) = 689982 bytes
 SHA1 (patch-aa) = cf5e48496cea1ec3afd230d1014be57867121500
+SHA1 (patch-configure) = c226d2435fa2800af9f9e0cfe8868035660e5b0e
+SHA1 (patch-src_mrgsort.c) = 0368f504c07f05dbb58c6dfed44f5ef1cbab27a2
+SHA1 (patch-src_mrgsort.h) = ed873435d05498c6de9d43512b45a95f164b31d2

Added files:

Index: pkgsrc/lang/js/patches/patch-configure
diff -u /dev/null pkgsrc/lang/js/patches/patch-configure:1.1
--- /dev/null   Sat Jan  3 10:37:18 2026
+++ pkgsrc/lang/js/patches/patch-configure      Sat Jan  3 10:37:18 2026
@@ -0,0 +1,51 @@
+$NetBSD: patch-configure,v 1.1 2026/01/03 10:37:18 wiz Exp $
+
+Add missing return type.
+
+--- configure.orig     1999-01-15 07:39:56.000000000 +0000
++++ configure
+@@ -1153,7 +1153,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 1155 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -1622,7 +1622,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 1624 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -2544,7 +2544,7 @@ find_stack_direction ()
+   else
+     return (&dummy > addr) ? 1 : -1;
+ }
+-main ()
++int main ()
+ {
+   exit (find_stack_direction() < 0);
+ }
+@@ -2728,7 +2728,7 @@ else
+ #line 2729 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
+@@ -2767,7 +2767,7 @@ else
+ #line 2768 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
Index: pkgsrc/lang/js/patches/patch-src_mrgsort.c
diff -u /dev/null pkgsrc/lang/js/patches/patch-src_mrgsort.c:1.1
--- /dev/null   Sat Jan  3 10:37:18 2026
+++ pkgsrc/lang/js/patches/patch-src_mrgsort.c  Sat Jan  3 10:37:18 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_mrgsort.c,v 1.1 2026/01/03 10:37:18 wiz Exp $
+
+Adapt to POSIX mergesort prototype.
+
+--- src/mrgsort.c.orig 1998-11-25 08:06:11.000000000 +0000
++++ src/mrgsort.c
+@@ -98,15 +98,15 @@ do_mergesort (unsigned char *base, unsig
+  * Global functions.
+  */
+ 
+-void
+-mergesort_r (void *base, unsigned int number_of_elements,
+-           unsigned int size, MergesortCompFunc comparison_func,
++int
++mergesort_r (void *base, size_t number_of_elements,
++           size_t size, MergesortCompFunc comparison_func,
+            void *comparison_func_context)
+ {
+   void *tmp;
+ 
+   if (number_of_elements == 0)
+-    return;
++    return 0;
+ 
+   /* Allocate tmp buffer. */
+   tmp = malloc (number_of_elements * size);
+@@ -116,4 +116,5 @@ mergesort_r (void *base, unsigned int nu
+               comparison_func_context);
+ 
+   free (tmp);
++  return 0;
+ }
Index: pkgsrc/lang/js/patches/patch-src_mrgsort.h
diff -u /dev/null pkgsrc/lang/js/patches/patch-src_mrgsort.h:1.1
--- /dev/null   Sat Jan  3 10:37:18 2026
+++ pkgsrc/lang/js/patches/patch-src_mrgsort.h  Sat Jan  3 10:37:18 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mrgsort.h,v 1.1 2026/01/03 10:37:18 wiz Exp $
+
+Adapt to POSIX mergesort prototype.
+
+--- src/mrgsort.h.orig 1998-11-25 08:06:11.000000000 +0000
++++ src/mrgsort.h
+@@ -41,8 +41,8 @@ typedef int (*MergesortCompFunc) (const 
+  * Prototypes for global functions.
+  */
+ 
+-void mergesort_r (void *base, unsigned int number_of_elements,
+-                unsigned int size, MergesortCompFunc comparison_func,
++int mergesort_r (void *base, size_t number_of_elements,
++                size_t size, MergesortCompFunc comparison_func,
+                 void *comparison_func_context);
+ 
+