CVS commit: pkgsrc/comms/lrzsz

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr 28 16:58:51 UTC 2025

Modified Files:
        pkgsrc/comms/lrzsz: Makefile distinfo
Added Files:
        pkgsrc/comms/lrzsz/patches: patch-lib_error.c patch-lib_long-options.c
            patch-lib_xstrtol.c patch-src_lrz.c patch-src_lsz.c

Log Message:
lrzsz: replace K&R prototypes. Set LICENSE.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/comms/lrzsz/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/comms/lrzsz/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/comms/lrzsz/patches/patch-lib_error.c \
    pkgsrc/comms/lrzsz/patches/patch-lib_long-options.c \
    pkgsrc/comms/lrzsz/patches/patch-lib_xstrtol.c \
    pkgsrc/comms/lrzsz/patches/patch-src_lrz.c \
    pkgsrc/comms/lrzsz/patches/patch-src_lsz.c

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

Modified files:

Index: pkgsrc/comms/lrzsz/Makefile
diff -u pkgsrc/comms/lrzsz/Makefile:1.35 pkgsrc/comms/lrzsz/Makefile:1.36
--- pkgsrc/comms/lrzsz/Makefile:1.35    Mon Apr 21 16:25:09 2025
+++ pkgsrc/comms/lrzsz/Makefile Mon Apr 28 16:58:51 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/04/21 16:25:09 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2025/04/28 16:58:51 tnn Exp $
 
 DISTNAME=      lrzsz-0.12.20
 PKGREVISION=   1
@@ -8,9 +8,11 @@ MASTER_SITES=  https://www.ohse.de/uwe/re
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.ohse.de/uwe/software/lrzsz.html
 COMMENT=       Receive/Send files via X/Y/ZMODEM protocol.  (unrestrictive)
+LICENSE=       gnu-gpl-v2
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
+#FORCE_C_STD=          gnu99
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/comms/lrzsz/distinfo
diff -u pkgsrc/comms/lrzsz/distinfo:1.8 pkgsrc/comms/lrzsz/distinfo:1.9
--- pkgsrc/comms/lrzsz/distinfo:1.8     Tue Oct 26 10:06:01 2021
+++ pkgsrc/comms/lrzsz/distinfo Mon Apr 28 16:58:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:06:01 nia Exp $
+$NetBSD: distinfo,v 1.9 2025/04/28 16:58:51 tnn Exp $
 
 BLAKE2s (lrzsz-0.12.20.tar.gz) = 766a15967280bec3cb46771c17a12a00e844376f15a89ce02dcb778ae55fde4c
 SHA512 (lrzsz-0.12.20.tar.gz) = 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
@@ -6,4 +6,9 @@ Size (lrzsz-0.12.20.tar.gz) = 280938 byt
 SHA1 (patch-aa) = aaf33281da19658906eee6a922397968a200f186
 SHA1 (patch-ab) = 273f343a3e4ca8190ae4ab52483600f7bcf8e404
 SHA1 (patch-ac) = a224a77a6d9581c601a50ebe9153e6ad25c8601b
+SHA1 (patch-lib_error.c) = 19318de414b9fd3bc350aca66943ac6b23db79ba
+SHA1 (patch-lib_long-options.c) = aa6f8059bcd8b66f78de40587a8e4c58ca01692d
+SHA1 (patch-lib_xstrtol.c) = 0074e2b9dbf029f018f14abcd1497dcce82745a7
 SHA1 (patch-src_Makefile.in) = 8f95cfdf1525f27b1e860f2691559277dce62b32
+SHA1 (patch-src_lrz.c) = 249eaf57c2ccefb38292ed5ebceaddf04a1a488d
+SHA1 (patch-src_lsz.c) = dd92ba45ed2c9c865bf40b64be2cff224bebb497

Added files:

