Change the bison patches to the version that was agreed on in the

OpenOffice.org project. This also fixes compilation problems with
bison-1.34.

14 files changed, 236 insertions, 33 deletions

diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo
index 3d3cfa2d96d..b84ec4844cd 100644
--- a/misc/openoffice/distinfo
+++ b/misc/openoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/03/02 09:12:13 mrauch Exp $
+$NetBSD: distinfo,v 1.8 2002/03/29 21:00:10 mrauch Exp $
 
 SHA1 (oo_641_src.tar.bz2) = ad4c7000cf317d7e9d694a6d519336bfaf1f8edd
 Size (oo_641_src.tar.bz2) = 109167758 bytes
@@ -90,9 +90,9 @@ SHA1 (patch-dc) = 0dfbab80794ce167c2a946af0c48fd3b91a12523
 SHA1 (patch-dd) = 7c798e377cb7fc07bb120f4c71908336280671a0
 SHA1 (patch-de) = 6d3f2dc02daa3db1304759d1cda917adda52d943
 SHA1 (patch-df) = 8da1d41c6049f3229e3fadf5724ca2c009ea447a
-SHA1 (patch-dg) = 2b7a85ddcdcffc21df6254476d6e1331f04017c8
-SHA1 (patch-dh) = 0ac90ec074019827630011b0b2da1ad4cd0f1b0d
-SHA1 (patch-di) = 11d55d8dc30e0d1ed1428aadc87a2b5c9c4e3a50
+SHA1 (patch-dg) = 92818574839ebf847c186d8e6b1e6b519b66f10e
+SHA1 (patch-dh) = 43880bef06e81bb14d754a811615d5d588698270
+SHA1 (patch-di) = 682a09127b541cbd76686b8b273504a9899b5bf4
 SHA1 (patch-dj) = 90dbbcd6eb4ac5678e89187a93b68854dea33337
 SHA1 (patch-dk) = 167a6387f30c42fbd96c4846070c1f82bff2457c
 SHA1 (patch-dl) = 37c7f04c87b79c3dc3cec9a18e1130caf3b37f5b
@@ -105,3 +105,13 @@ SHA1 (patch-dr) = 131d0524c603fc464c36c1b734156f327cfb3c69
 SHA1 (patch-ds) = 830671879deee77426a9e7cab76f851f4509d4c1
 SHA1 (patch-dt) = 2fbaef452d3bd62332ee0203f7f824daa30dd8d0
 SHA1 (patch-du) = 9b66de11bead7db72a85a927fe2fcb1fa621fd4a
+SHA1 (patch-dv) = da52678b44272da6cdcf718889478c33e865f762
+SHA1 (patch-dw) = 2bf4049da24e43e0005e1874a204c83cacaf188c
+SHA1 (patch-dx) = 82c1224a376f75dad5bafb08126df213b92a4ba6
+SHA1 (patch-dy) = 21ed34cdb703eb5f8384138f6b65ac142caa4bf5
+SHA1 (patch-dz) = f8577856d5567167d8362a3b5b9de49e98d60087
+SHA1 (patch-ea) = 2151dcfbf0ceb9cbfd480308552bfec2cfcef875
+SHA1 (patch-eb) = 5c92c48896b528c9ba160d605b08886420db9105
+SHA1 (patch-ec) = 99203cfaae8432ae4b83a7e31eee23dd419e0ade
+SHA1 (patch-ed) = 1e1483e78b42bf8489f871a745eb71e63b8b435a
+SHA1 (patch-ee) = c7e9cf634734d0c280544ff509b3726a72600805
diff --git a/misc/openoffice/patches/patch-dg b/misc/openoffice/patches/patch-dg
index 5d5362b6cad..2dfabcebb45 100644
--- a/misc/openoffice/patches/patch-dg
+++ b/misc/openoffice/patches/patch-dg
@@ -1,12 +1,33 @@
-$NetBSD: patch-dg,v 1.1 2002/02/14 22:51:42 mrauch Exp $
+$NetBSD: patch-dg,v 1.2 2002/03/29 21:00:10 mrauch Exp $
 
---- ../idlc/source/makefile.mk.orig	Thu Feb 14 18:06:37 2002
+--- ../idlc/source/makefile.mk.orig	Fri Mar 29 11:54:39 2002
 +++ ../idlc/source/makefile.mk
