From: John Marino <draco@marino.st>
Date: Wed, 4 Nov 2015 13:55:12 +0000 (+0100)
Subject: Complete upgrade of tcsh 6.18.01 => 6.19.00
X-Git-Tag: v4.5.0~183
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/0d9cbbc4e9bd2659bc67c9bcbcafbddfa93896f6

Complete upgrade of tcsh 6.18.01 => 6.19.00
---

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index fa642fd33d..7dd6a6e0c6 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -19,7 +19,7 @@ SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
 	sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \
 	sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \
 	sh.set.c sh.time.c sh.char.h sh.dir.h sh.proc.h sh.h
-SRCS+=	sh.decls.h glob.c glob.h mi.termios.c
+SRCS+=	sh.decls.h glob.c glob.h mi.termios.c dotlock.c
 SRCS+=	tw.decls.h tw.h tw.help.c tw.init.c tw.parse.c tw.spell.c \
 	tw.comp.c tw.color.c
 SRCS+=	ed.chared.c ed.decls.h ed.defns.c ed.h ed.init.c ed.inputl.c \
diff --git a/bin/csh/config.h b/bin/csh/config.h
index 039aa6180c..150e32eb5d 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -1,5 +1,5 @@
 /* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to the type of elements in the array set by `getgroups'. Usually
    this is either `int' or `gid_t'. */
@@ -212,7 +212,7 @@
 #define PACKAGE_NAME "tcsh"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "tcsh 6.18.01"
+#define PACKAGE_STRING "tcsh 6.19.00"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "tcsh"
@@ -221,7 +221,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "6.18.01"
+#define PACKAGE_VERSION "6.19.00"
 
 /* Define to 1 if the `setpgrp' function takes no argument. */
 /* #undef SETPGRP_VOID */
diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h
index 4caab6f6d5..db21345ee3 100644
--- a/bin/csh/config_p.h
+++ b/bin/csh/config_p.h
@@ -98,6 +98,7 @@
 
 #elif defined(__APPLE__)
 # define SYSMALLOC
+# define BSD_STYLE_COLORLS
 #endif
 
 #endif /* _h_config */
diff --git a/bin/csh/host.defs b/bin/csh/host.defs
index 95f9b89e72..18ad29aa7a 100644
--- a/bin/csh/host.defs
+++ b/bin/csh/host.defs
@@ -1,5 +1,5 @@
 newcode :
-/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.55 2012/01/11 20:20:15 christos Exp $ */
+/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.60 2013/03/13 15:53:38 corinna Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
@@ -33,18 +33,19 @@ newcode :
  */
 #include "sh.h"
 
-RCSID("$tcsh: host.defs,v 1.55 2012/01/11 20:20:15 christos Exp $")
+RCSID("$tcsh: host.defs,v 1.60 2013/03/13 15:53:38 corinna Exp $")
 
 endcode :
 
-macro	: M_mips64el : (defined(mips64) || defined(__mips64)) && (defined(MIPSEL) || defined(__MIPSEL))
-macro	: M_mips64eb : (defined(mips64) || defined(__mips64)) && (defined(MIPSEB) || defined(__MIPSEB))
-macro	: M_mipsel : (!defined(M_mips64el)) && (defined(mips) || defined(__mips)) && (defined(MIPSEL) || defined(__MIPSEL))
-macro	: M_mipseb : (!defined(M_mips64eb)) && (defined(mips) || defined(__mips)) && (defined(MIPSEB) || defined(__MIPSEB))
-macro	: M_i386 : (defined(i386) || defined(__i386__))
-macro	: M_i486 : (defined(i486) || defined(__i486__))
-macro	: M_i586 : (defined(i586) || defined(__i586__))
-macro	: M_i686 : (defined(i686) || defined(__i686__))
+macro	: M_mips64el : (defined(mips64) && defined(MIPSEL))
+macro	: M_mips64eb : (defined(mips64) && defined(MIPSEB))
+macro	: M_mipsel : (!defined(M_mips64el) && defined(mips) && defined(MIPSEL))
+macro	: M_mipseb : (!defined(M_mips64eb) && defined(mips) && defined(MIPSEB))
+macro	: M_amd64: (defined(amd64) || defined(x86_64))
+macro	: M_i386 : defined(i386)
+macro	: M_i486 : defined(i486)
+macro	: M_i586 : defined(i586)
+macro	: M_i686 : defined(i686)
 macro	: M_intel : (defined(M_i386) || defined(M_i486) || defined(M_i586))
 
 newdef	: defined(ns32000)
