CVS commit: pkgsrc/devel/scmcvs

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 29 09:10:51 UTC 2025

Modified Files:
        pkgsrc/devel/scmcvs: Makefile distinfo
        pkgsrc/devel/scmcvs/patches: patch-ad
Added Files:
        pkgsrc/devel/scmcvs/patches: patch-diff_system.h patch-diff_util.c

Log Message:
scmcvs: fix build w/ GCC 15


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/scmcvs/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/scmcvs/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/scmcvs/patches/patch-ad
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/scmcvs/patches/patch-diff_system.h \
    pkgsrc/devel/scmcvs/patches/patch-diff_util.c

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

Modified files:

Index: pkgsrc/devel/scmcvs/Makefile
diff -u pkgsrc/devel/scmcvs/Makefile:1.22 pkgsrc/devel/scmcvs/Makefile:1.23
--- pkgsrc/devel/scmcvs/Makefile:1.22   Sat Apr 19 07:57:44 2025
+++ pkgsrc/devel/scmcvs/Makefile        Tue Apr 29 09:10:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2025/04/19 07:57:44 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/04/29 09:10:51 tnn Exp $
 
 DISTNAME=      cvs-1.12.13
 PKGREVISION=   9
@@ -17,6 +17,7 @@ CONFIGURE_ARGS+=      --with-external-zlib
 CONFIGURE_ARGS+=       --with-rsh=ssh
 CONFIGURE_ENV+=                PERL=${TOOLS_PERL5}
 CONFIGURE_ENV+=                gl_cv_func_getcwd_null=yes
+CPPFLAGS.Linux+=       -D_GNU_SOURCE   # fputs_unlocked(3)
 
 CHECK_INTERPRETER_SKIP=        share/cvs/contrib/*
 INFO_FILES=            yes

Index: pkgsrc/devel/scmcvs/distinfo
diff -u pkgsrc/devel/scmcvs/distinfo:1.27 pkgsrc/devel/scmcvs/distinfo:1.28
--- pkgsrc/devel/scmcvs/distinfo:1.27   Mon Apr 21 16:35:05 2025
+++ pkgsrc/devel/scmcvs/distinfo        Tue Apr 29 09:10:51 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.27 2025/04/21 16:35:05 wiz Exp $
+$NetBSD: distinfo,v 1.28 2025/04/29 09:10:51 tnn Exp $
 
 BLAKE2s (cvs-1.12.13.tar.bz2) = 9942455b8517b9b3bafdca6f9368f420897b555546ab45c28d42f5d54811e291
 SHA512 (cvs-1.12.13.tar.bz2) = 7d10f808de62190b18d4f706d2d03ab218a508bfb52047ff3e830e293ec40c5e8bf6cc743ef72a5c24be5aa867c9e4892d7d475a026a98b296a3764b4bd0f4d8
 Size (cvs-1.12.13.tar.bz2) = 3911104 bytes
 SHA1 (patch-ab) = bc26fcb899d6316298c97779016aab4edb5cd124
-SHA1 (patch-ad) = 12847d39cece34b310e4bc88c47fa8769233dff5
+SHA1 (patch-ad) = d2e1a26d646b03331ad81748c5384a3d06238092
 SHA1 (patch-ae) = be535ece7dc9b62c940f500e67c454bf1a86feed
 SHA1 (patch-af) = 4299a901206aef3accb428579deb8774411992c7
 SHA1 (patch-ag) = 53d072ba6bdbe0f988829616a232bb154cab2be3
@@ -25,6 +25,8 @@ SHA1 (patch-ay) = 6ce1c3c21dbc478248068f
 SHA1 (patch-az) = 9dfd460ae6617f1492e0e6861387ff80080a7d5d
 SHA1 (patch-ba) = 7153e12e5da86effd4285e147f9f534011982e07
 SHA1 (patch-bb) = 153dc447751f3d52bca5033f33a95f408c5775db
+SHA1 (patch-diff_system.h) = e8b921f2ac34ef621d6daf1d11a15669f4ea2582
+SHA1 (patch-diff_util.c) = efd36058d541e6b952c831e37022155288daf73c
 SHA1 (patch-lib_mktime.c) = 526a0e24c6399d527ae6a463ea91e993f9f7e920
 SHA1 (patch-lib_vasnprintf.c) = fbba4d923d3c61ebcf79e82779919dc1f8a570c0
 SHA1 (patch-m4_fpending.m4) = 6b7c96d8f092e179d2cfdf036bcbfd3855292e0f

Index: pkgsrc/devel/scmcvs/patches/patch-ad
diff -u pkgsrc/devel/scmcvs/patches/patch-ad:1.3 pkgsrc/devel/scmcvs/patches/patch-ad:1.4
--- pkgsrc/devel/scmcvs/patches/patch-ad:1.3    Mon Oct 14 06:51:02 2013
+++ pkgsrc/devel/scmcvs/patches/patch-ad        Tue Apr 29 09:10:51 2025
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2013/10/14 06:51:02 adam Exp $
+$NetBSD: patch-ad,v 1.4 2025/04/29 09:10:51 tnn Exp $
 
 --- lib/sighandle.c.orig       2003-10-05 03:49:29.000000000 +0000
 +++ lib/sighandle.c
+@@ -56,7 +56,7 @@ char *malloc();
+ 
+ /* Define linked list of signal handlers structure */
+ struct SIG_hlist {
+-      RETSIGTYPE              (*handler)();
++      RETSIGTYPE              (*handler)(int);
+       struct SIG_hlist        *next;
+ };
+ 
 @@ -204,8 +204,10 @@ static RETSIGTYPE SIG_handle (int sig)
        this = SIG_handlers[sig];
        while (this != (struct SIG_hlist *) NULL)
