Sun May 27 13:15:37 2012 UTC ()
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


(spz)
diff -r1.69 -r1.69.2.1 pkgsrc/shells/tcsh/Makefile
diff -r1.28 -r1.28.2.1 pkgsrc/shells/tcsh/distinfo
diff -r1.12 -r1.12.2.1 pkgsrc/shells/tcsh/patches/patch-aa
diff -r1.11 -r1.11.44.1 pkgsrc/shells/tcsh/patches/patch-ab
diff -r0 -r1.15.2.2 pkgsrc/shells/tcsh/patches/patch-ac
cvs diff -r1.69 -r1.69.2.1 pkgsrc/shells/tcsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/Makefile 2012/03/22 16:54:25 1.69
+++ pkgsrc/shells/tcsh/Makefile 2012/05/27 13:15:36 1.69.2.1
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.69 2012/03/22 16:54:25 adam Exp $ 1# $NetBSD: Makefile,v 1.69.2.1 2012/05/27 13:15:36 spz Exp $
2 2
3DISTNAME= tcsh-6.18.01 3DISTNAME= tcsh-6.18.01
 4PKGREVISION= 1
4CATEGORIES= shells 5CATEGORIES= shells
5MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \ 6MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \
6 ftp://ftp.funet.fi/pub/unix/shells/tcsh/ 7 ftp://ftp.funet.fi/pub/unix/shells/tcsh/
7 8
8MAINTAINER= kim@tac.nyc.ny.us 9MAINTAINER= kim@tac.nyc.ny.us
9HOMEPAGE= http://www.tcsh.org/Welcome 10HOMEPAGE= http://www.tcsh.org/Welcome
10COMMENT= Extended C-shell with many useful features 11COMMENT= Extended C-shell with many useful features
11LICENSE= original-bsd 12LICENSE= original-bsd
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15CONFLICTS?= static-tcsh-[0-9]* 16CONFLICTS?= static-tcsh-[0-9]*
16 17
cvs diff -r1.28 -r1.28.2.1 pkgsrc/shells/tcsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/distinfo 2012/03/22 16:54:25 1.28
+++ pkgsrc/shells/tcsh/distinfo 2012/05/27 13:15:36 1.28.2.1
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.28 2012/03/22 16:54:25 adam Exp $ 1$NetBSD: distinfo,v 1.28.2.1 2012/05/27 13:15:36 spz Exp $
2 2
3SHA1 (tcsh-6.18.01.tar.gz) = eee2035645737197ff8059c84933a75d23cd76f9 3SHA1 (tcsh-6.18.01.tar.gz) = eee2035645737197ff8059c84933a75d23cd76f9
4RMD160 (tcsh-6.18.01.tar.gz) = ea18bb6d4d6dca2700d74daa2940f67d45a18cb9 4RMD160 (tcsh-6.18.01.tar.gz) = ea18bb6d4d6dca2700d74daa2940f67d45a18cb9
5Size (tcsh-6.18.01.tar.gz) = 926872 bytes 5Size (tcsh-6.18.01.tar.gz) = 926872 bytes
6SHA1 (patch-aa) = f9d9d21482380002eaad51125310b6d36930baa7 6SHA1 (patch-aa) = eadb2c1f4ad8bab7826c8e07c8edfc68569c74d4
7SHA1 (patch-ab) = ab71a3826bbcef0702a7d43446f13454176aa671 7SHA1 (patch-ab) = 8cf26988778b5331360eb1aab98bfcc920c71ac2
 8SHA1 (patch-ac) = c2a944f9c6857cdd8ba9753e3ce7c496749f8f87
cvs diff -r1.12 -r1.12.2.1 pkgsrc/shells/tcsh/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/patches/Attic/patch-aa 2012/03/22 16:54:25 1.12
+++ pkgsrc/shells/tcsh/patches/Attic/patch-aa 2012/05/27 13:15:37 1.12.2.1
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.12 2012/03/22 16:54:25 adam Exp $ 1$NetBSD: patch-aa,v 1.12.2.1 2012/05/27 13:15:37 spz Exp $
 2
 3Use LDFLAGS and BSD_INSTALL_*.
2 4
3--- Makefile.in.orig 2011-02-05 17:35:31.000000000 +0000 5--- Makefile.in.orig 2011-02-05 17:35:31.000000000 +0000
4+++ Makefile.in 6+++ Makefile.in
5@@ -357,7 +357,7 @@ P= 7@@ -357,7 +357,7 @@ P=
6 prefix=@prefix@ 8 prefix=@prefix@
7 exec_prefix=@exec_prefix@ 9 exec_prefix=@exec_prefix@
8 bindir=@bindir@ 10 bindir=@bindir@
9-mandir=@datarootdir@/man 11-mandir=@datarootdir@/man
10+mandir=@mandir@ 12+mandir=@mandir@
11 MANSECT=1 13 MANSECT=1
12 DESTBIN=${DESTDIR}${bindir} 14 DESTBIN=${DESTDIR}${bindir}
13 DESTMAN=${DESTDIR}${mandir}/man${MANSECT} 15 DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
14@@ -449,7 +449,7 @@ pure:$(P) ${OBJS}  16@@ -449,7 +449,7 @@ pure:$(P) ${OBJS}
cvs diff -r1.11 -r1.11.44.1 pkgsrc/shells/tcsh/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/patches/Attic/patch-ab 2007/04/11 04:56:56 1.11
+++ pkgsrc/shells/tcsh/patches/Attic/patch-ab 2012/05/27 13:15:37 1.11.44.1
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.11 2007/04/11 04:56:56 christos Exp $ 1$NetBSD: patch-ab,v 1.11.44.1 2012/05/27 13:15:37 spz Exp $
 2
 3Special adaptation for different NetBSD versions and for OpenBSD.
2 4
3--- config_f.h.orig 2006-08-28 10:53:04.000000000 -0400 5--- config_f.h.orig 2006-08-28 10:53:04.000000000 -0400
4+++ config_f.h 2007-04-09 20:02:34.000000000 -0400 6+++ config_f.h 2007-04-09 20:02:34.000000000 -0400
5@@ -44,7 +44,18 @@ 7@@ -44,7 +44,18 @@
6 * of nls... 8 * of nls...
7 * 9 *
8 */ 10 */
9-#define SHORT_STRINGS 11-#define SHORT_STRINGS
10+#if defined(__NetBSD__) 12+#if defined(__NetBSD__)
11+# include <sys/param.h> 13+# include <sys/param.h>
12+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000) 14+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000)
13+# define SHORT_STRINGS 15+# define SHORT_STRINGS
14+# else 16+# else
File Added: pkgsrc/shells/tcsh/patches/Attic/patch-ac
$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;