@@ -169,7 +170,7 @@ getconvex(void)
 endcode :
 enddef	:
 
-newdef : defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__)
+newdef : defined(linux) || defined(CYGWIN) || defined(GNU) || defined(GLIBC)
 newcode :
 # include "tw.h"
 #include <sys/utsname.h>
@@ -240,7 +241,7 @@ hosttype:						: HOSTTYPE
 enddef	:
 
 
-newdef	: defined(__PARAGON__)
+newdef	: defined(PARAGON)
 comment : Intel Paragon running OSF/1
 vendor	:						: "intel"
 hosttype:						: "paragon"
@@ -277,7 +278,7 @@ machtype: defined(vax)					: "vax"
 enddef	:
 
 
-newdef	: defined(__hp_osf)
+newdef	: defined(hp_osf)
 comment : Hewlett Packard running OSF/1
 vendor	:						: "hp"
 hosttype: defined(pa_risc)				: "hp9000s700-osf1"
@@ -300,7 +301,7 @@ machtype: defined(hp800)				: "pa_risc"
 enddef	:
 
 
-newdef	: defined(hpux) || defined(__hpux)
+newdef	: defined(hpux)
 comment : Hewlett Packard running HP/UX
 vendor	:						: "hp"
 hosttype: defined(hp9000s800)				: "hp9000s800"
@@ -325,14 +326,15 @@ machtype:						: "m68k"
 enddef	:
 
 
-newdef	: defined(sun) || defined(__sun__)
+newdef	: defined(sun)
 comment : Sun Microsystems series 2 workstation (68010 based)
 comment : Sun Microsystems series 3 workstation (68020 based)
 comment : Sun Microsystems 386i workstation (386 based)
 comment : Sun Microsystems series 4 workstation (SPARC based)
 vendor	:						: "sun"
-hosttype: defined(M_i386) && !defined(__SVR4)		: "sun386i"
-hosttype: defined(M_i386) && defined(__SVR4)		: "i86pc"
+hosttype: defined(M_i386) && !defined(SVR4)		: "sun386i"
+hosttype: defined(M_i386) && defined(SVR4)		: "i86pc"
+hosttype: defined(M_amd64)				: "i86pc"
 hosttype: defined(mc68010)				: "sun2"
 hosttype: defined(mc68020)				: "sun3"
 hosttype: defined(sparc)				: "sun4"
@@ -345,6 +347,7 @@ machtype: defined(mc68020)				: "m68k"
 machtype: defined(sparcv9)				: "sparcv9"
 machtype: defined(sparc)				: "sparc"
 machtype: defined(M_i386)				: "i386"
+machtype: defined(M_amd64)				: "x86_64"
 enddef	:
 
 
@@ -488,7 +491,7 @@ machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
-newdef	: defined(__gnu_hurd__)
+newdef	: defined(gnu_hurd)
 comment : GNU/HURD
 vendor	: defined(M_intel)				: "intel"
 hosttype: defined(M_i686)				: "i686"
@@ -503,19 +506,19 @@ machtype: defined(M_i386)				: "i386-pc-gnu"
 enddef	:
 
 
-newdef	: defined(linux) || defined(__GNU__) || defined(__GLIBC__)
+newdef	: defined(linux) || defined(GNU) || defined(GLIBC)
 comment : Linus Torvalds's linux
 vendor	: defined(M_intel)				: "intel"
 hosttype:						: gethost()
 ostype	:						: getostype()
 machtype:						: getmach()
