CVS commit: pkgsrc/devel/cdecl

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Sep 29 20:48:53 UTC 2025

Modified Files:
        pkgsrc/devel/cdecl: distinfo
        pkgsrc/devel/cdecl/patches: patch-aa

Log Message:
Make build with GCC 14.

Include <readline/history.h> for history definitions.
Add dotmpfile_from_string() prototype.
Give main() a return type.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/cdecl/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/cdecl/patches/patch-aa

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

Modified files:

Index: pkgsrc/devel/cdecl/distinfo
diff -u pkgsrc/devel/cdecl/distinfo:1.17 pkgsrc/devel/cdecl/distinfo:1.18
--- pkgsrc/devel/cdecl/distinfo:1.17    Mon Apr 21 16:30:45 2025
+++ pkgsrc/devel/cdecl/distinfo Mon Sep 29 20:48:52 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2025/04/21 16:30:45 wiz Exp $
+$NetBSD: distinfo,v 1.18 2025/09/29 20:48:52 mrg Exp $
 
 BLAKE2s (cdecl-2.5.tar.gz) = 9161bcdc9381e8709597bd7a9368003e186580fc05922572a10070223bb7cf95
 SHA512 (cdecl-2.5.tar.gz) = 15495f5a794d11f964297c1f39f2f62f89778cd2e791b93f7e6cf16f321a71205a1f9366960f62b030022699e8abacaa5b402a304fb2eab8c00c83b9a4d0b419
 Size (cdecl-2.5.tar.gz) = 21435 bytes
-SHA1 (patch-aa) = a2916f21082d8da3bd9e9bb637aedd025d1ef309
+SHA1 (patch-aa) = 307dcbc080e1fa5b05f95bef93ea3748762c912b
 SHA1 (patch-ab) = f12ac884f95c9b241cda749b0ea50f6d69e1c6a4
 SHA1 (patch-cdgram.y) = b58b64a83aa01f4bfb18b7c927cae9d11f52482c

Index: pkgsrc/devel/cdecl/patches/patch-aa
diff -u pkgsrc/devel/cdecl/patches/patch-aa:1.12 pkgsrc/devel/cdecl/patches/patch-aa:1.13
--- pkgsrc/devel/cdecl/patches/patch-aa:1.12    Mon Apr 21 16:30:45 2025
+++ pkgsrc/devel/cdecl/patches/patch-aa Mon Sep 29 20:48:53 2025
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.12 2025/04/21 16:30:45 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2025/09/29 20:48:53 mrg Exp $
 
  - Don't issue own declarations of malloc, free, exit, perror, errno, getopt.
  - Use standard headers.
  - Avoid symbol conflicts with restrict, setprogname, getline.
  - Fix build with current readline.
+ - Adapt for GCC 14.
 
---- cdecl.c.orig       1996-01-16 03:54:46.000000000 +0000
-+++ cdecl.c
+--- cdecl.c.orig       1996-01-15 19:54:46.000000000 -0800
++++ cdecl.c    2025-09-25 10:40:24.758584770 -0700
 @@ -59,7 +59,9 @@
   */
  
@@ -32,7 +33,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
  #  define strrchr rindex
  #  define NOTMPFILE
  # else
-@@ -87,13 +90,12 @@ void free(), exit(), perror();
+@@ -87,13 +90,14 @@ void free(), exit(), perror();
  # endif /* NOVOID */
  #endif /* __STDC__ || DOS */
  
@@ -40,16 +41,18 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
 +
  #ifdef USE_READLINE
  # include <readline/readline.h>
++# include <readline/history.h>
    /* prototypes for functions related to readline() */
 -  char * getline();
 -  char ** attempt_completion(char *, int, int);
 -  char * keyword_completion(char *, int);
 -  char * command_completion(char *, int);
 +char * command_completion(const char *, int);
++int dotmpfile_from_string(char *s);
  #endif
  
  /* maximum # of chars from progname to display in prompt */
-@@ -124,7 +126,11 @@ char real_prompt[MAX_NAME+3];
+@@ -124,7 +128,11 @@ char real_prompt[MAX_NAME+3];
  
  #if __STDC__
    char *ds(char *), *cat(char *, ...), *visible(int);
