[pkgsrc/trunk]: pkgsrc/archivers/arj Rename strnlen -> _strnlen to avoid conf...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce1994c9bb3e
branches:  trunk
changeset: 392923:ce1994c9bb3e
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Wed May 13 14:26:24 2009 +0000

description:
Rename strnlen -> _strnlen to avoid conflict in systems having strnlen.

diffstat:

 archivers/arj/distinfo         |   4 ++--
 archivers/arj/patches/patch-af |  24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 2b30d7e30130 -r ce1994c9bb3e archivers/arj/distinfo
--- a/archivers/arj/distinfo    Wed May 13 13:13:30 2009 +0000
+++ b/archivers/arj/distinfo    Wed May 13 14:26:24 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2008/06/21 20:24:08 joerg Exp $
+$NetBSD: distinfo,v 1.14 2009/05/13 14:26:24 hasso Exp $
 
 SHA1 (arj-3.10.22.tar.gz) = e8470f480e9eee14906e5485a8898e5c24738c8b
 RMD160 (arj-3.10.22.tar.gz) = 80f8a1a8cd203f73def8e957d96563a4dba80153
@@ -8,5 +8,5 @@
 SHA1 (patch-ac) = db8a0afa61f49242e9fd601d5fc3167cf75f748b
 SHA1 (patch-ad) = 186b05ec694daa25504123690f9b7bba9f22a7f4
 SHA1 (patch-ae) = 46181177d4a42b510a02ce8e138275dca453f1de
-SHA1 (patch-af) = 66793484466fa8c7f0ad5cd0010ef8672b2305f4
+SHA1 (patch-af) = c4e5a0dc8a2b42af471fd065ab28f162d94bd0b7
 SHA1 (patch-ag) = ce4d0fefed6ccf7ab7fad864a7cb7faa36e4e4ac
diff -r 2b30d7e30130 -r ce1994c9bb3e archivers/arj/patches/patch-af
--- a/archivers/arj/patches/patch-af    Wed May 13 13:13:30 2009 +0000
+++ b/archivers/arj/patches/patch-af    Wed May 13 14:26:24 2009 +0000
@@ -1,7 +1,25 @@
-$NetBSD: patch-af,v 1.1 2005/10/07 16:52:06 joerg Exp $
+$NetBSD: patch-af,v 1.2 2009/05/13 14:26:24 hasso Exp $
 
---- fardata.c.orig     2005-07-22 13:27:50.000000000 +0000
-+++ fardata.c
+--- fardata.c.orig     2004-04-17 14:39:42 +0300
++++ fardata.c  2009-05-03 08:53:46 +0300
+@@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, ..
+ 
+ /* Length-limited strlen() */
+ 
+-static int strnlen(const char FAR *s, int count)
++static int _strnlen(const char FAR *s, int count)
+ {
+  const char FAR *sc;
+ 
+@@ -569,7 +569,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
+     if(!s)
+      s="(null)";
+ #endif
+-    len=strnlen(s, precision);
++    len=_strnlen(s, precision);
+     if(!(flags&LEFT))
+     {
+      while(len<field_width--)
 @@ -655,7 +655,7 @@ int vcprintf(int ccode, FMSG *fmt, va_li
      num=va_arg(args, unsigned long);
     else if(qualifier=='h')