-vendor	: defined(__ANDROID__)				: "linux"
+vendor	: defined(ANDROID)				: "linux"
 vendor	: defined(alpha)				: "dec"
 vendor	: defined(PPC)					: "apple"
 enddef	:
 
 
-newdef	: defined(__EMX__)
+newdef	: defined(EMX)
 comment : OS/2 EMX [unix emulation under OS/2]
 vendor	: defined(M_intel)				: "intel"
 hosttype: defined(M_i386)				: "i386-emx"
@@ -524,10 +527,10 @@ machtype: defined(M_i386)				: "i386"
 enddef	:
 
 
-newdef	: defined(__NetBSD__)
+newdef	: defined(NetBSD)
 comment : NetBSD
 vendor	: defined(algor)				: "algoritmics"
-vendor	: defined(arm32) || defined(__arm__)		: "acorn"
+vendor	: defined(arm32) || defined(arm)		: "acorn"
 vendor	: defined(alpha)				: "digital"
 vendor	: defined(amiga)				: "commodore"
 vendor	: defined(atari)				: "atari"
@@ -543,13 +546,13 @@ vendor	: defined(sparc)				: "sun"
 vendor	: defined(sparc64)				: "sun"
 vendor	: defined(sun3)					: "sun"
 vendor	: defined(vax)					: "digital"
-vendor	: defined(x86_64)				: "amd"
+vendor	: defined(M_amd64)				: "amd"
 hosttype:						: "NetBSD"
 ostype	:						: "NetBSD"
 machtype: defined(alpha)				: "alpha"
 machtype: defined(algor)				: "algor"
-machtype: defined(arm32) || defined(__APCS_32__)	: "arm32"
-machtype: defined(arm26) || defined(__APCS_26__)	: "arm26"
+machtype: defined(arm32) || defined(APCS_32)		: "arm32"
+machtype: defined(arm26) || defined(APCS_26)		: "arm26"
 machtype: defined(arm)					: "arm"
 machtype: defined(sparc)				: "sparc"
 machtype: defined(sparc64)				: "sparc64"
@@ -561,25 +564,57 @@ machtype: defined(mips)					: "mips"
 machtype: defined(pc532)				: "pc532"
 machtype: defined(powerpc)				: "powerpc"
 machtype: defined(vax)					: "vax"
-machtype: defined(x86_64)				: "x86_64"
-enddef	:
+machtype: defined(M_amd64)				: "x86_64"
+enddef	:
+
+newdef : defined(OpenBSD)
+comment        : OpenBSD
+vendor : defined(alpha)					: "digital"
+vendor : defined(M_amd64)				: "amd"
+vendor : defined(arm)					: "arm"
+vendor : defined(hppa) || defined(hppa64)		: "hp"
+vendor : defined(M_intel)				: "intel"
+vendor : defined(m68k)					: "motorola"
+vendor : defined(m88k)					: "motorola"
+vendor : defined(mips) && defined(sgi)			: "sgi"
+vendor : defined(powerpc)				: "motorola"
+vendor : defined(sh)					: "io-data"
+vendor : defined(sparc) || defined(sparc64)		: "sun"
+vendor : defined(vax)					: "digital"
+hosttype:						: "OpenBSD"
+ostype :						: "OpenBSD"
+machtype: defined(alpha)				: "alpha"
+machtype: defined(M_amd64)				: "amd64"
+machtype: defined(arm)					: "arm"
+machtype: defined(hppa)					: "hppa"
+machtype: defined(hppa64)				: "hppa64"
+machtype: defined(M_i386)				: "i386"
+machtype: defined(m68k)					: "m68k"
+machtype: defined(m88k)					: "m88k"
+machtype: defined(mips)					: "mips"
+machtype: defined(sh)					: "sh"
+machtype: defined(sparc64)				: "sparc64"
+machtype: defined(sparc)				: "sparc"
+machtype: defined(powerpc)				: "powerpc"
+machtype: defined(vax)					: "vax"
+enddef :
 
 
-newdef	: defined(__FreeBSD__)
+newdef	: defined(FreeBSD)
 comment : FreeBSD
 vendor	: defined(alpha)				: "digital"