-@@ -148,6 +148,7 @@
- 
- $(MISC)$/parser.cxx: parser.yy
- 	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
-+	-$(COPY) $(MISC)$/parser.hxx $(MISC)$/parser.cxx.h
- 	+$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h
- # with line statements (for debugging)
- #	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
+@@ -72,9 +72,7 @@
+ # --- Settings -----------------------------------------------------
+ 
+ 
+-.INCLUDE :  svpre.mk
+ .INCLUDE :  settings.mk
+-.INCLUDE :  sv.mk
+ 
+ 
+ # --- Files --------------------------------------------------------
+@@ -102,6 +100,9 @@
+ 			astunion.cxx \
+ 			astexpression.cxx
+ 
++ YACCTARGET=$(MISC)$/parser.cxx
++ YACCFILES=parser.yy
++
+ OBJFILES=   \
+ 			$(OBJ)$/scanner.obj	\
+ 			$(OBJ)$/parser.obj	\
+@@ -146,8 +147,3 @@
+ $(MISC)$/scanner.cxx:	$(MISC)$/stripped_scanner.ll
+ 	+flex -o$(MISC)$/scanner.cxx $(MISC)$/stripped_scanner.ll
+ 
+-$(MISC)$/parser.cxx: parser.yy
+-	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
+-	+$(COPY) $(MISC)$/parser.cxx.h $(OUT)$/inc$/parser.h
+-# with line statements (for debugging)
+-#	+bison -v -d -o$(MISC)$/parser.cxx parser.yy
diff --git a/misc/openoffice/patches/patch-dh b/misc/openoffice/patches/patch-dh
index 5203dccab0a..fb2341fb2ef 100644
--- a/misc/openoffice/patches/patch-dh
+++ b/misc/openoffice/patches/patch-dh
@@ -1,12 +1,35 @@
-$NetBSD: patch-dh,v 1.1 2002/02/14 22:51:42 mrauch Exp $
+$NetBSD: patch-dh,v 1.2 2002/03/29 21:00:11 mrauch Exp $
 
---- ../connectivity/source/parse/makefile.mk.orig	Thu Feb 14 18:05:15 2002
+--- ../connectivity/source/parse/makefile.mk.orig	Fri Aug 10 13:09:05 2001
 +++ ../connectivity/source/parse/makefile.mk
