components/tcsh/patches/003.locale.patch
changeset 5271 195e24ffa71a
parent 1073 c80b2ce240a9
equal deleted inserted replaced
5270:00c5358f9f1d 5271:195e24ffa71a
     1 --- tcsh-6.18.01/configure.in.orig	Wed Sep  5 11:52:15 2012
     1 --- tcsh-6.19.00/sh.c.orig	Tue May 26 11:09:46 2015
     2 +++ tcsh-6.18.01/configure.in	Wed Sep  5 11:52:40 2012
     2 +++ tcsh-6.19.00/sh.c	Tue May 26 11:10:09 2015
     3 @@ -303,7 +303,6 @@
     3 @@ -176,17 +176,10 @@
     4  AC_SEARCH_LIBS(gethostbyname, nsl)
       
     5  AC_SEARCH_LIBS(connect, socket)
       
     6  AC_SEARCH_LIBS(catgets, catgets)
       
     7 -AM_ICONV
       
     8  
       
     9  dnl Checks for header files
       
    10  AC_CHECK_HEADERS([auth.h crypt.h features.h inttypes.h paths.h] dnl
       
    11 --- tcsh-6.18.01/Makefile.in.orig	Wed Sep  5 11:56:12 2012
       
    12 +++ tcsh-6.18.01/Makefile.in	Wed Sep  5 11:57:51 2012
       
    13 @@ -12,6 +12,7 @@
       
    14  BUILD=tcsh$(EXEEXT)
       
    15  [email protected]@
       
    16  [email protected]@
       
    17 [email protected]@
       
    18  
       
    19  ################################################################
       
    20  ## CFLAGS.  For various -D things, see config.h
       
    21 @@ -145,6 +146,7 @@
       
    22  #DFLAGS=-D_PATH_TCSHELL='"${DESTBIN}/tcsh"'
       
    23  ## The following is set by autoconf.
       
    24  DFLAGS = -D_PATH_TCSHELL='"${bindir}/tcsh"' @[email protected] @[email protected]
       
    25 +DFLAGS += -DLOCALEDIR='"${localedir}"'
       
    26  
       
    27  
       
    28  ################################################################
       
    29 @@ -296,7 +298,7 @@
       
    30  #
       
    31  
       
    32  EXTRAFLAGS = @[email protected] $(AFSDEF)
       
    33 -EXTRALIBS = @[email protected] $(AFSLIB) @[email protected]
       
    34 +EXTRALIBS = @[email protected] $(AFSLIB)
       
    35  
       
    36  
       
    37  
       
    38 --- tcsh-6.18.01/sh.c.orig	Thu Nov 15 14:26:18 2012
       
    39 +++ tcsh-6.18.01/sh.c	Thu Nov 15 14:26:37 2012
       
    40 @@ -175,17 +175,10 @@
       
    41      size_t len;
     4      size_t len;
    42      int add_LOC = 1;
     5      int add_LOC = 1;
    43      int add_lang = 1;
     6      int add_lang = 1;
    44 -    char trypath[MAXPATHLEN];
     7 -    char trypath[MAXPATHLEN];
    45 -    struct stat st;
     8 -    struct stat st;
    53 -	return;
    16 -	return;
    54 -
    17 -
    55      if ((old = getenv("NLSPATH")) != NULL)
    18      if ((old = getenv("NLSPATH")) != NULL)
    56          len = strlen(old) + 1;	/* don't forget the colon. */
    19          len = strlen(old) + 1;	/* don't forget the colon. */
    57      else
    20      else
    58 --- tcsh-6.18.01/sh.func.c.orig	Mon Dec  3 13:09:33 2012
    21 --- tcsh-6.19.00/sh.func.c.orig	Tue May 26 11:10:46 2015
    59 +++ tcsh-6.18.01/sh.func.c	Mon Dec  3 13:09:54 2012
    22 +++ tcsh-6.19.00/sh.func.c	Tue May 26 11:11:47 2015
    60 @@ -2627,6 +2627,8 @@
    23 @@ -2657,6 +2657,8 @@
    61  
    24  
    62      if (adrof(STRcatalog) != NULL)
    25      if (adrof(STRcatalog) != NULL)
    63  	catalog = xasprintf("tcsh.%s", short2str(varval(STRcatalog)));
    26  	catalog = xasprintf("tcsh.%s", short2str(varval(STRcatalog)));
    64 +/* for compatibility */
    27 +/* for compatibility */
    65 +#undef NL_CAT_LOCALE
    28 +#undef NL_CAT_LOCALE