From 36b44d59ffb7e5797a4f184a293e085b813f4220 Mon Sep 17 00:00:00 2001 From: mp Date: Sun, 11 Mar 2007 22:41:19 +0000 Subject: [PATCH] Build updates for tcsh-6.15.00 import. Reviewed by: ume Reminded by: Divacky Roman MFC after: 1 week --- bin/csh/config.h | 48 ++++++++++++++++++++++++++++-------- bin/csh/config_p.h | 14 +---------- contrib/tcsh/FREEBSD-Xlist | 1 + contrib/tcsh/FREEBSD-upgrade | 6 ++--- 4 files changed, 43 insertions(+), 26 deletions(-) diff --git a/bin/csh/config.h b/bin/csh/config.h index 3929e3740ca..c9b01ef7aa9 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -12,10 +12,28 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_AUTH_H */ +/* Define to 1 if you have the `catgets' function. */ +#define HAVE_CATGETS 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPT_H */ + +/* Define to 1 if you have the declaration of `crypt', and to 0 if you don't. + */ +#define HAVE_DECL_CRYPT 1 + +/* Define to 1 if you have the declaration of `environ', and to 0 if you + don't. */ +#define HAVE_DECL_ENVIRON 0 + /* Define to 1 if you have the declaration of `gethostname', and to 0 if you don't. */ #define HAVE_DECL_GETHOSTNAME 1 +/* Define to 1 if you have the declaration of `getpgrp', and to 0 if you + don't. */ +#define HAVE_DECL_GETPGRP 1 + /* Define to 1 if you have the header file, and it defines `DIR'. */ #define HAVE_DIRENT_H 1 @@ -23,6 +41,9 @@ /* Define to 1 if you have the `dup2' function. */ #define HAVE_DUP2 1 +/* Define to 1 if you have the `getauthid' function. */ +/* #undef HAVE_GETAUTHID */ + /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 @@ -35,7 +56,7 @@ /* Define to 1 if you have the `getutent' function. */ /* #undef HAVE_GETUTENT */ -/* Define to 1 if you have the iconv () interface */ +/* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ /* Define to 1 if you have the header file. */ @@ -44,6 +65,9 @@ /* Define to 1 if the system has the type `long long'. */ #define HAVE_LONG_LONG 1 +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 @@ -80,6 +104,10 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 +/* Define to 1 if you have the `strcoll' function and it is properly defined. + */ +#define HAVE_STRCOLL 1 + /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -145,6 +173,12 @@ /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST const + +/* Support NLS. */ +#define NLS 1 + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -160,12 +194,6 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "" -/* Define to 1 if the C compiler supports function prototypes. */ -#define PROTOTYPES 1 - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void - /* Define to 1 if the `setpgrp' function takes no argument. */ /* #undef SETPGRP_VOID */ @@ -178,9 +206,6 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Define like PROTOTYPES; this can be used by system headers. */ -#define __PROTOTYPES 1 - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -196,6 +221,9 @@ /* Define to `int' if neither nor define. */ /* #undef socklen_t */ +/* Define to `int' not defined in . */ +/* #undef ssize_t */ + /* Define to `int' if doesn't define. */ /* #undef uid_t */ diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h index 65b7f6a16bb..6de288b387e 100644 --- a/bin/csh/config_p.h +++ b/bin/csh/config_p.h @@ -21,11 +21,6 @@ */ #define POSIXJOBS -/* - * POSIXSIGS Use the POSIX signal facilities to emulate BSD signals. - */ -#undef POSIXSIGS - /* * VFORK This machine has a vfork(). * It used to be that for job control to work, this define @@ -47,17 +42,10 @@ */ #define BSDJOBS -/* - * BSDSIGS You have 4.2-style signals, rather than USG style. - * Note: POSIX systems should not define this unless they - * have sigvec() and friends (ie: 4.3BSD-RENO, HP-UX). - */ -#define BSDSIGS - /* * BSDTIMES You have BSD-style process time stuff (like rusage) * This may or may not be true. For example, Apple Unix - * (OREO) has BSDJOBS and BSDSIGS but not BSDTIMES. + * (OREO) has BSDJOBS but not BSDTIMES. */ #define BSDTIMES diff --git a/contrib/tcsh/FREEBSD-Xlist b/contrib/tcsh/FREEBSD-Xlist index 04503728f1d..b6e5636aa56 100644 --- a/contrib/tcsh/FREEBSD-Xlist +++ b/contrib/tcsh/FREEBSD-Xlist @@ -5,4 +5,5 @@ $FreeBSD$ */config/bsd */config/bsdreno */config/[c-z]* +*/tests */win32 diff --git a/contrib/tcsh/FREEBSD-upgrade b/contrib/tcsh/FREEBSD-upgrade index b7fbfe84761..7bfdaf8a209 100644 --- a/contrib/tcsh/FREEBSD-upgrade +++ b/contrib/tcsh/FREEBSD-upgrade @@ -5,9 +5,9 @@ Christos Zoulas `tcsh' The stripped down version was created using FREEBSD-Xlist during extraction: - tar -X FREEBSD-Xlist -xzf tcsh-6.12.00.tar.gz + tar -X FREEBSD-Xlist -xzf tcsh-6.15.00.tar.gz Imported by: - cvs import -m "Import of tcsh-6.12.00" \ - src/contrib/tcsh ZOULAS tcsh_6_12 + cvs import -m "Import of tcsh-6.15.00" \ + src/contrib/tcsh ZOULAS tcsh_6_15 -- 2.45.0