[pkgsrc/trunk]: pkgsrc/converters/wv Fix for Darwin8/gcc4 (PR 31888)

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e526da4089f1
branches:  trunk
changeset: 501597:e526da4089f1
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Mon Oct 24 11:36:38 2005 +0000

description:
Fix for Darwin8/gcc4 (PR 31888)
Change:
  startElement() -> wvstartElement()
  endElement() ->   wvendElement()
to avoid conflict with non-static prototype
(the same fix was applied upstream)

diffstat:

 converters/wv/Makefile         |   4 ++--
 converters/wv/distinfo         |   3 ++-
 converters/wv/patches/patch-aa |  42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diffs (70 lines):

diff -r 530747afc676 -r e526da4089f1 converters/wv/Makefile
--- a/converters/wv/Makefile    Mon Oct 24 10:21:56 2005 +0000
+++ b/converters/wv/Makefile    Mon Oct 24 11:36:38 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2005/10/24 11:36:38 tonio Exp $
 
 DISTNAME=      wv-1.0.3
-PKGREVISION=    2
+PKGREVISION=    3
 CATEGORIES=    converters
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff -r 530747afc676 -r e526da4089f1 converters/wv/distinfo
--- a/converters/wv/distinfo    Mon Oct 24 10:21:56 2005 +0000
+++ b/converters/wv/distinfo    Mon Oct 24 11:36:38 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 16:12:35 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/10/24 11:36:38 tonio Exp $
 
 SHA1 (wv-1.0.3.tar.gz) = dea20c457d8b9f66fb4006672913b5f7852cc77f
 RMD160 (wv-1.0.3.tar.gz) = 0076da017b65f89032d0648292c7e3e4058c9d70
 Size (wv-1.0.3.tar.gz) = 857412 bytes
+SHA1 (patch-aa) = 47e41aa335d4c66fb1f5111b746599b31b9c8fc1
diff -r 530747afc676 -r e526da4089f1 converters/wv/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wv/patches/patch-aa    Mon Oct 24 11:36:38 2005 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.5 2005/10/24 11:36:38 tonio Exp $
+
+--- wvConfig.c.orig    2002-07-14 15:20:07.000000000 +0200
++++ wvConfig.c
+@@ -2130,7 +2130,7 @@ exstartElement (void *userData, const ch
+ }
+ 
+ static void
+-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
++wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts)
+ {
+     unsigned int nAtts = 0;
+     const XML_Char **p;
+@@ -3094,7 +3094,7 @@ startElement (void *userData, const XML_
+ }
+ 
+ static void
+-endElement (void *userData, const XML_Char *name)
++wvendElement (void *userData, const XML_Char *name)
+ {
+     state_data *mydata = (state_data *) userData;
+     unsigned int token_type;
+@@ -3470,8 +3470,8 @@ wvParseConfig (state_data * myhandle)
+       memset(&hdl, 0, sizeof(hdl));
+ 
+       hdl.getEntity = _getEntity;
+-      hdl.startElement = startElement;
+-      hdl.endElement = endElement;
++      hdl.startElement = wvstartElement;
++      hdl.endElement = wvendElement;
+       hdl.characters = charData;
+ 
+       if (myhandle->fp)
+@@ -3514,7 +3514,7 @@ wvParseConfig (state_data * myhandle)
+     size_t len;
+ 
+     XML_SetUserData (parser, myhandle);
+-    XML_SetElementHandler (parser, startElement, endElement);
++    XML_SetElementHandler (parser, wvstartElement, wvendElement);
+     XML_SetCharacterDataHandler (parser, charData);
+ 
+     if (myhandle->fp == NULL)