CVS commit: pkgsrc/devel/splint

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jan 24 09:20:37 UTC 2025

Modified Files:
        pkgsrc/devel/splint: Makefile distinfo
Added Files:
        pkgsrc/devel/splint/patches: patch-src_Makefile.am
            patch-src_Makefile.in

Log Message:
devel/splint: USE_TOOLS+=bison and fix Bison>=3.6 compatibility.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/splint/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/splint/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/splint/patches/patch-src_Makefile.am \
    pkgsrc/devel/splint/patches/patch-src_Makefile.in

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

Modified files:

Index: pkgsrc/devel/splint/Makefile
diff -u pkgsrc/devel/splint/Makefile:1.24 pkgsrc/devel/splint/Makefile:1.25
--- pkgsrc/devel/splint/Makefile:1.24   Sat Dec 30 21:30:47 2023
+++ pkgsrc/devel/splint/Makefile        Fri Jan 24 09:20:37 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2023/12/30 21:30:47 zafer Exp $
+# $NetBSD: Makefile,v 1.25 2025/01/24 09:20:37 riastradh Exp $
 #
 
 DISTNAME=      splint-3.1.2.src
 PKGNAME=       ${DISTNAME:S/.src$//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  https://splint.org/downloads/
 EXTRACT_SUFX=  .tgz
@@ -16,7 +16,7 @@ LICENSE=      gnu-gpl-v2
 # mv: rename .deps/cgrammar.TPo to .deps/cgrammar.Po: No such file or directory
 MAKE_JOBS_SAFE=                no
 
-USE_TOOLS+=    gmake lex
+USE_TOOLS+=    bison gmake lex
 GNU_CONFIGURE= YES
 USE_LANGUAGES= c99
 AUTO_MKDIRS=   yes

Index: pkgsrc/devel/splint/distinfo
diff -u pkgsrc/devel/splint/distinfo:1.14 pkgsrc/devel/splint/distinfo:1.15
--- pkgsrc/devel/splint/distinfo:1.14   Tue Oct 26 10:19:57 2021
+++ pkgsrc/devel/splint/distinfo        Fri Jan 24 09:20:37 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:19:57 nia Exp $
+$NetBSD: distinfo,v 1.15 2025/01/24 09:20:37 riastradh Exp $
 
 BLAKE2s (splint-3.1.2.src.tgz) = f01ee7c70e5c157c7143687708a1d093da7d7484713574484379dfe06d7276bb
 SHA512 (splint-3.1.2.src.tgz) = 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
@@ -6,4 +6,6 @@ Size (splint-3.1.2.src.tgz) = 2284033 by
 SHA1 (patch-aa) = b1504db4985b3f3533c4ca8a195edb4a1c8852b6
 SHA1 (patch-src-exprNode.c) = 6b8e87e19f3727e66cc7ef004dd2451da6c7c64a
 SHA1 (patch-src_Headers_scan_h) = 9d286990abcad9f3df49c19c6302f1a4a590ee1b
+SHA1 (patch-src_Makefile.am) = 506a9f9af1871f32533f79d029e2e733fb56374f
+SHA1 (patch-src_Makefile.in) = c732ccae897ebe865f6795bc273ec51681f35de8
 SHA1 (patch-src_osd.c) = 84499ef0e9bd23ea89dcb14b8951fa0dfcfed198

Added files:

Index: pkgsrc/devel/splint/patches/patch-src_Makefile.am
diff -u /dev/null pkgsrc/devel/splint/patches/patch-src_Makefile.am:1.1
--- /dev/null   Fri Jan 24 09:20:37 2025
+++ pkgsrc/devel/splint/patches/patch-src_Makefile.am   Fri Jan 24 09:20:37 2025
@@ -0,0 +1,54 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2025/01/24 09:20:37 riastradh Exp $
+
+Don't delete $GRAM.tab.h files created by bison.  Older versions of
+Bison copied the $GRAM.tab.h files verbatim into the $GRAM.tab.c files,
+but versions of Bison since 3.6 instead use #include "$GRAM.tab.h",
+which requires us not to delete the .tab.h file.
+
+--- src/Makefile.am.orig       2003-06-10 05:58:24.000000000 +0000
++++ src/Makefile.am
+@@ -295,7 +295,7 @@ signature.c.der:
+         $(CP) signature.c signature.c.der; \
+         $(MV) Headers/signature_gen.h Headers/signature_gen.bak || true; \
+         $(CAT) bison.head signature.tab.h bison.reset >Headers/signature_gen.h; \
+-        $(RM) signature.tab.c signature.tab.h; \
++        $(RM) signature.tab.c; \
+       fi
+ 
+ Headers/signature_gen.h signature.c: signature.c.der signature.y
+@@ -308,7 +308,7 @@ Headers/signature_gen.h signature.c: sig
+         $(CP) signature.c signature.c.der; \
+         $(MV) Headers/signature_gen.h Headers/signature_gen.bak; \
+         $(CAT) bison.head signature.tab.h bison.reset >Headers/signature_gen.h; \
+-        $(RM) signature.tab.c signature.tab.h; \
++        $(RM) signature.tab.c; \
+       fi
+ 
+ ## 11/29/001 drl added copy so that the file cgrammar.c.der is created
+@@ -324,7 +324,7 @@ Headers/cgrammar_tokens.h cgrammar.c: cg
+         $(CP) cgrammar.c cgrammar.c.der; \
+         $(MV) Headers/cgrammar_tokens.h Headers/cgrammar_tokens.bak || true; \
+         $(CAT) bison.head cgrammar.tab.h bison.reset | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' > Headers/cgrammar_tokens.h; \
+-        $(RM) cgrammar.tab.c cgrammar.tab.h; \
++        $(RM) cgrammar.tab.c; \
+       fi
+ 
+ ## 10/16/001 drl added copy so that the file mtgrammar.c.der is created
+@@ -341,7 +341,7 @@ Headers/mtgrammar_tokens.h mtgrammar.c: 
+         $(CP) mtgrammar.c mtgrammar.c.der; \
+         $(MV) Headers/mtgrammar_tokens.h Headers/mtgrammar_tokens.bak; \
+         $(CAT) bison.head mtgrammar.tab.h bison.reset >Headers/mtgrammar_tokens.h; \
+-        $(RM) mtgrammar.tab.c mtgrammar.tab.h; \
++        $(RM) mtgrammar.tab.c; \
+       fi
+ 
+ ## 11/29/001 drl added copy so that the file llgrammar.c.der is created
+@@ -359,7 +359,7 @@ Headers/llgrammar_gen.h Headers/llgramma
+         $(CAT) bison.head llgrammar.tab.h bison.reset >Headers/llgrammar_gen2.h; \
+         $(MV) Headers/llgrammar_gen.h Headers/llgrammar_gen.bak; \
+         $(CAT) bison.head llgrammar.tab.h bison.reset >Headers/llgrammar_gen.h; \
+-        $(RM) llgrammar.tab.c llgrammar.tab.h; \
++        $(RM) llgrammar.tab.c; \
+       fi
+ 
+ cscanner.c: cscanner.l
Index: pkgsrc/devel/splint/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/devel/splint/patches/patch-src_Makefile.in:1.1
--- /dev/null   Fri Jan 24 09:20:37 2025
+++ pkgsrc/devel/splint/patches/patch-src_Makefile.in   Fri Jan 24 09:20:37 2025
@@ -0,0 +1,54 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2025/01/24 09:20:37 riastradh Exp $
+
+Don't delete $GRAM.tab.h files created by bison.  Older versions of
+Bison copied the $GRAM.tab.h files verbatim into the $GRAM.tab.c files,
+but versions of Bison since 3.6 instead use #include "$GRAM.tab.h",
+which requires us not to delete the .tab.h file.
+
+--- src/Makefile.in.orig       2007-07-13 21:42:42.000000000 +0000
++++ src/Makefile.in
+@@ -1036,7 +1036,7 @@ signature.c.der:
+         $(CP) signature.c signature.c.der; \
+         $(MV) Headers/signature_gen.h Headers/signature_gen.bak || true; \
+         $(CAT) bison.head signature.tab.h bison.reset >Headers/signature_gen.h; \
+-        $(RM) signature.tab.c signature.tab.h; \
++        $(RM) signature.tab.c; \
+       fi
+ 
+ Headers/signature_gen.h signature.c: signature.c.der signature.y
+@@ -1049,7 +1049,7 @@ Headers/signature_gen.h signature.c: sig
+         $(CP) signature.c signature.c.der; \
+         $(MV) Headers/signature_gen.h Headers/signature_gen.bak; \
+         $(CAT) bison.head signature.tab.h bison.reset >Headers/signature_gen.h; \
+-        $(RM) signature.tab.c signature.tab.h; \
++        $(RM) signature.tab.c; \
+       fi
+ 
+ Headers/cgrammar_tokens.h cgrammar.c: cgrammar.c.der cgrammar.y bison.head bison.reset
+@@ -1063,7 +1063,7 @@ Headers/cgrammar_tokens.h cgrammar.c: cg
+         $(CP) cgrammar.c cgrammar.c.der; \
+         $(MV) Headers/cgrammar_tokens.h Headers/cgrammar_tokens.bak || true; \
+         $(CAT) bison.head cgrammar.tab.h bison.reset | $(SED) 's/YYSTYPE/cgrammar_YYSTYPE/g' | $(SED) 's/lsllex/cgrammar_lsllex/g' > Headers/cgrammar_tokens.h; \
+-        $(RM) cgrammar.tab.c cgrammar.tab.h; \
++        $(RM) cgrammar.tab.c; \
+       fi
+ 
+ Headers/mtgrammar_tokens.h mtgrammar.c: mtgrammar.y
+@@ -1077,7 +1077,7 @@ Headers/mtgrammar_tokens.h mtgrammar.c: 
+         $(CP) mtgrammar.c mtgrammar.c.der; \
+         $(MV) Headers/mtgrammar_tokens.h Headers/mtgrammar_tokens.bak; \
+         $(CAT) bison.head mtgrammar.tab.h bison.reset >Headers/mtgrammar_tokens.h; \
+-        $(RM) mtgrammar.tab.c mtgrammar.tab.h; \
++        $(RM) mtgrammar.tab.c; \
+       fi
+ 
+ Headers/llgrammar_gen.h Headers/llgrammar_gen2.h llgrammar.c: llgrammar.c.der llgrammar.y
+@@ -1093,7 +1093,7 @@ Headers/llgrammar_gen.h Headers/llgramma
+         $(CAT) bison.head llgrammar.tab.h bison.reset >Headers/llgrammar_gen2.h; \
+         $(MV) Headers/llgrammar_gen.h Headers/llgrammar_gen.bak; \
+         $(CAT) bison.head llgrammar.tab.h bison.reset >Headers/llgrammar_gen.h; \
+-        $(RM) llgrammar.tab.c llgrammar.tab.h; \
++        $(RM) llgrammar.tab.c; \
+       fi
+ 
+ cscanner.c: cscanner.l