pkg/45163: misc/openoffice3 fails to build on NetBSD-5.99.52

[paul%whooppee.com@localhost]

>Number:         45163
>Category:       pkg
>Synopsis:       misc/openoffice3 fails to build on NetBSD-5.99.52
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jul 21 16:50:00 +0000 2011
>Originator:     Paul Goyette
>Release:        NetBSD 5.99.52
>Organization:
-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------
>Environment:
        
        
System: NetBSD screamer.whooppee.com 5.99.52 NetBSD 5.99.52 (WHOOPPEE (shared) 
2011-05-30 19:33:56) #2: Mon May 30 12:37:07 PDT 2011 
paul%screamer.whooppee.com@localhost:/build/netbsd-local/obj/amd64/sys/arch/amd64/compile/WHOOPPEE
 amd64
Architecture: x86_64
Machine: amd64
>Description:
        The "connectivity" module of openoffice3 fails to build.
>How-To-Repeat:
        Install misc/openoffice3
>Fix:
        With clue from Jonathan Kollasch, this seems to be a result of
        a recent update of devel/bison to version 2.5.  The following
        additional patch files fix the problem.  (Of course, you'll need
        to add $NetBSD$ tags and generate appropriate checksums to add
        to distinfo ...)

        I do not know if this change will work with the previous bison
        version 2.4.3nb1 or not.

==== Start patch-ia ====
--- connectivity/inc/connectivity/sqlparse.hxx.orig     2011-07-21 
09:28:10.000000000 -0700
+++ connectivity/inc/connectivity/sqlparse.hxx
@@ -213,7 +213,7 @@
 
 
 
-               void error(sal_Char *fmt);
+               void error(const sal_Char *fmt);
                int SQLlex();
 #ifdef YYBISON
                void setParseTree(OSQLParseNode * pNewParseTree);
==== End patch-ia ====

==== Start patch-ib ====
--- connectivity/source/parse/sqlbison.y.orig   2011-07-21 09:30:07.000000000 
-0700
+++ connectivity/source/parse/sqlbison.y
@@ -3654,7 +3654,7 @@
 }
 
 // -------------------------------------------------------------------------
-void OSQLParser::error(sal_Char *fmt)
+void OSQLParser::error(const sal_Char *fmt)
 {
        if(!m_sErrorMessage.getLength())
        {
==== End patch-ib ====

>Unformatted: