From 14fff9f15033dacec31e78adf59cf7d680b58ed3 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sun, 9 May 2004 14:36:27 +0000
Subject: remove an extraneous ; from a grammar rule which was causing yacc(1)
 on Solaris to barf.

---
 wm/ctwm/distinfo         | 4 ++--
 wm/ctwm/patches/patch-aa | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'wm')

diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index 2fd575125d5..d16d47969c5 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2003/10/19 07:06:33 grant Exp $
+$NetBSD: distinfo,v 1.8 2004/05/09 14:36:27 grant Exp $
 
 SHA1 (ctwm-3.6.tar.gz) = 8a8cefd2273c748fd7ceded4c3553e5ca7a994ec
 Size (ctwm-3.6.tar.gz) = 370563 bytes
 SHA1 (ctwm-3.6-xpm.tar.gz) = dfe7331dba041eff70d561b728ca8d7a16f68ca6
 Size (ctwm-3.6-xpm.tar.gz) = 246505 bytes
-SHA1 (patch-aa) = e021a1b029df3a080478a575e10eccf5c18b01a1
+SHA1 (patch-aa) = f1feb6e3c932018669afac774397dae2f7b06b44
 SHA1 (patch-ab) = e03e595241ae1e1bc412772c6805ee115aad80d0
 SHA1 (patch-ac) = 99a28b20904207693a4f25aafaaac447dbcdca95
 SHA1 (patch-ad) = d455a80205f07baf3789a5e8b2506e5c42429b85
diff --git a/wm/ctwm/patches/patch-aa b/wm/ctwm/patches/patch-aa
index 3b193be130e..4bf76cf8487 100644
--- a/wm/ctwm/patches/patch-aa
+++ b/wm/ctwm/patches/patch-aa
@@ -1,17 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2003/10/19 07:06:33 grant Exp $
+$NetBSD: patch-aa,v 1.4 2004/05/09 14:36:27 grant Exp $
 
 --- gram.y.orig	2001-12-12 02:38:52.000000000 +1100
 +++ gram.y
-@@ -419,7 +419,7 @@ stmt		: error
+@@ -419,7 +419,6 @@ stmt		: error
  		| WINDOW_RING		{ list = &Scr->WindowRingL; }
  		  win_list
  		| WINDOW_RING           { Scr->WindowRingAll = TRUE; }
 -		;
-+		{ }
  		| WINDOW_RING_EXCLUDE    { if (!Scr->WindowRingL)
  		                              Scr->WindowRingAll = TRUE;
  		                          list = &Scr->WindowRingExcludeL; }
-@@ -683,7 +683,7 @@ wingeom_entries	: /* Empty */
+@@ -683,7 +682,7 @@ wingeom_entries	: /* Empty */
  		| wingeom_entries wingeom_entry
  		;
  
-- 
cgit v1.2.3