Index: pkgsrc/comms/lrzsz/patches/patch-lib_error.c
diff -u /dev/null pkgsrc/comms/lrzsz/patches/patch-lib_error.c:1.1
--- /dev/null   Mon Apr 28 16:58:51 2025
+++ pkgsrc/comms/lrzsz/patches/patch-lib_error.c        Mon Apr 28 16:58:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_error.c,v 1.1 2025/04/28 16:58:51 tnn Exp $
+
+replace K&R prototypes
+
+--- lib/error.c.orig   2025-04-28 16:40:26.017307162 +0000
++++ lib/error.c
+@@ -73,7 +73,7 @@ extern char *program_name;
+ 
+ # if HAVE_STRERROR
+ #  ifndef strerror            /* On some systems, strerror is a macro */
+-char *strerror ();
++char *strerror (int);
+ #  endif
+ # else
+ static char *
Index: pkgsrc/comms/lrzsz/patches/patch-lib_long-options.c
diff -u /dev/null pkgsrc/comms/lrzsz/patches/patch-lib_long-options.c:1.1
--- /dev/null   Mon Apr 28 16:58:51 2025
+++ pkgsrc/comms/lrzsz/patches/patch-lib_long-options.c Mon Apr 28 16:58:51 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-lib_long-options.c,v 1.1 2025/04/28 16:58:51 tnn Exp $
+
+replace K&R prototypes
+
+--- lib/long-options.c.orig    2025-04-28 16:41:33.100904926 +0000
++++ lib/long-options.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <getopt.h>
+ #include "long-options.h"
+ 
+@@ -38,8 +39,8 @@ void
+ parse_long_options (argc, argv,version, usage)
+      int argc;
+      char **argv;
+-     void (*version)();
+-     void (*usage)();
++     void (*version)(void);
++     void (*usage)(int);
+ {
+   int c;
+   int saved_opterr;
+@@ -60,7 +61,7 @@ parse_long_options (argc, argv,version,
+         (*usage) (0);
+ 
+       case 'v':
+-        (*version) (0);
++        (*version) ();
+         /* printf ("%s (%s) %s\n", command_name, package, version_string); */
+         exit (0);
+ 
Index: pkgsrc/comms/lrzsz/patches/patch-lib_xstrtol.c
diff -u /dev/null pkgsrc/comms/lrzsz/patches/patch-lib_xstrtol.c:1.1
--- /dev/null   Mon Apr 28 16:58:51 2025
+++ pkgsrc/comms/lrzsz/patches/patch-lib_xstrtol.c      Mon Apr 28 16:58:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_xstrtol.c,v 1.1 2025/04/28 16:58:51 tnn Exp $
+
+replace K&R prototypes
+
+--- lib/xstrtol.c.orig 2025-04-28 16:46:42.603541382 +0000
++++ lib/xstrtol.c
+@@ -65,7 +65,7 @@ extern int errno;
+       }                                                               \
+       while (0)
+ 
+-__unsigned long int __strtol ();
++__unsigned long int __strtol (const char*, char **, int);
+ 
+ /* FIXME: comment.  */
+ 
Index: pkgsrc/comms/lrzsz/patches/patch-src_lrz.c
diff -u /dev/null pkgsrc/comms/lrzsz/patches/patch-src_lrz.c:1.1
--- /dev/null   Mon Apr 28 16:58:51 2025
+++ pkgsrc/comms/lrzsz/patches/patch-src_lrz.c  Mon Apr 28 16:58:51 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_lrz.c,v 1.1 2025/04/28 16:58:51 tnn Exp $
+
+replace K&R prototypes
+
+--- src/lrz.c.orig     1998-12-30 07:49:24.000000000 +0000
++++ src/lrz.c
+@@ -42,9 +42,9 @@
+ #include "error.h"
+ 
+ #ifndef STRICT_PROTOTYPES
+-extern time_t time();
+-extern char *strerror();
+-extern char *strstr();
++extern time_t time(time_t*);
++extern char *strerror(int);
++extern char *strstr(const char *, const char*);
+ #endif
+ 
+ #ifndef HAVE_ERRNO_DECLARATION
Index: pkgsrc/comms/lrzsz/patches/patch-src_lsz.c
diff -u /dev/null pkgsrc/comms/lrzsz/patches/patch-src_lsz.c:1.1
--- /dev/null   Mon Apr 28 16:58:51 2025
+++ pkgsrc/comms/lrzsz/patches/patch-src_lsz.c  Mon Apr 28 16:58:51 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_lsz.c,v 1.1 2025/04/28 16:58:51 tnn Exp $
+
+replace K&R prototypes
+
+--- src/lsz.c.orig     2025-04-28 16:48:01.931477890 +0000
++++ src/lsz.c
+@@ -51,9 +51,9 @@ void *mm_addr=NULL;
+ #include "error.h"
+ 
+ #ifndef STRICT_PROTOTYPES
+-extern time_t time();
+-extern char *strerror();
+-extern char *strstr();
++extern time_t time(time_t *);
++extern char *strerror(int);
++extern char *strstr(const char*, const char*);
+ #endif
+ 
+ #ifndef HAVE_ERRNO_DECLARATION