-vendor	: defined(arm32) || defined(__arm__)		: "acorn"
+vendor	: defined(arm32) || defined(arm)		: "acorn"
 vendor	: defined(M_intel)				: "intel"
 vendor	: defined(ia64)					: "intel"
 vendor	: defined(mips)					: "mips"
 vendor	: defined(powerpc)				: "motorola"
 vendor	: defined(sparc)				: "sun"
 vendor	: defined(sparc64)				: "sun"
-vendor	: defined(x86_64)				: "amd"
+vendor	: defined(M_amd64)				: "amd"
 hosttype:						: "FreeBSD"
 ostype	:						: "FreeBSD"
 machtype: defined(alpha)				: "alpha"
-machtype: defined(arm32) || defined(__APCS_32__)	: "arm32"
+machtype: defined(arm32) || defined(APCS_32)		: "arm32"
 machtype: defined(arm)					: "arm"
 machtype: defined(ia64)					: "ia64"
 machtype: defined(M_i386)				: "i386"
@@ -587,7 +622,7 @@ machtype: defined(mips)					: "mips"
 machtype: defined(powerpc)				: "powerpc"
 machtype: defined(sparc)				: "sparc"
 machtype: defined(sparc64)				: "sparc64"
-machtype: defined(x86_64)				: "x86_64"
+machtype: defined(M_amd64)				: "x86_64"
 enddef	:
 
 
@@ -597,12 +632,11 @@ vendor	: defined(M_intel)				: "intel"
 vendor	: defined(x86_64)				: "amd"
 hosttype:						: "DragonFly"
 ostype	:						: "DragonFly"
-machtype: defined(M_i386)				: "i386"
 machtype: defined(x86_64)				: "x86_64"
 enddef	:
 
 
-newdef	: defined(__MidnightBSD__)
+newdef	: defined(MidnightBSD)
 comment : MidnightBSD
 vendor	: defined(M_intel)				: "intel"
 hosttype:						: "MidnightBSD"
@@ -830,13 +864,15 @@ machtype: defined(sparc)  				: "sparc"
 enddef	:
 
 
-newdef	: defined(__APPLE__) && defined(__MACH__)
+newdef	: defined(APPLE) && defined(MACH)
 comment : OS X
 vendor	:						: "apple"
 hosttype: defined(i386)					: "intel-pc"
 hosttype: defined(ppc)					: "powermac"
+hosttype: defined(M_amd64)				: "amd"
 ostype	:						: "darwin"
 machtype: defined(i386)					: "i386"
+machtype: defined(M_amd64)				: "x86_64"
 machtype: defined(ppc)					: "powerpc"
 enddef	:
 
@@ -866,7 +902,7 @@ machtype: defined(mc68000)				: "mc68000"
 enddef	:
 
 
-newdef	: defined(ultrix) || defined(__ultrix)
+newdef	: defined(ultrix)
 comment : Digital's Ultrix
 vendor	:						: "dec"
 hosttype: defined(M_mipsel)				: "decstation"
@@ -928,7 +964,7 @@ hosttype:						: "masscomp"
 ostype	:						: "masscomp"
 enddef	:
 
-newdef	: defined(__MACHTEN__)
+newdef	: defined(MACHTEN)
 comment : Machintosh
 vendor	:						: "Tenon"
 hosttype:						: "Macintosh"
@@ -1051,7 +1087,7 @@ hosttype:						: "tekXD88"
 enddef	:
 
 
