Escape braces in gawk regexps; otherwise they become interval

expressions, and the latest gawk doesn't like invalid interval
expressions much.

2 files changed, 55 insertions, 1 deletions

diff --git a/devel/gps/distinfo b/devel/gps/distinfo
index e14495765f4..229294e49d1 100644
--- a/devel/gps/distinfo
+++ b/devel/gps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/01/29 01:16:24 marino Exp $
+$NetBSD: distinfo,v 1.5 2012/03/27 21:49:51 dholland Exp $
 
 SHA1 (gps-5.0.1.tar.bz2) = 5fc7fba2d80b2b405c60b0a4ecc6c4d2792a3829
 RMD160 (gps-5.0.1.tar.bz2) = 17d90cd493cca50a70ebb4118b69ebba759b964a
@@ -12,4 +12,5 @@ SHA1 (patch-ak) = 415e7a0017ce22fa28657dcafabc6ebc7c151582
 SHA1 (patch-al) = cf6fb268ebce1895c22686c987d24a4f031aba01
 SHA1 (patch-am) = bb0257d86161abd39d9d8a952a0a20d921d401dc
 SHA1 (patch-an) = 9a12bfd2950fe4fc06a72f5970ff125cdddb6f82
+SHA1 (patch-distrib_gnat__switches_awk) = d3e3ad94662fa3a8a32237e0cd630d071f153267
 SHA1 (patch-gps_gps.gpr) = fbcb7d38a0910d24a14f30b982a85f2c89c2828a
diff --git a/devel/gps/patches/patch-distrib_gnat__switches_awk b/devel/gps/patches/patch-distrib_gnat__switches_awk
new file mode 100644
index 00000000000..65b47ad3522
--- /dev/null
+++ b/devel/gps/patches/patch-distrib_gnat__switches_awk
@@ -0,0 +1,53 @@
+$NetBSD: patch-distrib_gnat__switches_awk,v 1.1 2012/03/27 21:49:52 dholland Exp $
+
+Escape braces in gawk regexps; otherwise they become interval
+expressions, and the latest gawk doesn't like invalid interval
+expressions much.
+
+--- distrib/gnat_switches.awk~	2008-06-30 07:58:03.000000000 +0000
++++ distrib/gnat_switches.awk
+@@ -44,9 +44,9 @@ warnings == 1 && st > 0 && st < 4 && /^@
+ 
+ # print the short comment. Do this after all previous handling of st == 3, as
+ # we don't want them to analyse the current string.
+-warnings == 1 && st == 2 && /^@emph{/ {
+-    sub (/@emph{/, "         \"\"\"",$0)
+-    sub (/}$/, "\"\"\", \n         \"\"\"",$0)
++warnings == 1 && st == 2 && /^@emph\{/ {
++    sub (/@emph\{/, "         \"\"\"",$0)
++    sub (/\}$/, "\"\"\", \n         \"\"\"",$0)
+     printf ("%s", $0)
+     prev=""
+     itemize=0
+@@ -99,12 +99,12 @@ styles == 1 && /@item / {
+     st = 2
+ }
+ 
+-(validity == 1 || styles == 1) && st == 2 && /^@emph{/ {
+-    sub (/@emph{/, "         \"\"\"",$0)
+-    sub (/}$/, "\"\"\", \n         \"\"\"",$0)
++(validity == 1 || styles == 1) && st == 2 && /^@emph\{/ {
++    sub (/@emph\{/, "         \"\"\"",$0)
++    sub (/\}$/, "\"\"\", \n         \"\"\"",$0)
+     # remove any @code{sth} or other texi commands from the short description.
+-    sub (/@[^{]*{/,"",$0)
+-    sub (/}/,"",$0)
++    sub (/@[^\{]*\{/,"",$0)
++    sub (/\}/,"",$0)
+     printf ("%s", $0)
+     prev=""
+     itemize=0
+@@ -176,10 +176,10 @@ st == 3 {
+     gsub (/</, "\\&lt;", $0)
+     gsub (/>/, "\\&gt;", $0)
+     gsub (/\"/, "'", $0)
+-    gsub (/@dots{}/,"..",$0)
++    gsub (/@dots\{\}/,"..",$0)
+     # remove all @foo{}
+-    gsub (/@[^ {]*{/,"",$0)
+-    gsub (/}/,"",$0)
++    gsub (/@[^ \{]*\{/,"",$0)
++    gsub (/\}/,"",$0)
+     gsub (/@ifclear [^ ]*/,"",$0)
+     gsub (/@end [^ ]*/,"",$0)
+     gsub (/@[^ ]*/,"",$0)