CVS commit: pkgsrc/www/wwwcount

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Oct 12 01:00:48 UTC 2025

Modified Files:
        pkgsrc/www/wwwcount: distinfo
        pkgsrc/www/wwwcount/patches: patch-ab
Added Files:
        pkgsrc/www/wwwcount/patches: patch-libs_bigplus_bigplus.c
            patch-src_libs_mcfg_mcfg.h

Log Message:
give main a return type and fix the ctype.h includes.  for GCC 14.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/wwwcount/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/wwwcount/patches/patch-ab
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/wwwcount/patches/patch-libs_bigplus_bigplus.c \
    pkgsrc/www/wwwcount/patches/patch-src_libs_mcfg_mcfg.h

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

Modified files:

Index: pkgsrc/www/wwwcount/distinfo
diff -u pkgsrc/www/wwwcount/distinfo:1.9 pkgsrc/www/wwwcount/distinfo:1.10
--- pkgsrc/www/wwwcount/distinfo:1.9    Tue Oct 26 11:31:14 2021
+++ pkgsrc/www/wwwcount/distinfo        Sun Oct 12 01:00:48 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:31:14 nia Exp $
+$NetBSD: distinfo,v 1.10 2025/10/12 01:00:48 mrg Exp $
 
 BLAKE2s (wwwcount2.5.tar.gz) = dde44837bcbe078d4d9e176a0157ee09af0bfcb0144d0e6e8cd4c3d7c50868d5
 SHA512 (wwwcount2.5.tar.gz) = 1ab6224f9b165abc1d188ce8ea03558bb03a7b3d12baaf922c995c91e9b0b8bf7ea7ff6b3be433dd6825a8404afde322c143bb3d7420662df7dec25b4afda79e
 Size (wwwcount2.5.tar.gz) = 441215 bytes
 SHA1 (patch-aa) = 2c1db53763365a08e32e9724efd3148994af9963
-SHA1 (patch-ab) = f6f71b1428506ab565f127c38096b65408f5bc53
+SHA1 (patch-ab) = 85aab82abf13579390275223b7db70a60a0e693f
 SHA1 (patch-ae) = ab0d799eaf0a49eebace0ad200d53bee3ac6cee9

Index: pkgsrc/www/wwwcount/patches/patch-ab
diff -u pkgsrc/www/wwwcount/patches/patch-ab:1.3 pkgsrc/www/wwwcount/patches/patch-ab:1.4
--- pkgsrc/www/wwwcount/patches/patch-ab:1.3    Fri May 14 23:23:58 1999
+++ pkgsrc/www/wwwcount/patches/patch-ab        Sun Oct 12 01:00:48 2025
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.3 1999/05/14 23:23:58 tron Exp $
+$NetBSD: patch-ab,v 1.4 2025/10/12 01:00:48 mrg Exp $
 
---- configure.orig     Sun Jan 24 20:49:38 1999
-+++ configure  Sat May 15 01:12:06 1999
-@@ -1573,7 +1573,7 @@
+--- configure.orig     1999-01-24 11:49:40.000000000 -0800
++++ configure  2025-10-11 15:53:01.625572560 -0700
+@@ -639,7 +639,7 @@ cross_compiling=$ac_cv_prog_cc_cross
+ cat > conftest.$ac_ext <<EOF
+ #line 641 "configure"
+ #include "confdefs.h"
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   ac_cv_prog_cc_works=yes
+@@ -1573,7 +1575,7 @@ $extrasub
  s%@CFLAGS@%$CFLAGS%g
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g

Added files:

Index: pkgsrc/www/wwwcount/patches/patch-libs_bigplus_bigplus.c
diff -u /dev/null pkgsrc/www/wwwcount/patches/patch-libs_bigplus_bigplus.c:1.1
--- /dev/null   Sun Oct 12 01:00:48 2025
+++ pkgsrc/www/wwwcount/patches/patch-libs_bigplus_bigplus.c    Sun Oct 12 01:00:48 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-libs_bigplus_bigplus.c,v 1.1 2025/10/12 01:00:48 mrg Exp $
+
+Include <ctype.h> to use these definitions.
+
+
+--- libs/bigplus/bigplus.c.orig        1998-12-30 17:24:50.000000000 -0800
++++ libs/bigplus/bigplus.c     2025-10-11 16:10:22.177825696 -0700
+@@ -32,6 +32,10 @@
+ #include <string.h>
+ #endif
+ 
++#if HAVE_CTYPE_H
++#include <ctype.h>
++#endif
++
+ #include "bigplus.h"
+ 
+ _PROTOTYPE(static bc_num _do_add, (bc_num n1, bc_num n2, int scale_min));
Index: pkgsrc/www/wwwcount/patches/patch-src_libs_mcfg_mcfg.h
diff -u /dev/null pkgsrc/www/wwwcount/patches/patch-src_libs_mcfg_mcfg.h:1.1
--- /dev/null   Sun Oct 12 01:00:48 2025
+++ pkgsrc/www/wwwcount/patches/patch-src_libs_mcfg_mcfg.h      Sun Oct 12 01:00:48 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_libs_mcfg_mcfg.h,v 1.1 2025/10/12 01:00:48 mrg Exp $
+
+Fix <ctype.h> include.  (For some reason, STDC_HEADERS and GCC 14 is
+a problem but I'm struggling to figure it out.  But there's already
+an explicit check for ctype.h so use that.)
+
+builds with GCC 14 now.
+
+
+--- src/libs/mcfg/mcfg.h.orig  1998-12-27 12:53:54.000000000 -0800
++++ src/libs/mcfg/mcfg.h       2025-10-11 16:09:07.642409935 -0700
+@@ -4,10 +4,13 @@
+ 
+ #if STDC_HEADERS
+ #include <stdlib.h>
+-#include <ctype.h>
+ #include <string.h>
+ #endif
+ 
++#if HAVE_CTYPE_H
++#include <ctype.h>
++#endif
++
+ #if HAVE_STRING_H
+ #include <string.h>
+ #endif