Pullup ticket #3804 - requested by he

shells/tcsh: bugfix

Revisions pulled up:
- shells/tcsh/Makefile                                          1.70
- shells/tcsh/distinfo                                          1.29
- shells/tcsh/patches/patch-aa                                  1.13
- shells/tcsh/patches/patch-ab                                  1.12
- shells/tcsh/patches/patch-ac                                  1.15

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Fri May 25 20:01:31 UTC 2012

   Modified Files:
   	pkgsrc/shells/tcsh: Makefile distinfo
   	pkgsrc/shells/tcsh/patches: patch-aa patch-ab

   Log Message:
   Add a patch to fix issue with Meta-<key> no longer being recognized.
   Patch from christos@.
   Add comments to some of the other patch files to appease pkglint.
   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.69 -r1.70 pkgsrc/shells/tcsh/Makefile
   cvs rdiff -u -r1.28 -r1.29 pkgsrc/shells/tcsh/distinfo
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/shells/tcsh/patches/patch-aa
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/shells/tcsh/patches/patch-ab

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sat May 26 08:34:14 UTC 2012

   Added Files:
   	pkgsrc/shells/tcsh/patches: patch-ac

   Log Message:
   Add a patch to fix issue with Meta-<key> no longer being recognized.
   Patch from christos@.  (Sorry for overlooking "cvs add" earlier...)


   To generate a diff of this commit:
   cvs rdiff -u -r0 -r1.15 pkgsrc/shells/tcsh/patches/patch-ac

5 files changed, 28 insertions, 6 deletions

diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 10c0eb6db9a..2e8ab6bb7cf 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2012/03/22 16:54:25 adam Exp $
+# $NetBSD: Makefile,v 1.69.2.1 2012/05/27 13:15:36 spz Exp $
 
 DISTNAME=	tcsh-6.18.01
+PKGREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ \
 		ftp://ftp.funet.fi/pub/unix/shells/tcsh/
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index af9c62f4752..08a385f4673 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.28 2012/03/22 16:54:25 adam Exp $
+$NetBSD: distinfo,v 1.28.2.1 2012/05/27 13:15:36 spz Exp $
 
 SHA1 (tcsh-6.18.01.tar.gz) = eee2035645737197ff8059c84933a75d23cd76f9
 RMD160 (tcsh-6.18.01.tar.gz) = ea18bb6d4d6dca2700d74daa2940f67d45a18cb9
 Size (tcsh-6.18.01.tar.gz) = 926872 bytes
-SHA1 (patch-aa) = f9d9d21482380002eaad51125310b6d36930baa7
-SHA1 (patch-ab) = ab71a3826bbcef0702a7d43446f13454176aa671
+SHA1 (patch-aa) = eadb2c1f4ad8bab7826c8e07c8edfc68569c74d4
+SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
+SHA1 (patch-ac) = c2a944f9c6857cdd8ba9753e3ce7c496749f8f87
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
index 81157e48bcd..9897ee85822 100644
--- a/shells/tcsh/patches/patch-aa
+++ b/shells/tcsh/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2012/03/22 16:54:25 adam Exp $
+$NetBSD: patch-aa,v 1.12.2.1 2012/05/27 13:15:37 spz Exp $
+
+Use LDFLAGS and BSD_INSTALL_*.
 
 --- Makefile.in.orig	2011-02-05 17:35:31.000000000 +0000
 +++ Makefile.in
diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab
index 063a5119aba..58aacf56e09 100644
--- a/shells/tcsh/patches/patch-ab
+++ b/shells/tcsh/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.11 2007/04/11 04:56:56 christos Exp $
+$NetBSD: patch-ab,v 1.11.44.1 2012/05/27 13:15:37 spz Exp $
+
+Special adaptation for different NetBSD versions and for OpenBSD.
 
 --- config_f.h.orig	2006-08-28 10:53:04.000000000 -0400
 +++ config_f.h	2007-04-09 20:02:34.000000000 -0400
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
new file mode 100644
index 00000000000..405f33b39ca
--- /dev/null
+++ b/shells/tcsh/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.15.2.2 2012/05/27 13:15:37 spz Exp $
+
+Fix problem with Meta-<key> no longer being recognized,
+patch from christos@.
+
+--- ed.inputl.c.orig	2010-12-22 17:26:04.000000000 +0000
++++ ed.inputl.c
+@@ -683,7 +683,7 @@ GetNextCommand(KEYCMD *cmdnum, Char *ch)
+ #ifdef DSPMBYTE
+ 	     _enable_mbdisp &&
+ #else
+-	     MB_CUR_MAX == 1 &&
++	     MB_LEN_MAX == 1 &&
+ #endif
+ 	     !adrof(STRnokanji) && (*ch & META)) {
+ 	    MetaNext = 0;