@@ -61,7 +64,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
    int main(int, char **);
    int yywrap(void);
    int dostdin(void);
-@@ -138,7 +144,7 @@ char real_prompt[MAX_NAME+3];
+@@ -138,7 +146,7 @@ char real_prompt[MAX_NAME+3];
    void docast(char*, char*, char*, char*);
    void dodexplain(char*, char*, char*, char*);
    void docexplain(char*, char*, char*, char*);
@@ -70,7 +73,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
    int dotmpfile(int, char**), dofileargs(int, char**);
  #else
    char *ds(), *cat(), *visible();
-@@ -148,7 +154,7 @@ char real_prompt[MAX_NAME+3];
+@@ -148,7 +156,7 @@ char real_prompt[MAX_NAME+3];
    void unsupp(), notsupported();
    void yyerror();
    void doset(), dodeclare(), docast(), dodexplain(), docexplain();
@@ -79,7 +82,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
    int dotmpfile(), dofileargs();
  #endif /* __STDC__ */
    FILE *tmpfile();
-@@ -241,7 +247,7 @@ struct
+@@ -241,7 +249,7 @@ struct
  /* for unsupported combinations of types. */
  void mbcheck()
  {
@@ -88,7 +91,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
      char *t1, *t2;
  
      /* Loop through the types */
-@@ -258,26 +264,26 @@ void mbcheck()
+@@ -258,26 +266,26 @@ void mbcheck()
                if (!(modbits & crosstypes[j].bit))
                    continue;
                /* check the type of restriction */
@@ -121,7 +124,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
                    {
                    if (!RitchieFlag && !PreANSIFlag)
                        notsupported(" (ANSI Compiler)", t1, t2);
-@@ -286,7 +292,7 @@ void mbcheck()
+@@ -286,7 +294,7 @@ void mbcheck()
                    {
                    (void) fprintf (stderr,
                        "%s: Internal error in crosscheck[%d,%d]=%d!\n",
@@ -130,7 +133,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
                    exit(1); /* NOTREACHED */
                    }
                }
-@@ -375,7 +381,7 @@ char *options[] = {
+@@ -375,7 +383,7 @@ char *options[] = {
  static char *line_read = NULL;
  
  /* Read a string, and return a pointer to it.  Returns NULL on EOF. */
@@ -139,7 +142,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
  {
    /* If the buffer has already been allocated, return the memory
       to the free pool. */
-@@ -399,12 +405,12 @@ char ** attempt_completion(char *text, i
+@@ -399,12 +407,12 @@ char ** attempt_completion(char *text, i
  {
    char **matches = NULL;
  
@@ -154,7 +157,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
  {
    static int index, len;
    char *command;
-@@ -421,7 +427,7 @@ char * command_completion(char *text, in
+@@ -421,7 +429,7 @@ char * command_completion(char *text, in
    return NULL;
  }
  
@@ -163,7 +166,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
  {
    static int index, len, set, into;
    char *keyword, *option;
-@@ -803,7 +809,7 @@ void prompt()
+@@ -803,7 +811,7 @@ void prompt()
  }
  
  /* Save away the name of the program from argv[0] */
@@ -172,7 +175,7 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
  char *argv0;
  {
  #ifdef DOS
-@@ -887,7 +893,7 @@ int dostdin()
+@@ -887,7 +895,7 @@ int dostdin()
  
        if (!quiet) (void) printf("Type `help' or `?' for help\n");
        ret = 0;
@@ -181,7 +184,15 @@ $NetBSD: patch-aa,v 1.12 2025/04/21 16:3
            if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
                free(line);
                return ret;
-@@ -1251,11 +1257,11 @@ char **argv;
+@@ -1244,18 +1252,17 @@ void versions()
+     exit(0);
+ }
+ 
+-int main(argc, argv)
+-char **argv;
++int main(int argc, char **argv)
+ {
+     int c, ret = 0;
  
  #ifdef USE_READLINE
      /* install completion handlers */