CVS commit: pkgsrc/lang/cparser

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat Dec 25 21:45:43 UTC 2021

Modified Files:
        pkgsrc/lang/cparser: distinfo
        pkgsrc/lang/cparser/patches: patch-aa

Log Message:
Fix broken build of lang/cparser; escaping hashes in gmake broke


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/cparser/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/cparser/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/lang/cparser/distinfo
diff -u pkgsrc/lang/cparser/distinfo:1.9 pkgsrc/lang/cparser/distinfo:1.10
--- pkgsrc/lang/cparser/distinfo:1.9    Tue Oct 26 10:51:32 2021
+++ pkgsrc/lang/cparser/distinfo        Sat Dec 25 21:45:42 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:51:32 nia Exp $
+$NetBSD: distinfo,v 1.10 2021/12/25 21:45:42 dholland Exp $
 
 BLAKE2s (cparser-0.9.14.tar.bz2) = e60945b7527dfef5494cc174f790ae2ec068bc5796ff5a7f92b3b82150131868
 SHA512 (cparser-0.9.14.tar.bz2) = 1bd436c9e2a36cb60341c62e9bb65e16dbc5f777918c3f43795c36321a5a8ce4cdf261469c2e45e329cd8560ccec44becffab2f924cd9d9bd9ff2d46d93ca4e9
 Size (cparser-0.9.14.tar.bz2) = 193745 bytes
-SHA1 (patch-aa) = 9f1f39561a6ffdaeb9dfc3d64934e8cdca501e3b
+SHA1 (patch-aa) = 0a4aad62586804811f4feea5356d3da136ddf036

Index: pkgsrc/lang/cparser/patches/patch-aa
diff -u pkgsrc/lang/cparser/patches/patch-aa:1.5 pkgsrc/lang/cparser/patches/patch-aa:1.6
--- pkgsrc/lang/cparser/patches/patch-aa:1.5    Tue Dec 29 23:34:45 2015
+++ pkgsrc/lang/cparser/patches/patch-aa        Sat Dec 25 21:45:43 2021
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2015/12/29 23:34:45 dholland Exp $
+$NetBSD: patch-aa,v 1.6 2021/12/25 21:45:43 dholland Exp $
 
 Configure for pkgsrc.
 Use libtool.
+Fix escaping creating revision.h.
 
 --- Makefile.orig      2012-11-21 17:50:43.000000000 +0000
 +++ Makefile
@@ -33,7 +34,18 @@ Use libtool.
  
  Q = @
  
-@@ -113,7 +113,7 @@ UNUSED := $(shell mkdir -p $(DIRS) $(DIR
+@@ -103,8 +103,9 @@ config.h:
+ REVISION ?= $(shell git describe --abbrev=40 --always --dirty --match '')
+ 
+ # Update revision.h if necessary
++HASH=\#
+ UNUSED := $(shell \
+-      REV="\#define cparser_REVISION \"$(REVISION)\""; \
++      REV="${HASH}define cparser_REVISION \"$(REVISION)\""; \
+       echo "$$REV" | cmp -s - revision.h 2> /dev/null || echo "$$REV" > revision.h \
+ )
+ 
+@@ -113,7 +114,7 @@ UNUSED := $(shell mkdir -p $(DIRS) $(DIR
  
  $(GOAL): $(LIBFIRM_FILE) $(cparser_OBJECTS)
        @echo "===> LD $@"
@@ -42,7 +54,7 @@ Use libtool.
  
  ifneq ("$(LIBFIRM_FILE)", "")
  ifneq ("$(MAKECMDGOALS)", "clean")
-@@ -144,33 +144,33 @@ bootstrap2: cparser.bootstrap2
+@@ -144,33 +145,33 @@ bootstrap2: cparser.bootstrap2
        @echo '===> CPARSER $<'
        $(Q)./cparser $(CPPFLAGS) -fsyntax-only $<