CVS commit: pkgsrc/devel/unidiff

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Sep 29 20:45:38 UTC 2025

Modified Files:
        pkgsrc/devel/unidiff: distinfo
Added Files:
        pkgsrc/devel/unidiff/patches: patch-unify.c patch-unipatch.c

Log Message:
fix the build with GCC 14.

don't manually define libc functions, include standard headers
give main a return type.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/unidiff/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/unidiff/patches/patch-unify.c \
    pkgsrc/devel/unidiff/patches/patch-unipatch.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/unidiff/distinfo
diff -u pkgsrc/devel/unidiff/distinfo:1.7 pkgsrc/devel/unidiff/distinfo:1.8
--- pkgsrc/devel/unidiff/distinfo:1.7   Fri Jul 15 02:51:20 2022
+++ pkgsrc/devel/unidiff/distinfo       Mon Sep 29 20:45:37 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2022/07/15 02:51:20 nat Exp $
+$NetBSD: distinfo,v 1.8 2025/09/29 20:45:37 mrg Exp $
 
 BLAKE2s (unidiff-1.1.zip) = 55b10e58778242c10e94a193fc3a386b3c488ef050770f300ac017f2fdd7bfdf
 SHA512 (unidiff-1.1.zip) = 395fc527fb77a468f6fef4dbbfe4bca0e0764de56b612ed407a00f1548853292626cacfb4173bf82f9da5ee193d510d0592b9d81136e282d5fb53a695abf2d11
 Size (unidiff-1.1.zip) = 14412 bytes
+SHA1 (patch-unify.c) = d223ac5973a6879c7f927b247df0cb4338514c74
+SHA1 (patch-unipatch.c) = b46fbac81a8208fb6544585cc141f9ab124204cb

Added files:

Index: pkgsrc/devel/unidiff/patches/patch-unify.c
diff -u /dev/null pkgsrc/devel/unidiff/patches/patch-unify.c:1.1
--- /dev/null   Mon Sep 29 20:45:38 2025
+++ pkgsrc/devel/unidiff/patches/patch-unify.c  Mon Sep 29 20:45:38 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-unify.c,v 1.1 2025/09/29 20:45:38 mrg Exp $
+
+Fix compilation with GCC 14.
+
+--- unify.c.orig       2022-07-11 18:28:40.000000000 -0700
++++ unify.c    2025-09-25 10:49:58.011813558 -0700
+@@ -9,8 +9,8 @@
+ */
+ 
+ #include <stdio.h>
+-
+-extern char *malloc();
++#include <stdlib.h>
++#include <string.h>
+ 
+ #define FIND_NEXT     0
+ #define PARSE_UNIDIFF 1
Index: pkgsrc/devel/unidiff/patches/patch-unipatch.c
diff -u /dev/null pkgsrc/devel/unidiff/patches/patch-unipatch.c:1.1
--- /dev/null   Mon Sep 29 20:45:38 2025
+++ pkgsrc/devel/unidiff/patches/patch-unipatch.c       Mon Sep 29 20:45:38 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-unipatch.c,v 1.1 2025/09/29 20:45:38 mrg Exp $
+
+Fix compilation with GCC 14.
+
+--- unipatch.c.orig    2022-07-11 18:28:40.000000000 -0700
++++ unipatch.c 2025-09-25 10:50:30.824061017 -0700
+@@ -3,12 +3,15 @@
+ for patch. Version 1.1. Author: davison%borland.com@localhost
+ */
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
+ #define ERR(a) {fputs(a,stderr);exit(1);}
+ #define NUM(x) {for(x=0;*cp<='9'&&*cp>='0';)x=x*10+*cp++-'0';ch= *cp++;}
+ struct Ln {struct Ln *lk; char t; char s[1];} r,*h,*ln;
+-char bf[2048],*cp,ch,*malloc();
++char bf[2048],*cp,ch;
+ long os,ol,ns,nl,ne,lncnt;
+-main()
++void main()
+ {
+  for(;;){
+   for(;;){