--- a/components/tcsh/Makefile	Wed Jul 30 01:21:09 2014 -0700
+++ b/components/tcsh/Makefile	Thu Jul 31 12:11:52 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -48,6 +48,11 @@
 
 LOCALEDIR=$(PROTO_DIR)/$(CONFIGURE_LOCALEDIR)
 
+# since we patch out AM_ICONV so we can run autoconf,
+# the new configure doesn't look for iconv(3C), so
+# we'll tell it here.
+CFLAGS += -DHAVE_ICONV -DICONV_CONST=
+
 CONFIGURE_OPTIONS  +=		--localedir=$(CONFIGURE_LOCALEDIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcsh/patches/005.locale.patch	Thu Jul 31 12:11:52 2014 -0700
@@ -0,0 +1,14 @@
+--- tcsh-6.18.01/sh.char.h.orig	Thu Apr 17 10:20:22 2014
++++ tcsh-6.18.01/sh.char.h	Thu Apr 17 10:20:38 2014
+@@ -167,9 +167,9 @@
+ #define iscmdmeta(c)	cmap((c), _CMD)
+ #ifdef WIDE_STRINGS
+ #define letter(c)	(((c) & QUOTE) ? 0 :  \
+-			 (iswalpha((tcshuc) (c)) || (c) == '_'))
++			 (iswalpha((c)) || (c) == '_'))
+ #define alnum(c)	(((c) & QUOTE) ? 0 :  \
+-		         (iswalnum((tcshuc) (c)) || (c) == '_'))
++		         (iswalnum((c)) || (c) == '_'))
+ #else
+ #define letter(c)	(((Char)(c) & QUOTE) ? 0 :  \
+ 			 ((isalpha((tcshuc) (c)) && !(cmap((c), _PUN))) \