-newdef	: defined(__DGUX__)
+newdef	: defined(DGUX)
 comment : Data-General AViiON running DGUX
 hosttype:						: "aviion"
 ostype	:						: "dgux"
@@ -1085,14 +1121,14 @@ machtype:						: "m88k"
 enddef	:
 
 
-newdef	: defined(__clipper__)
+newdef	: defined(clipper)
 comment : Clipper Chipset (Intergraph)
 vendor	:						: "intergraph"
 hosttype:						: "clipper"
 machtype:						: "clipper"
 enddef	:
 
-newdef : defined(__QNX__)
+newdef : defined(QNX)
 ostype :						: "qnx"
 enddef :
 
@@ -1121,7 +1157,7 @@ machtype: #machine(sparc)				: "sparc"
 machtype:						: "bs2000"
 enddef	:
 
-newdef	: defined(__MVS__)
+newdef	: defined(MVS)
 comment : ibm uss s/390 (mainframe, EBCDIC)
 vendor	:						: "ibm"
 hosttype:						: "s390"
@@ -1145,7 +1181,7 @@ ostype	:						: "svr4"
 machtype: defined(M_i386)				: "i386"
 enddef	:
 
-newdef	: defined(__uxp__) || defined(__uxps__)
+newdef	: defined(uxp) || defined(uxps)
 comment : FUJITSU DS/90 7000
 vendor	:						: "fujitsu"
 hosttype:						: "ds90"
@@ -1153,9 +1189,9 @@ ostype	:						: "sysv4"
 machtype:						: "sparc"
 enddef	:
 
-newdef	: defined(__CYGWIN__)
+newdef	: defined(CYGWIN)
 comment : Cygwin
-vendor	:						: "intel"
+vendor	: defined(M_intel)				: "intel"
 hosttype:						: gethost()
 ostype	:						: getostype()
 machtype:						: getmach()
diff --git a/contrib/tcsh-6/README.DELETED b/contrib/tcsh-6/README.DELETED
index bffc9bc60b..869254fe70 100644
--- a/contrib/tcsh-6/README.DELETED
+++ b/contrib/tcsh-6/README.DELETED
@@ -1,3 +1,5 @@
+.cvsignore
+.travis.yml
 BUGS
 FAQ
 Fixes
@@ -12,6 +14,8 @@ Ported
 README.imake
 WishList
 Y2K
+aclocal.m4
+bar
 config.guess
 config.h.in
 config.sub
@@ -107,7 +111,7 @@ config/vms
 config/win32
 config/xenix
 configure
-configure.in
+configure.ac
 csh-mode.el
 cygwin/
 eight-bit.me
@@ -115,6 +119,7 @@ glob.3
 host.defs
 imake.config
 install-sh
+m4/
 ma.setp.c
 mi.varargs.h
 mi.wait.h
diff --git a/contrib/tcsh-6/README.DRAGONFLY b/contrib/tcsh-6/README.DRAGONFLY
index 04cfb15bf9..605cc20bf6 100644
--- a/contrib/tcsh-6/README.DRAGONFLY
+++ b/contrib/tcsh-6/README.DRAGONFLY
@@ -4,10 +4,10 @@ TCSH
 Original source is availale from:
 ftp://ftp.astron.com/pub/tcsh/
 
-file = tcsh-6.18.01.tar.gz
-date = 13 February 2012
-size = 926872
-sha1 = eee2035645737197ff8059c84933a75d23cd76f9
+file = tcsh-6.19.00.tar.gz
+date = 21 May 2015
+size = 947135
+sha1 = cdb1abe319fab5d3caff101c393293e5b3607f0c
 
 A list of files removed is in README.DELETED
 
@@ -15,12 +15,8 @@ Local modifications applied to following files:
 	ed.init.c
 	ed.term.c
 	ed.term.h
-	ed.screen.c
-	gethost.c
 	sh.c
-	sh.h
 	sh.decls.h
 	sh.func.c
 	sh.init.c
 	sh.set.c
-	sh.term.h