-@@ -97,6 +97,7 @@
- $(MISC)$/sqlbison.cxx: sqlbison.y
- 	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y
- 	-$(MKDIR) $(OUT)$/inc$/connectivity
-+	-$(COPY) $(MISC)$/sqlbison.hxx $(MISC)$/sqlbison.cxx.h
- 	+$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx
- 
- $(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx
+@@ -67,12 +67,14 @@
+ 
+ # --- Settings -----------------------------------------------------
+ 
+-.INCLUDE :  svpre.mk
+ .INCLUDE :  settings.mk
+-.INCLUDE :  sv.mk
+ 
+ # --- Files --------------------------------------------------------
+ 
++YACCTARGET= $(MISC)$/sqlbison.cxx
++YACCFILES= sqlbison.y
++YACCFLAGS=-v -d -l -pSQLyy -bsql -o
++
+ SLOFILES =  \
+ 		$(SLO)$/sqlNoException.obj	\
+ 		$(SLO)$/sqlbison.obj		\
+@@ -94,13 +96,3 @@
+ $(MISC)$/sqlflex.cxx:	sqlflex.l
+ 	+flex -i -8 -PSQLyy -L -o$(MISC)$/sqlflex.cxx sqlflex.l
+ 
+-$(MISC)$/sqlbison.cxx: sqlbison.y
+-	+bison -v -d -pSQLyy -l -bsql -o$(MISC)$/sqlbison.cxx sqlbison.y
+-	-$(MKDIR) $(OUT)$/inc$/connectivity
+-	+$(COPY) $(MISC)$/sqlbison.cxx.h $(OUT)$/inc$/connectivity$/sqlbison.hxx
+-
+-$(SLO)$/sqlbison.obj : $(MISC)$/sqlbison.cxx
+-
+-$(SLO)$/sqlflex.obj : $(MISC)$/sqlflex.cxx
+-
+-sqliterator.cxx:	$(MISC)$/sqlbison.cxx
diff --git a/misc/openoffice/patches/patch-di b/misc/openoffice/patches/patch-di
index a097c114239..7dc00a43300 100755
--- a/misc/openoffice/patches/patch-di
+++ b/misc/openoffice/patches/patch-di
@@ -1,14 +1,22 @@
-$NetBSD: patch-di,v 1.2 2002/02/26 21:25:28 mrauch Exp $
+$NetBSD: patch-di,v 1.3 2002/03/29 21:00:11 mrauch Exp $
 
 --- ../solenv/inc/tg_yxx.mk.orig	Wed Sep 20 14:43:18 2000
 +++ ../solenv/inc/tg_yxx.mk
-@@ -4,7 +4,9 @@
+@@ -3,12 +3,10 @@
+ $(YACCTARGET): $(YACCFILES)
  	@echo ------------------------------
  	@echo Making: $@
- #.IF "$(GUI)"!="UNX"
-+	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET).h $(YACCFILES)
- 	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
-+	$(BISON) -o $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
- #.ELSE
- #	$(BISON) $(YACCFLAGS) $(YACCFILES)
- #	mv y.tab.c $(INCCOM)/rscyacc.yxx
+-#.IF "$(GUI)"!="UNX"
+-	$(BISON) $(YACCFLAGS) $(YACCOUT)$/$(YACCTARGET) $(YACCFILES)
+-#.ELSE
+-#	$(BISON) $(YACCFLAGS) $(YACCFILES)
+-#	mv y.tab.c $(INCCOM)/rscyacc.yxx
+-#	mv y.tab.h $(INCCOM)/yytab.h
+-#.ENDIF
++	$(BISON) $(YACCFLAGS) $(YACCTARGET) $(YACCFILES)
++# removing -f switch - avoid getting nothing when copying a file to itself
++	@+-$(COPY:s/-f//) $@.h $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
++	@+-$(COPY:s/-f//) $(@:d)$/$(@:b).hxx $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
++	+$(TYPE) $(INCCOM)$/$(@:b).hxx >& $(NULLDEV)
+ .ENDIF
+ 
diff --git a/misc/openoffice/patches/patch-dv b/misc/openoffice/patches/patch-dv
new file mode 100644
index 00000000000..42371cce8f4
--- /dev/null
+++ b/misc/openoffice/patches/patch-dv
@@ -0,0 +1,13 @@
+$NetBSD: patch-dv,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../idlc/source/scanner.ll.orig	Fri May 18 15:38:10 2001
++++ ../idlc/source/scanner.ll
+@@ -76,7 +76,7 @@
+ class AstArray;
+ class AstMember;
+ 
+-#include <parser.h>
++#include <parser.hxx>
+ 
+ sal_Int32		beginLine = 0;
+ ::rtl::OString	docu;
diff --git a/misc/openoffice/patches/patch-dw b/misc/openoffice/patches/patch-dw
new file mode 100644
index 00000000000..f4834e300cd
--- /dev/null
+++ b/misc/openoffice/patches/patch-dw
@@ -0,0 +1,26 @@
+$NetBSD: patch-dw,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../rsc/source/parser/makefile.mk.orig	Mon Sep 18 16:42:55 2000
++++ ../rsc/source/parser/makefile.mk
+@@ -69,20 +69,12 @@
+ 
+ # --- Settings -----------------------------------------------------
+ 
+-.IF "$(COM)"=="ICC"
+-CFLAGS+= /O-
+-.ENDIF
+-
+ #prjpch=T
+-.INCLUDE :  svpre.mk
+ .INCLUDE :  settings.mk
+-.INCLUDE :  sv.mk
+ 
+ # --- Files --------------------------------------------------------
+ 
+-YACCOUT=$(INCCOM)
+-
+-YACCTARGET= $(YACCOUT)$/rscyacc.yxx
++YACCTARGET= $(INCCOM)$/yyrscyacc.cxx
+ YACCFILES=  rscyacc.y
+ 
+ CXXFILES=   rscpar.cxx          \
diff --git a/misc/openoffice/patches/patch-dx b/misc/openoffice/patches/patch-dx
new file mode 100644
index 00000000000..a2cab03bb35
--- /dev/null
+++ b/misc/openoffice/patches/patch-dx
@@ -0,0 +1,13 @@
+$NetBSD: patch-dx,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../rsc/source/parser/rscibas.cxx.orig	Fri Jul 13 12:22:18 2001
++++ ../rsc/source/parser/rscibas.cxx
+@@ -89,7 +89,7 @@
+ 
+ 
+ #include "rsclex.hxx"
+-#include <rscyacc.yxx.h>
++#include <yyrscyacc.hxx>
+ 
+ /****************** M A C R O S ******************************************/
+ void RscTypCont::SETCONST( RscConst * pClass, char * szString, UINT32 nVal )
diff --git a/misc/openoffice/patches/patch-dy b/misc/openoffice/patches/patch-dy
new file mode 100644
index 00000000000..4bb26fa99d5
--- /dev/null
+++ b/misc/openoffice/patches/patch-dy
@@ -0,0 +1,13 @@
+$NetBSD: patch-dy,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../rsc/source/parser/rscicpx.cxx.orig	Thu Jul 19 12:37:37 2001
++++ ../rsc/source/parser/rscicpx.cxx
+@@ -86,7 +86,7 @@
+ #endif
+ 
+ #include "rsclex.hxx"
+-#include <rscyacc.yxx.h>
++#include <yyrscyacc.hxx>
+ 
+ /*************************************************************************
+ |*	  RscTypCont::InsWinBit()
diff --git a/misc/openoffice/patches/patch-dz b/misc/openoffice/patches/patch-dz
new file mode 100644
index 00000000000..0d62bf902cc
--- /dev/null
+++ b/misc/openoffice/patches/patch-dz
@@ -0,0 +1,13 @@
+$NetBSD: patch-dz,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../rsc/source/parser/rscinit.cxx.orig	Wed Oct 10 11:51:23 2001
++++ ../rsc/source/parser/rscinit.cxx
+@@ -105,7 +105,7 @@
+ #endif
+ 
+ #include "rsclex.hxx"
+-#include <rscyacc.yxx.h>
++#include <yyrscyacc.hxx>
+ 
+ /****************** M a c r o s ******************************************/
+ #define INS_WINBIT( pClass, WinBit )		\
diff --git a/misc/openoffice/patches/patch-ea b/misc/openoffice/patches/patch-ea
new file mode 100644
index 00000000000..fad99c2b168
--- /dev/null
+++ b/misc/openoffice/patches/patch-ea
@@ -0,0 +1,13 @@
+$NetBSD: patch-ea,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../rsc/source/parser/rsclex.cxx.orig	Wed Oct 10 11:51:23 2001
++++ ../rsc/source/parser/rsclex.cxx
+@@ -88,7 +88,7 @@
+ #endif
+ 
+ #include "rsclex.hxx"
+-#include <rscyacc.yxx.h>
++#include <yyrscyacc.hxx>
+ 
+ #include <rtl/textcvt.h>
+ #include <rtl/textenc.h>
diff --git a/misc/openoffice/patches/patch-eb b/misc/openoffice/patches/patch-eb
new file mode 100644
index 00000000000..60bfacd630b
--- /dev/null
+++ b/misc/openoffice/patches/patch-eb
@@ -0,0 +1,11 @@
+$NetBSD: patch-eb,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../rsc/source/parser/rscyacc.cxx.orig	Wed Oct 10 11:51:23 2001
++++ ../rsc/source/parser/rscyacc.cxx
+@@ -311,5 +311,5 @@
+ #endif
+ #endif
+ 
+-#include "rscyacc.yxx"
++#include "yyrscyacc.cxx"
+ 
diff --git a/misc/openoffice/patches/patch-ec b/misc/openoffice/patches/patch-ec
new file mode 100644
index 00000000000..50f14bcd1f5
--- /dev/null
+++ b/misc/openoffice/patches/patch-ec
@@ -0,0 +1,13 @@
+$NetBSD: patch-ec,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../connectivity/inc/connectivity/sqlparse.hxx.orig	Thu Sep 27 06:12:33 2001
++++ ../connectivity/inc/connectivity/sqlparse.hxx
+@@ -72,7 +72,7 @@
+ #endif
+ #ifndef YYBISON
+ #ifndef FLEX_SCANNER
+-#include <connectivity/sqlbison.hxx>
++#include <sqlbison.hxx>
+ #endif
+ #endif
+ #ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
diff --git a/misc/openoffice/patches/patch-ed b/misc/openoffice/patches/patch-ed
new file mode 100644
index 00000000000..2a8f108ed15
--- /dev/null
+++ b/misc/openoffice/patches/patch-ed
@@ -0,0 +1,13 @@
+$NetBSD: patch-ed,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../connectivity/source/parse/sqlflex.l.orig	Thu Sep 27 06:12:35 2001
++++ ../connectivity/source/parse/sqlflex.l
+@@ -38,7 +38,7 @@
+ #define SQLYYDEBUG 1
+ #endif
+ 
+-#include "connectivity/sqlbison.hxx"
++#include "sqlbison.hxx"
+ #endif
+ #ifndef _CONNECTIVITY_SQLSCAN_HXX
+ #include "sqlscan.hxx"
diff --git a/misc/openoffice/patches/patch-ee b/misc/openoffice/patches/patch-ee
new file mode 100644
index 00000000000..37a8f085d04
--- /dev/null
+++ b/misc/openoffice/patches/patch-ee
@@ -0,0 +1,13 @@
+$NetBSD: patch-ee,v 1.1 2002/03/29 21:00:11 mrauch Exp $
+
+--- ../connectivity/source/parse/sqlnode.cxx.orig	Mon Oct  1 11:24:22 2001
++++ ../connectivity/source/parse/sqlnode.cxx
+@@ -67,7 +67,7 @@
+ #include <internalnode.hxx>
+ #endif
+ #define YYBISON	  1
+-#include <connectivity/sqlbison.hxx>
++#include <sqlbison.hxx>
+ #ifndef _CONNECTIVITY_SQLPARSE_HXX
+ #include <connectivity/sqlparse.hxx>
+ #endif