CVS commit: pkgsrc/misc/chord

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 19 14:51:40 UTC 2026

Modified Files:
        pkgsrc/misc/chord: Makefile distinfo
        pkgsrc/misc/chord/patches: patch-ab
Added Files:
        pkgsrc/misc/chord/patches: patch-chord.c patch-grid.c

Log Message:
chord: Fix build with recent GCC


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/misc/chord/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/chord/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/chord/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/chord/patches/patch-chord.c \
    pkgsrc/misc/chord/patches/patch-grid.c

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

Modified files:

Index: pkgsrc/misc/chord/Makefile
diff -u pkgsrc/misc/chord/Makefile:1.15 pkgsrc/misc/chord/Makefile:1.16
--- pkgsrc/misc/chord/Makefile:1.15     Mon Oct  8 09:57:17 2012
+++ pkgsrc/misc/chord/Makefile  Thu Mar 19 14:51:40 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 09:57:17 asau Exp $
+# $NetBSD: Makefile,v 1.16 2026/03/19 14:51:40 nia Exp $
 
 DISTNAME=      chord
 PKGNAME=       chord-3.6
@@ -8,6 +8,8 @@ MASTER_SITES=   ${MASTER_SITE_LOCAL}
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Produce PS sheet-music from text input
 
+FORCE_C_STD=   gnu89
+
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 CFLAGS+=       -DPAPERSIZE=${PAPERSIZE}

Index: pkgsrc/misc/chord/distinfo
diff -u pkgsrc/misc/chord/distinfo:1.10 pkgsrc/misc/chord/distinfo:1.11
--- pkgsrc/misc/chord/distinfo:1.10     Tue Oct 26 10:58:59 2021
+++ pkgsrc/misc/chord/distinfo  Thu Mar 19 14:51:40 2026
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:58:59 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/03/19 14:51:40 nia Exp $
 
 BLAKE2s (chord.tar.gz) = 0e6265987f2486dcdc31e70b1b865e5e6ab4a28b02c1f512685194570a8bb62c
 SHA512 (chord.tar.gz) = 38ed39ac3a6025afdfa06d0640aaf5578026e0935fd0f37adbf268c44394f4807e61edf961d8af3cc9fbc2ec24a749375dff07d24a0e37e0504b2e408ecd2b14
 Size (chord.tar.gz) = 74809 bytes
 SHA1 (patch-aa) = 81b38beb41687d49c1b531524db899d6cf856e86
-SHA1 (patch-ab) = d99fade958792cf1b31905d5b685b6cbfd699585
+SHA1 (patch-ab) = c21cfb617b71e8d89a5b476db569adc78f536fae
+SHA1 (patch-chord.c) = fd26871821006584009354e9cc94bbf1dc84718e
+SHA1 (patch-grid.c) = 4b4ae357709189263526745e4ab20211eda2f8d7

Index: pkgsrc/misc/chord/patches/patch-ab
diff -u pkgsrc/misc/chord/patches/patch-ab:1.1 pkgsrc/misc/chord/patches/patch-ab:1.2
--- pkgsrc/misc/chord/patches/patch-ab:1.1      Sun Jul 22 01:16:58 2001
+++ pkgsrc/misc/chord/patches/patch-ab  Thu Mar 19 14:51:40 2026
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.1 2001/07/22 01:16:58 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2026/03/19 14:51:40 nia Exp $
 
---- chord.h.orig       Tue Apr 25 03:04:47 1995
-+++ chord.h    Sat Jul 21 19:09:19 2001
-@@ -11,7 +11,7 @@
+--- chord.h.orig       1995-04-25 07:04:47.000000000 +0000
++++ chord.h
+@@ -1,6 +1,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <ctype.h>
+ 
+ #include "patchlevel.h"
+ 
+@@ -11,7 +13,7 @@
  #define MAXFONTS 16   /* Maximum number of different fonts in one execution */
  #define MAXTOKEN 256
  #define MAX_CHORD 1024
@@ -11,3 +20,16 @@ $NetBSD: patch-ab,v 1.1 2001/07/22 01:16
  #define MAXNOTE 8
  
  #define LONG_FINGERS  4
+@@ -112,6 +114,12 @@ void read_chordrc();
+ void set_chord_font();
+ void use_chord_font();
+ void use_text_font();
++void init_values();
++void clean_known_chords();
++void clean_chordtab();
++void count_known_chords();
++void learn_chord();
++int chordcompare();
+ 
+ #ifdef  __STDC__
+ struct chord_struct *add_to_chordtab(char *chord);

Added files:

Index: pkgsrc/misc/chord/patches/patch-chord.c
diff -u /dev/null pkgsrc/misc/chord/patches/patch-chord.c:1.1
--- /dev/null   Thu Mar 19 14:51:40 2026
+++ pkgsrc/misc/chord/patches/patch-chord.c     Thu Mar 19 14:51:40 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-chord.c,v 1.1 2026/03/19 14:51:40 nia Exp $
+
+Modern GCC no longer likes implicit int.
+
+--- chord.c.orig       2026-03-19 14:35:14.384006460 +0000
++++ chord.c
+@@ -1124,6 +1124,7 @@ void read_chordrc()
+ 
+ 
+ /* --------------------------------------------------------------------------------*/
++int
+ main(argc, argv)
+ int argc;
+ char **argv;
Index: pkgsrc/misc/chord/patches/patch-grid.c
diff -u /dev/null pkgsrc/misc/chord/patches/patch-grid.c:1.1
--- /dev/null   Thu Mar 19 14:51:40 2026
+++ pkgsrc/misc/chord/patches/patch-grid.c      Thu Mar 19 14:51:40 2026
@@ -0,0 +1,40 @@
+$NetBSD: patch-grid.c,v 1.1 2026/03/19 14:51:40 nia Exp $
+
+Modern GCC no longer likes implicit int.
+
+--- grid.c.orig        1995-04-25 07:04:38.000000000 +0000
++++ grid.c
+@@ -296,7 +296,7 @@ void draw_chords()
+       }
+ 
+ /*--------------------------------------------------------------------------------*/
+-clean_chordtab()
++void clean_chordtab()
+       {
+       struct chord_struct *ct_ptr, *ct_next; 
+       ct_ptr= so_chordtab;
+@@ -311,7 +311,7 @@ clean_chordtab()
+       }
+ 
+ /*--------------------------------------------------------------------------------*/
+-clean_known_chords()
++void clean_known_chords()
+       {
+       struct kcs *kc_ptr, **prev_kc_ptr;
+ 
+@@ -334,6 +334,7 @@ clean_known_chords()
+               }
+       }
+ /*--------------------------------------------------------------------------------*/
++void
+ count_known_chords() /* Debugging routines only */
+       {
+       struct kcs *kc_ptr;
+@@ -359,6 +360,7 @@ count_known_chords() /* Debugging routin
+       fprintf (stderr, "%d builtin, %d in chordrc, %d in song\n", int_count, rc_count, song_count);  
+       }
+ /*--------------------------------------------------------------------------------*/
++void
+ learn_chord(chord, s1, s2, s3, s4, s5, s6, displ, origin, difficult)
+ char  *chord;
+ int   displ;