CVS commit: pkgsrc/lang/intercal

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Dec 27 04:27:10 UTC 2021

Modified Files:
        pkgsrc/lang/intercal: Makefile distinfo
        pkgsrc/lang/intercal/patches: patch-src_lexer.l

Log Message:
lang/intercal: fix build on platforms where sizeof(bool) != sizeof(int)

(Might not have actually failed on all such platforms, so bump PKGREVISION.)


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/intercal/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/intercal/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/intercal/patches/patch-src_lexer.l

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

Modified files:

Index: pkgsrc/lang/intercal/Makefile
diff -u pkgsrc/lang/intercal/Makefile:1.16 pkgsrc/lang/intercal/Makefile:1.17
--- pkgsrc/lang/intercal/Makefile:1.16  Sun Nov  3 19:04:02 2019
+++ pkgsrc/lang/intercal/Makefile       Mon Dec 27 04:27:10 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2019/11/03 19:04:02 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/27 04:27:10 dholland Exp $
 #
 
 DISTNAME=      intercal-0.30
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://www.catb.org/~esr/intercal/
 

Index: pkgsrc/lang/intercal/distinfo
diff -u pkgsrc/lang/intercal/distinfo:1.13 pkgsrc/lang/intercal/distinfo:1.14
--- pkgsrc/lang/intercal/distinfo:1.13  Tue Oct 26 10:51:38 2021
+++ pkgsrc/lang/intercal/distinfo       Mon Dec 27 04:27:10 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:51:38 nia Exp $
+$NetBSD: distinfo,v 1.14 2021/12/27 04:27:10 dholland Exp $
 
 BLAKE2s (intercal-0.30.tar.gz) = 1e4b439f24f04e44b025329eb66deac44c72f3c83f6bc266a79773a84d44a660
 SHA512 (intercal-0.30.tar.gz) = e82f52082a73e0eb6116026f78fdcc38369f54af828b9ed0d3ca6ed6c40550bfa81db4ca7c4d09015b5db5104a1c06229cfed52e1d202c3a7443f933fbcc0498
@@ -6,4 +6,4 @@ Size (intercal-0.30.tar.gz) = 930759 byt
 SHA1 (patch-aa) = b6f7d5e4a46361f5af3ce3e1a646bc70c5b01ca6
 SHA1 (patch-ae) = bb28fb6edd30e5d3dd1c41b42a1784cadb9428b0
 SHA1 (patch-ag) = faf03857ad487796879632749489ad33b8648ba2
-SHA1 (patch-src_lexer.l) = 351d5a984d2de5e3e1f062b21609580bce090e4c
+SHA1 (patch-src_lexer.l) = 8a93803080d68824820f2f90ff146c90d25bbddb

Index: pkgsrc/lang/intercal/patches/patch-src_lexer.l
diff -u pkgsrc/lang/intercal/patches/patch-src_lexer.l:1.1 pkgsrc/lang/intercal/patches/patch-src_lexer.l:1.2
--- pkgsrc/lang/intercal/patches/patch-src_lexer.l:1.1  Wed Jan  4 12:52:40 2017
+++ pkgsrc/lang/intercal/patches/patch-src_lexer.l      Mon Dec 27 04:27:10 2021
@@ -1,7 +1,10 @@
-$NetBSD: patch-src_lexer.l,v 1.1 2017/01/04 12:52:40 jperkin Exp $
+$NetBSD: patch-src_lexer.l,v 1.2 2021/12/27 04:27:10 dholland Exp $
 
 Ensure the local yywrap is used.
 
+Use the right type for "clclex"; otherwise the link fails on some
+platforms. (And on others, the behavior is probably undefined...)
+
 --- src/lexer.l.orig   2010-09-01 22:29:25.000000000 +0000
 +++ src/lexer.l
 @@ -38,6 +38,7 @@ LICENSE TERMS
@@ -12,3 +15,12 @@ Ensure the local yywrap is used.
  #ifndef yywrap
  static int yywrap(void)
  {
+@@ -68,7 +69,7 @@ int sparkearslev = 0;
+    By default, the C-INTERCAL meanings are used; the extern variable clclex
+    causes CLC-INTERCAL interpretations to be put on the ambiguous symbols.
+    Otherwise, mixing syntaxes freely is allowed. */
+-extern int clclex;
++extern bool clclex;
+ 
+ #ifdef FLEX_SCANNER
+ static char linebuf[YY_BUF_SIZE];