summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorkim <kim@pkgsrc.org>2005-03-29 04:38:10 +0000
committerkim <kim@pkgsrc.org>2005-03-29 04:38:10 +0000
commitf26468b3d960b645dea7df03bd1fc456035be42d (patch)
tree1eb20cfa25c19cb995d76ebc2e795b7a6980698e /shells
parentbbe230ce9741d0677de0145189421530253ad861 (diff)
downloadpkgsrc-f26468b3d960b645dea7df03bd1fc456035be42d.tar.gz
Make it compile on 1.6.2, I think. But it seems subtly odd, still...
Diffstat (limited to 'shells')
-rw-r--r--shells/tcsh/distinfo5
-rw-r--r--shells/tcsh/patches/patch-ad26
-rw-r--r--shells/tcsh/patches/patch-ap53
3 files changed, 78 insertions, 6 deletions
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index d177e855281..986956c53dd 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -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 --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
index 92014f64ba4..6b3aa1d0f96 100644
--- a/shells/tcsh/patches/patch-ad
+++ b/shells/tcsh/patches/patch-ad
@@ -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 --git a/shells/tcsh/patches/patch-ap b/shells/tcsh/patches/patch-ap
new file mode 100644
index 00000000000..1a56798c9b7
--- /dev/null
+++ b/shells/tcsh/patches/patch-ap
@@ -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