[pkgsrc/trunk]: pkgsrc/www/elinks04 Rename strtonum function, it conflicts wi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/036dd71a9e87
branches:  trunk
changeset: 505876:036dd71a9e87
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 08 19:21:18 2006 +0000

description:
Rename strtonum function, it conflicts with a system prototype on
OpenBSD and DragonFly.

diffstat:

 www/elinks04/distinfo         |   3 ++-
 www/elinks04/patches/patch-ad |  40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletions(-)

diffs (58 lines):

diff -r 501902c5567a -r 036dd71a9e87 www/elinks04/distinfo
--- a/www/elinks04/distinfo     Sun Jan 08 19:17:45 2006 +0000
+++ b/www/elinks04/distinfo     Sun Jan 08 19:21:18 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:08:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/01/08 19:21:18 joerg Exp $
 
 SHA1 (elinks-0.4.3.tar.bz2) = 714fceaf57327849cdb3986ca937018624af6b5e
 RMD160 (elinks-0.4.3.tar.bz2) = ccf4df27dfab136b69d2f1c29c32cc7df59fa241
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 848266272ba4a4dfb6490b3c701ee20575121cb0
 SHA1 (patch-ab) = afa6a0000e8fbe2d33669c9b34a3f157c087b42c
 SHA1 (patch-ac) = b0041facbc15997bf272ada854ddfea94ef8158f
+SHA1 (patch-ad) = fd973e1306ab1264b09312b57577963a86aa2c13
diff -r 501902c5567a -r 036dd71a9e87 www/elinks04/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/elinks04/patches/patch-ad     Sun Jan 08 19:21:18 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.1 2006/01/08 19:21:18 joerg Exp $
+
+--- src/config/kbdbind.c.orig  2003-06-06 23:13:25.000000000 +0000
++++ src/config/kbdbind.c
+@@ -216,7 +216,7 @@ struct strtonum {
+ };
+ 
+ static long
+-strtonum(struct strtonum *table, char *str)
++my_strtonum(struct strtonum *table, char *str)
+ {
+       struct strtonum *rec;
+ 
+@@ -263,7 +263,7 @@ static struct strtonum keymap_table[] = 
+ static int
+ read_keymap(unsigned char *keymap)
+ {
+-      return strtonum(keymap_table, keymap);
++      return my_strtonum(keymap_table, keymap);
+ }
+ 
+ unsigned char *
+@@ -306,7 +306,7 @@ static struct strtonum key_table[] = {
+ long
+ read_key(unsigned char *key)
+ {
+-      return (strlen(key) == 1) ? *key : strtonum(key_table, key);
++      return (strlen(key) == 1) ? *key : my_strtonum(key_table, key);
+ }
+ 
+ static unsigned char *
+@@ -440,7 +440,7 @@ static struct strtonum action_table[] = 
+ static int
+ read_action(unsigned char *action)
+ {
+-      return strtonum(action_table, action);
++      return my_strtonum(action_table, action);
+ }
+ 
+ unsigned char *