@@ -14,3 +23,12 @@ $NetBSD: patch-ad,v 1.3 2013/10/14 06:51
        }
        SIG_endCrSect();
  
+@@ -220,7 +222,7 @@ static RETSIGTYPE SIG_handle (int sig)
+  * restoration later.
+  */
+ 
+-int SIG_register(int sig, RETSIGTYPE (*fn)())
++int SIG_register(int sig, RETSIGTYPE (*fn)(int))
+ {
+       int                     val;
+       struct SIG_hlist        *this;

Added files:

Index: pkgsrc/devel/scmcvs/patches/patch-diff_system.h
diff -u /dev/null pkgsrc/devel/scmcvs/patches/patch-diff_system.h:1.1
--- /dev/null   Tue Apr 29 09:10:51 2025
+++ pkgsrc/devel/scmcvs/patches/patch-diff_system.h     Tue Apr 29 09:10:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-diff_system.h,v 1.1 2025/04/29 09:10:51 tnn Exp $
+
+* replace K&R prototypes
+
+--- diff/system.h.orig 2025-04-29 08:58:50.538410570 +0000
++++ diff/system.h
+@@ -177,7 +177,7 @@ VOID *malloc ();
+ VOID *realloc ();
+ #endif
+ #ifndef getenv
+-char *getenv ();
++char *getenv (const char *);
+ #endif
+ 
+ #include <limits.h>
Index: pkgsrc/devel/scmcvs/patches/patch-diff_util.c
diff -u /dev/null pkgsrc/devel/scmcvs/patches/patch-diff_util.c:1.1
--- /dev/null   Tue Apr 29 09:10:51 2025
+++ pkgsrc/devel/scmcvs/patches/patch-diff_util.c       Tue Apr 29 09:10:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-diff_util.c,v 1.1 2025/04/29 09:10:51 tnn Exp $
+
+* replace K&R prototype
+
+--- diff/util.c.orig   2025-04-29 08:59:30.153087345 +0000
++++ diff/util.c
+@@ -24,7 +24,7 @@ GNU General Public License for more deta
+ #endif
+ 
+ #ifndef strerror
+-extern char *strerror ();
++extern char *strerror (int);
+ #endif
+ 
+ /* Queue up one-line messages to be printed at the end,