[pkgsrc/trunk]: pkgsrc/shells/tcsh Make it compile on 1.6.2, I think. But it...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8d95f4b4a7d3
branches:  trunk
changeset: 491727:8d95f4b4a7d3
user:      kim <kim%pkgsrc.org@localhost>
date:      Tue Mar 29 04:38:10 2005 +0000

description:
Make it compile on 1.6.2, I think.  But it seems subtly odd, still...

diffstat:

 shells/tcsh/distinfo         |   5 ++-
 shells/tcsh/patches/patch-ad |  26 ++++++++++++++++++---
 shells/tcsh/patches/patch-ap |  53 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 6 deletions(-)

diffs (105 lines):

diff -r 821ed469a694 -r 8d95f4b4a7d3 shells/tcsh/distinfo
--- a/shells/tcsh/distinfo      Tue Mar 29 00:55:50 2005 +0000
+++ b/shells/tcsh/distinfo      Tue Mar 29 04:38:10 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.15 2005/03/25 19:13:24 kim Exp $
+$NetBSD: distinfo,v 1.16 2005/03/29 04:38:10 kim Exp $
 
 SHA1 (tcsh-6.14.00.tar.gz) = 55a08b31a57cfd8631edd1fb7e42f18578d8198a
 RMD160 (tcsh-6.14.00.tar.gz) = fa7635225ceb0225aedcfad5dd9d8e17d8d70849
 Size (tcsh-6.14.00.tar.gz) = 859780 bytes
 SHA1 (patch-aa) = 98ab704908a6fe2f570d2688c2a9bdb600f630eb
-SHA1 (patch-ad) = 4eee34eb2f8ce3ddc3f6b4177510945a00f66f15
+SHA1 (patch-ad) = 97afc66c2c1c900d7b56a4128a3f6a6f958bad78
+SHA1 (patch-ap) = 332a71c54a3bba11b96e43b94b2d050a3a114540
diff -r 821ed469a694 -r 8d95f4b4a7d3 shells/tcsh/patches/patch-ad
--- a/shells/tcsh/patches/patch-ad      Tue Mar 29 00:55:50 2005 +0000
+++ b/shells/tcsh/patches/patch-ad      Tue Mar 29 04:38:10 2005 +0000
@@ -1,8 +1,26 @@
-$NetBSD: patch-ad,v 1.7 2004/05/19 17:42:35 kim Exp $
+$NetBSD: patch-ad,v 1.8 2005/03/29 04:38:10 kim Exp $
 
---- config_f.h.orig    Fri Mar  8 12:36:45 2002
-+++ config_f.h Sun Aug 11 00:19:17 2002
-@@ -61,7 +61,11 @@
+--- config_f.h.orig    2005-03-04 08:46:04.000000000 -0500
++++ config_f.h 2005-03-28 22:41:48.000000000 -0500
+@@ -44,7 +44,16 @@
+  *             of nls...
+  *
+  */
+-#define SHORT_STRINGS
++#if defined(__NetBSD__)
++# include <sys/param.h>
++# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000)
++#  define SHORT_STRINGS
++# else
++#  undef SHORT_STRINGS
++# endif
++#else
++# define SHORT_STRINGS
++#endif
+ 
+ /*
+  * WIDE_STRINGS       Represent strings using wide characters
+@@ -69,7 +78,11 @@
   *            if you don't have <nl_types.h>, you don't want
   *            to define this.
   */
diff -r 821ed469a694 -r 8d95f4b4a7d3 shells/tcsh/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/tcsh/patches/patch-ap      Tue Mar 29 04:38:10 2005 +0000
@@ -0,0 +1,53 @@
+$NetBSD: patch-ap,v 1.1 2005/03/29 04:38:10 kim Exp $
+
+--- glob.c.orig        2005-01-18 15:24:50.000000000 -0500
++++ glob.c     2005-03-28 23:22:44.000000000 -0500
+@@ -63,7 +63,6 @@
+ #undef QUOTE
+ #undef TILDE
+ #undef META
+-#undef CHAR
+ #undef ismeta
+ #undef Strchr
+ 
+@@ -120,7 +119,7 @@
+ #define       M_MASK          0xffff
+ #define       M_ASCII         0x00ff
+ 
+-#define       CHAR(c)         ((c)&M_ASCII)
++#define       LCHAR(c)        ((c)&M_ASCII)
+ #define       META(c)         ((c)|M_META)
+ #define       M_ALL           META('*')
+ #define       M_END           META(']')
+@@ -427,11 +426,11 @@
+               *bufnext++ = m_not;
+           c = *qpatnext++;
+           do {
+-              *bufnext++ = CHAR(c);
++              *bufnext++ = LCHAR(c);
+               if (*qpatnext == RANGE &&
+                   (c = qpatnext[1]) != RBRACKET) {
+                   *bufnext++ = M_RNG;
+-                  *bufnext++ = CHAR(c);
++                  *bufnext++ = LCHAR(c);
+                   qpatnext += 2;
+               }
+           } while ((c = *qpatnext++) != RBRACKET);
+@@ -450,7 +449,7 @@
+               *bufnext++ = M_ALL;
+           break;
+       default:
+-          *bufnext++ = CHAR(c);
++          *bufnext++ = LCHAR(c);
+           break;
+       }
+     }
+@@ -699,7 +698,7 @@
+     if (n > MB_LEN_MAX)
+       n = MB_LEN_MAX;
+     p = buf;
+-    while (p < buf + n && (*p++ = CHAR(*s++)) != 0)
++    while (p < buf + n && (*p++ = LCHAR(*s++)) != 0)
+       ;
+     return one_mbtowc(pwc, buf, n);
+ #else