From: John Marino <draco@marino.st>
Date: Fri, 3 Jul 2015 23:12:37 +0000 (+0200)
Subject: iconv sync 8/x: FreeBSD SVN 281550
X-Git-Tag: v4.3.1~265
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0db70a6ab02af296a425c9de48294a4da59c442b

iconv sync 8/x: FreeBSD SVN 281550

Remove the const qualifier from iconv(3) to comply with POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
Adjust all code that calls iconv

Note: The libcpp Makefile cflag was added because the host iconv.h
      header was getting pulled in.  This always should have been the
      src version of iconv.h, but the error wasn't exposed until now.
---

diff --git a/bin/csh/config.h b/bin/csh/config.h
index 4a73fab396..039aa6180c 100644
--- a/bin/csh/config.h
+++ b/bin/csh/config.h
@@ -197,7 +197,7 @@
 #define HAVE_WCWIDTH 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Support NLS. */
 #define NLS 1
diff --git a/contrib/smbfs/include/netsmb/smb_lib.h b/contrib/smbfs/include/netsmb/smb_lib.h
index ecf45184a3..a448e5d3f3 100644
--- a/contrib/smbfs/include/netsmb/smb_lib.h
+++ b/contrib/smbfs/include/netsmb/smb_lib.h
@@ -191,7 +191,7 @@ int  smb_ctx_readrc(struct smb_ctx *);
 int  smb_ctx_resolve(struct smb_ctx *);
 int  smb_ctx_setflags(struct smb_ctx *, int, int, int);
 
-int  smb_smb_open_print_file(struct smb_ctx *, int, int, const char *, smbfh*);
+int  smb_smb_open_print_file(struct smb_ctx *, int, int, char *, smbfh*);
 int  smb_smb_close_print_file(struct smb_ctx *, smbfh);
 
 int  smb_read(struct smb_ctx *, smbfh, off_t, size_t, char *);
@@ -204,8 +204,8 @@ int  smb_rq_init(struct smb_ctx *, u_char, size_t, struct smb_rq **);
 void smb_rq_done(struct smb_rq *);
 void smb_rq_wend(struct smb_rq *);
 int  smb_rq_simple(struct smb_rq *);
-int  smb_rq_dmem(struct mbdata *, const char *, size_t);
-int  smb_rq_dstring(struct mbdata *, const char *);
+int  smb_rq_dmem(struct mbdata *, char *, size_t);
+int  smb_rq_dstring(struct mbdata *, char *);
 
 int  smb_t2_request(struct smb_ctx *, int, int, const char *,
 	int, void *, int, void *, int *, void *, int *, void *);
@@ -246,10 +246,10 @@ extern u_char nls_lower[256], nls_upper[256];
 
 int   nls_setrecode(const char *, const char *);
 int   nls_setlocale(const char *);
-char* nls_str_toext(char *, const char *);
-char* nls_str_toloc(char *, const char *);
-void* nls_mem_toext(void *, const void *, int);
-void* nls_mem_toloc(void *, const void *, int);
+char* nls_str_toext(char *, char *);
+char* nls_str_toloc(char *, char *);
+void* nls_mem_toext(void *, void *, int);
+void* nls_mem_toloc(void *, void *, int);
 char* nls_str_upper(char *, const char *);
 char* nls_str_lower(char *, const char *);
 
diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c
index 8af1de7cd1..abd831f3b8 100644
--- a/contrib/smbfs/lib/smb/nls.c
+++ b/contrib/smbfs/lib/smb/nls.c
@@ -54,7 +54,7 @@
 typedef void *iconv_t;
 
 static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
+static size_t(*my_iconv)(iconv_t, char **, size_t *, char **, size_t *);
 static int(*my_iconv_close)(iconv_t);
 
 u_char nls_lower[256];
@@ -123,7 +123,7 @@ nls_setrecode(const char *local, const char *external)
 }
 
 char *
-nls_str_toloc(char *dst, const char *src)
+nls_str_toloc(char *dst, char *src)
 {
 	char *p = dst;
 	size_t inlen, outlen;
@@ -145,7 +145,7 @@ nls_str_toloc(char *dst, const char *src)
 }
 
 char *
-nls_str_toext(char *dst, const char *src)
+nls_str_toext(char *dst, char *src)
 {
 	char *p = dst;
 	size_t inlen, outlen;
@@ -167,10 +167,10 @@ nls_str_toext(char *dst, const char *src)
 }
 
 void *
-nls_mem_toloc(void *dst, const void *src, int size)
+nls_mem_toloc(void *dst, void *src, int size)
 {
 	char *p = dst;
-	const char *s = src;
+	char *s = src;
 	size_t inlen, outlen;
 
 	if (!iconv_loaded)
@@ -192,10 +192,10 @@ nls_mem_toloc(void *dst, const void *src, int size)
 }
 
 void *
-nls_mem_toext(void *dst, const void *src, int size)
+nls_mem_toext(void *dst, void *src, int size)
 {
 	char *p = dst;
-	const char *s = src;
+	char *s = src;
 	size_t inlen, outlen;
 
 	if (size == 0)
diff --git a/contrib/smbfs/lib/smb/print.c b/contrib/smbfs/lib/smb/print.c
index 243ad5b293..b4c07c620b 100644
--- a/contrib/smbfs/lib/smb/print.c
+++ b/contrib/smbfs/lib/smb/print.c
@@ -54,7 +54,7 @@
 
 int
 smb_smb_open_print_file(struct smb_ctx *ctx, int setuplen, int mode,
-	const char *ident, smbfh *fhp)
+	char *ident, smbfh *fhp)
 {
 	struct smb_rq *rqp;
 	struct mbdata *mbp;
diff --git a/contrib/smbfs/lib/smb/rq.c b/contrib/smbfs/lib/smb/rq.c
index d70ab6e6be..4e162f33d4 100644
--- a/contrib/smbfs/lib/smb/rq.c
+++ b/contrib/smbfs/lib/smb/rq.c
@@ -86,7 +86,7 @@ smb_rq_wend(struct smb_rq *rqp)
 }
 
 int
-smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size)
+smb_rq_dmem(struct mbdata *mbp, char *src, size_t size)
 {
 	struct mbuf *m;
 	char * dst;
@@ -118,7 +118,7 @@ smb_rq_dmem(struct mbdata *mbp, const char *src, size_t size)
 }
 
 int
-smb_rq_dstring(struct mbdata *mbp, const char *s)
+smb_rq_dstring(struct mbdata *mbp, char *s)
 {
 	return smb_rq_dmem(mbp, s, strlen(s) + 1);
 }
diff --git a/gnu/lib/gcc50/libstdcxx/headers/config.h b/gnu/lib/gcc50/libstdcxx/headers/config.h
index 55d1aadf90..147af403be 100644
--- a/gnu/lib/gcc50/libstdcxx/headers/config.h
+++ b/gnu/lib/gcc50/libstdcxx/headers/config.h
@@ -666,7 +666,7 @@
 /* #undef HAVE___CXA_THREAD_ATEXIT_IMPL */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff --git a/gnu/lib/libdialog/dlg_config.h b/gnu/lib/libdialog/dlg_config.h
index e1a28f30ab..869b2b763e 100644
--- a/gnu/lib/libdialog/dlg_config.h
+++ b/gnu/lib/libdialog/dlg_config.h
@@ -95,7 +95,7 @@
 #define HAVE_XDIALOG 1
 #define HAVE_XDIALOG2 1
 #define HAVE__NC_FREE_AND_EXIT 1
-#define ICONV_CONST const
+#define ICONV_CONST
 #define MIXEDCASE_FILENAMES 1
 #define NCURSES 1
 #define NEED_WCHAR_H 1
diff --git a/gnu/usr.bin/binutils224/libbinutils/config.h b/gnu/usr.bin/binutils224/libbinutils/config.h
index eb3a29121a..3711f6cc03 100644
--- a/gnu/usr.bin/binutils224/libbinutils/config.h
+++ b/gnu/usr.bin/binutils224/libbinutils/config.h
@@ -176,7 +176,7 @@
 #define HAVE_ZLIB_H 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff --git a/gnu/usr.bin/binutils225/block1/bulibs/config.h b/gnu/usr.bin/binutils225/block1/bulibs/config.h
index d9f9c438d8..6070060786 100644
--- a/gnu/usr.bin/binutils225/block1/bulibs/config.h
+++ b/gnu/usr.bin/binutils225/block1/bulibs/config.h
@@ -182,7 +182,7 @@
 #define HAVE_ZLIB_H 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff --git a/gnu/usr.bin/cc47/cc_prep/auto-host.h b/gnu/usr.bin/cc47/cc_prep/auto-host.h
index c77a799610..b27b7a21ab 100644
--- a/gnu/usr.bin/cc47/cc_prep/auto-host.h
+++ b/gnu/usr.bin/cc47/cc_prep/auto-host.h
@@ -1595,7 +1595,7 @@
 
 /* Define as const if the declaration of iconv() needs const. */
 #ifndef USED_FOR_TARGET
-#define ICONV_CONST const
+#define ICONV_CONST
 #endif
 
 
diff --git a/gnu/usr.bin/cc47/libcpp/config.h b/gnu/usr.bin/cc47/libcpp/config.h
index fa9705a56d..3241a1d849 100644
--- a/gnu/usr.bin/cc47/libcpp/config.h
+++ b/gnu/usr.bin/cc47/libcpp/config.h
@@ -231,7 +231,7 @@
 #endif
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the name of this package. */
 #define PACKAGE "cpplib"
diff --git a/gnu/usr.bin/cc50/Makefile.inc b/gnu/usr.bin/cc50/Makefile.inc
index 30c361750a..6b52ed91e1 100644
--- a/gnu/usr.bin/cc50/Makefile.inc
+++ b/gnu/usr.bin/cc50/Makefile.inc
@@ -37,6 +37,7 @@ FLAGS+=		-I${STOPDIR}/../gmp
 FLAGS+=		-I${STOPDIR}/../../../contrib/mpfr/src
 FLAGS+=		-I${STOPDIR}/../mpfr
 FLAGS+=		-I${STOPDIR}/../../../contrib/mpc/src
+FLAGS+=		-I${STOPDIR}/../../../include
 FLAGS+=		-I${GCCDIR}/gcc/config/i386
 FLAGS+=		-I${TOOLDIR}
 
diff --git a/gnu/usr.bin/cc50/cc_prep/auto-host.h b/gnu/usr.bin/cc50/cc_prep/auto-host.h
index 5daae564e0..60d5f4fe19 100644
--- a/gnu/usr.bin/cc50/cc_prep/auto-host.h
+++ b/gnu/usr.bin/cc50/cc_prep/auto-host.h
@@ -1779,7 +1779,7 @@
 
 /* Define as const if the declaration of iconv() needs const. */
 #ifndef USED_FOR_TARGET
-#define ICONV_CONST const
+#define ICONV_CONST
 #endif
 
 
diff --git a/gnu/usr.bin/cc50/support-libs/libcpp/config.h b/gnu/usr.bin/cc50/support-libs/libcpp/config.h
index c3a04147f2..6b71356c4c 100644
--- a/gnu/usr.bin/cc50/support-libs/libcpp/config.h
+++ b/gnu/usr.bin/cc50/support-libs/libcpp/config.h
@@ -230,7 +230,7 @@
 #define HAVE_UNISTD_H 1
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the name of this package. */
 #define PACKAGE "cpplib"
diff --git a/gnu/usr.bin/diff/libdiffutils/config.h b/gnu/usr.bin/diff/libdiffutils/config.h
index 3888c8174a..e6b30f9fac 100644
--- a/gnu/usr.bin/diff/libdiffutils/config.h
+++ b/gnu/usr.bin/diff/libdiffutils/config.h
@@ -1502,7 +1502,7 @@
 /* #undef HAVE___SECURE_GETENV */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to a symbolic name denoting the flavor of iconv_open()
    implementation. */
diff --git a/gnu/usr.bin/gdb/libgdb/config.h b/gnu/usr.bin/gdb/libgdb/config.h
index 0fca2e67ed..a6d6127b5b 100644
--- a/gnu/usr.bin/gdb/libgdb/config.h
+++ b/gnu/usr.bin/gdb/libgdb/config.h
@@ -590,7 +590,7 @@
 /* #undef ICONV_BIN_RELOCATABLE */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* directory to load the JIT readers from */
 #define JIT_READER_DIR "/usr/lib/gdb"
diff --git a/gnu/usr.bin/grep/libgreputils/config.h b/gnu/usr.bin/grep/libgreputils/config.h
index 75510c094e..08bfb60693 100644
--- a/gnu/usr.bin/grep/libgreputils/config.h
+++ b/gnu/usr.bin/grep/libgreputils/config.h
@@ -1516,7 +1516,7 @@
 /* #undef HAVE__SET_INVALID_PARAMETER_HANDLER */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to a symbolic name denoting the flavor of iconv_open()
    implementation. */
diff --git a/gnu/usr.bin/grep/libgreputils/iconv.h b/gnu/usr.bin/grep/libgreputils/iconv.h
index dbdd9f7cb8..947a1e7520 100644
--- a/gnu/usr.bin/grep/libgreputils/iconv.h
+++ b/gnu/usr.bin/grep/libgreputils/iconv.h
@@ -400,7 +400,7 @@ _GL_CXXALIAS_SYS (iconv, size_t,
 # endif
 _GL_CXXALIASWARN (iconv);
 # ifndef ICONV_CONST
-#  define ICONV_CONST const
+#  define ICONV_CONST
 # endif
 #endif
 
diff --git a/include/iconv.h b/include/iconv.h
index 65406f8870..f8cc2d75d1 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD: head/include/iconv.h 255297 2013-09-06 09:46:44Z theraven $	*/
+/*	$FreeBSD: head/include/iconv.h 281550 2015-04-15 09:09:20Z tijl $	*/
 /*	$NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $	*/
 
 /*-
@@ -51,7 +51,7 @@ typedef	struct __tag_iconv_t	*iconv_t;
 
 __BEGIN_DECLS
 iconv_t	iconv_open(const char *, const char *);
-size_t	iconv(iconv_t, const char ** __restrict,
+size_t	iconv(iconv_t, char ** __restrict,
 	      size_t * __restrict, char ** __restrict,
 	      size_t * __restrict);
 int	iconv_close(iconv_t);
@@ -60,7 +60,7 @@ int	iconv_close(iconv_t);
  */
 int	__iconv_get_list(char ***, size_t *, __iconv_bool);
 void	__iconv_free_list(char **, size_t);
-size_t	__iconv(iconv_t, const char **, size_t *, char **,
+size_t	__iconv(iconv_t, char **, size_t *, char **,
 		     size_t *, __uint32_t, size_t *);
 #define __ICONV_F_HIDE_INVALID	0x0001
 
@@ -76,8 +76,7 @@ typedef struct {
 } iconv_allocation_t;
 
 int	 iconv_open_into(const char *, const char *, iconv_allocation_t *);
-void	 iconv_set_relocation_prefix(const char *orig_prefix,
-	     const char *curr_prefix);
+void	 iconv_set_relocation_prefix(const char *, const char *);
 
 /*
  * iconvctl() request macros
diff --git a/lib/i18n_module/BIG5/citrus_big5.c b/lib/i18n_module/BIG5/citrus_big5.c
index d46b8d2690..d28b5eedd0 100644
--- a/lib/i18n_module/BIG5/citrus_big5.c
+++ b/lib/i18n_module/BIG5/citrus_big5.c
@@ -267,12 +267,12 @@ static int
 /*ARGSUSED*/
 _citrus_BIG5_mbrtowc_priv(_BIG5EncodingInfo * __restrict ei,
     wchar_t * __restrict pwc,
-    const char ** __restrict s, size_t n,
+    char ** __restrict s, size_t n,
     _BIG5State * __restrict psenc,
     size_t * __restrict nresult)
 {
 	wchar_t wchar;
-	const char *s0;
+	char *s0;
 	int c, chlenbak;
 
 	s0 = *s;
diff --git a/lib/i18n_module/DECHanyu/citrus_dechanyu.c b/lib/i18n_module/DECHanyu/citrus_dechanyu.c
index ac455631cf..5c434443be 100644
--- a/lib/i18n_module/DECHanyu/citrus_dechanyu.c
+++ b/lib/i18n_module/DECHanyu/citrus_dechanyu.c
@@ -163,10 +163,10 @@ is_94charset(int c)
 static int
 /*ARGSUSED*/
 _citrus_DECHanyu_mbrtowc_priv(_DECHanyuEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _DECHanyuState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	wchar_t wc;
 	int ch;
 
diff --git a/lib/i18n_module/EUC/citrus_euc.c b/lib/i18n_module/EUC/citrus_euc.c
index b1c064f548..4a616f91f1 100644
--- a/lib/i18n_module/EUC/citrus_euc.c
+++ b/lib/i18n_module/EUC/citrus_euc.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/EUC/citrus_euc.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/EUC/citrus_euc.c 281550 2015-04-15 09:09:20Z tijl $ */
 /*	$NetBSD: citrus_euc.c,v 1.14 2009/01/11 02:46:24 christos Exp $	*/
 
 /*-
@@ -188,12 +188,12 @@ _citrus_EUC_unpack_state(_EUCEncodingInfo *ei __unused, _EUCState *s,
 }
 
 static int
-_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, const char **s,
+_citrus_EUC_mbrtowc_priv(_EUCEncodingInfo *ei, wchar_t *pwc, char **s,
     size_t n, _EUCState *psenc, size_t *nresult)
 {
 	wchar_t wchar;
 	int c, chlenbak, cs, len;
-	const char *s0, *s1 = NULL;
+	char *s0, *s1 = NULL;
 
 	s0 = *s;
 
diff --git a/lib/i18n_module/EUCTW/citrus_euctw.c b/lib/i18n_module/EUCTW/citrus_euctw.c
index 80254d16d4..fd8014f680 100644
--- a/lib/i18n_module/EUCTW/citrus_euctw.c
+++ b/lib/i18n_module/EUCTW/citrus_euctw.c
@@ -174,10 +174,10 @@ _citrus_EUCTW_encoding_module_uninit(_EUCTWEncodingInfo *ei __unused)
 
 static int
 _citrus_EUCTW_mbrtowc_priv(_EUCTWEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s,
+    wchar_t * __restrict pwc, char ** __restrict s,
     size_t n, _EUCTWState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	wchar_t wchar;
 	int c, chlenbak, cs;
 
diff --git a/lib/i18n_module/GBK2K/citrus_gbk2k.c b/lib/i18n_module/GBK2K/citrus_gbk2k.c
index 7ec023a98a..1f01106c5a 100644
--- a/lib/i18n_module/GBK2K/citrus_gbk2k.c
+++ b/lib/i18n_module/GBK2K/citrus_gbk2k.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/GBK2K/citrus_gbk2k.c 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_gbk2k.c,v 1.7 2008/06/14 16:01:07 tnozaki Exp $ */
 
 /*-
@@ -147,10 +147,10 @@ _mb_count(wchar_t v)
 
 static int
 _citrus_GBK2K_mbrtowc_priv(_GBK2KEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _GBK2KState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0, *s1;
+	char *s0, *s1;
 	wchar_t wc;
 	int chlenbak, len;
 
diff --git a/lib/i18n_module/HZ/citrus_hz.c b/lib/i18n_module/HZ/citrus_hz.c
index 4b5ee8e52a..c843d1292f 100644
--- a/lib/i18n_module/HZ/citrus_hz.c
+++ b/lib/i18n_module/HZ/citrus_hz.c
@@ -65,8 +65,8 @@ typedef enum {
 } charset_t;
 
 typedef struct {
-	int	 end;
 	int	 start;
+	int	 end;
 	int	 width;
 } range_t;
 
@@ -173,13 +173,13 @@ _citrus_HZ_unpack_state(_HZEncodingInfo * __restrict ei __unused,
 
 static int
 _citrus_HZ_mbrtowc_priv(_HZEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _HZState * __restrict psenc, size_t * __restrict nresult)
 {
 	escape_t *candidate, *init;
 	graphic_t *graphic;
 	const range_t *range;
-	const char *s0;
+	char *s0;
 	wchar_t wc;
 	int bit, ch, head, len, tail;
 
@@ -530,10 +530,9 @@ _citrus_HZ_parse_graphic(void *context, const char *name, const char *s)
 	p = (void **)context;
 	escape = (escape_t *)p[0];
 	ei = (_HZEncodingInfo *)p[1];
-	graphic = malloc(sizeof(*graphic));
+	graphic = calloc(1, sizeof(*graphic));
 	if (graphic == NULL)
 		return (ENOMEM);
-	memset(graphic, 0, sizeof(*graphic));
 	if (strcmp("GL", name) == 0) {
 		if (GL(escape) != NULL)
 			goto release;
@@ -596,10 +595,9 @@ _citrus_HZ_parse_escape(void *context, const char *name, const char *s)
 	void *p[2];
 
 	ei = (_HZEncodingInfo *)context;
-	escape = malloc(sizeof(*escape));
+	escape = calloc(1, sizeof(*escape));
 	if (escape == NULL)
 		return (EINVAL);
-	memset(escape, 0, sizeof(*escape));
 	if (strcmp("0", name) == 0) {
 		escape->set = E0SET(ei);
 		TAILQ_INSERT_TAIL(E0SET(ei), escape, entry);
diff --git a/lib/i18n_module/ISO2022/citrus_iso2022.c b/lib/i18n_module/ISO2022/citrus_iso2022.c
index 9338a0cb8f..ad8400dec3 100644
--- a/lib/i18n_module/ISO2022/citrus_iso2022.c
+++ b/lib/i18n_module/ISO2022/citrus_iso2022.c
@@ -572,7 +572,7 @@ terminate:
 
 static wchar_t
 _ISO2022_sgetwchar(_ISO2022EncodingInfo * __restrict ei __unused,
-    const char * __restrict string, size_t n, const char ** __restrict result,
+    char * __restrict string, size_t n, char ** __restrict result,
     _ISO2022State * __restrict psenc)
 {
 	const struct seqtable *sp;
@@ -840,10 +840,10 @@ asis:
 
 static int
 _citrus_ISO2022_mbrtowc_priv(_ISO2022EncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s,
+    wchar_t * __restrict pwc, char ** __restrict s,
     size_t n, _ISO2022State * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *p, *result, *s0;
+	char *p, *result, *s0;
 	wchar_t wchar;
 	int c, chlenbak;
 
diff --git a/lib/i18n_module/JOHAB/citrus_johab.c b/lib/i18n_module/JOHAB/citrus_johab.c
index 123a301f1e..dfc4760785 100644
--- a/lib/i18n_module/JOHAB/citrus_johab.c
+++ b/lib/i18n_module/JOHAB/citrus_johab.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/JOHAB/citrus_johab.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/JOHAB/citrus_johab.c 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_johab.c,v 1.4 2008/06/14 16:01:07 tnozaki Exp $ */
 
 /*-
@@ -143,10 +143,10 @@ ishanja(int l, int t)
 static int
 /*ARGSUSED*/
 _citrus_JOHAB_mbrtowc_priv(_JOHABEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _JOHABState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	int l, t;
 
 	if (*s == NULL) {
diff --git a/lib/i18n_module/MSKanji/citrus_mskanji.c b/lib/i18n_module/MSKanji/citrus_mskanji.c
index 1e0cb16e97..7336bc51a7 100644
--- a/lib/i18n_module/MSKanji/citrus_mskanji.c
+++ b/lib/i18n_module/MSKanji/citrus_mskanji.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/MSKanji/citrus_mskanji.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/MSKanji/citrus_mskanji.c 281550 2015-04-15 09:09:20Z tijl $ */
 /*	$NetBSD: citrus_mskanji.c,v 1.13 2008/06/14 16:01:08 tnozaki Exp $	*/
 
 /*-
@@ -151,10 +151,10 @@ _citrus_MSKanji_unpack_state(_MSKanjiEncodingInfo * __restrict ei __unused,
 static int
 /*ARGSUSED*/
 _citrus_MSKanji_mbrtowc_priv(_MSKanjiEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _MSKanjiState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	wchar_t wchar;
 	int chlenbak, len;
 
diff --git a/lib/i18n_module/UES/citrus_ues.c b/lib/i18n_module/UES/citrus_ues.c
index 76f16cb16c..3ae3b1abe9 100644
--- a/lib/i18n_module/UES/citrus_ues.c
+++ b/lib/i18n_module/UES/citrus_ues.c
@@ -183,10 +183,10 @@ is_basic(wchar_t wc)
 
 static int
 _citrus_UES_mbrtowc_priv(_UESEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _UESState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	int ch, head, num, tail;
 	wchar_t hi, wc;
 
diff --git a/lib/i18n_module/UTF1632/citrus_utf1632.c b/lib/i18n_module/UTF1632/citrus_utf1632.c
index 06535f71cd..aea068c646 100644
--- a/lib/i18n_module/UTF1632/citrus_utf1632.c
+++ b/lib/i18n_module/UTF1632/citrus_utf1632.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/UTF1632/citrus_utf1632.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/UTF1632/citrus_utf1632.c 281550 2015-04-15 09:09:20Z tijl $ */
 /*	$NetBSD: citrus_utf1632.c,v 1.9 2008/06/14 16:01:08 tnozaki Exp $	*/
 
 /*-
@@ -97,9 +97,9 @@ _citrus_UTF1632_init_state(_UTF1632EncodingInfo *ei __unused,
 
 static int
 _citrus_UTF1632_mbrtowc_priv(_UTF1632EncodingInfo *ei, wchar_t *pwc,
-    const char **s, size_t n, _UTF1632State *psenc, size_t *nresult)
+    char **s, size_t n, _UTF1632State *psenc, size_t *nresult)
 {
-	const char *s0;
+	char *s0;
 	size_t result;
 	wchar_t wc = L'\0';
 	int chlenbak, endian, needlen;
diff --git a/lib/i18n_module/UTF7/citrus_utf7.c b/lib/i18n_module/UTF7/citrus_utf7.c
index fa843d3cef..03deccd61c 100644
--- a/lib/i18n_module/UTF7/citrus_utf7.c
+++ b/lib/i18n_module/UTF7/citrus_utf7.c
@@ -149,11 +149,11 @@ static const char spaces[] = " \t\r\n";
 
 static int
 _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,
-    uint16_t * __restrict u16, const char ** __restrict s, size_t n,
+    uint16_t * __restrict u16, char ** __restrict s, size_t n,
     _UTF7State * __restrict psenc, size_t * __restrict nresult)
 {
 	_UTF7State sv;
-	const char *s0;
+	char *s0;
 	int done, i, len;
 
 	s0 = *s;
@@ -238,10 +238,10 @@ ilseq:
 
 static int
 _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _UTF7State * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	uint32_t u32;
 	uint16_t hi, lo;
 	size_t nr, siz;
diff --git a/lib/i18n_module/UTF8/citrus_utf8.c b/lib/i18n_module/UTF8/citrus_utf8.c
index c466198299..eda7a0dd18 100644
--- a/lib/i18n_module/UTF8/citrus_utf8.c
+++ b/lib/i18n_module/UTF8/citrus_utf8.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/UTF8/citrus_utf8.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/UTF8/citrus_utf8.c 281550 2015-04-15 09:09:20Z tijl $ */
 /*	$NetBSD: citrus_utf8.c,v 1.17 2008/06/14 16:01:08 tnozaki Exp $	*/
 
 /*-
@@ -175,10 +175,10 @@ _citrus_UTF8_unpack_state(_UTF8EncodingInfo *ei __unused, _UTF8State *s,
 }
 
 static int
-_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, const char **s,
+_citrus_UTF8_mbrtowc_priv(_UTF8EncodingInfo *ei, wchar_t *pwc, char **s,
     size_t n, _UTF8State *psenc, size_t *nresult)
 {
-	const char *s0;
+	char *s0;
 	wchar_t wchar;
 	int i;
 	uint8_t c;
diff --git a/lib/i18n_module/VIQR/citrus_viqr.c b/lib/i18n_module/VIQR/citrus_viqr.c
index 300102c67a..446f6f5ace 100644
--- a/lib/i18n_module/VIQR/citrus_viqr.c
+++ b/lib/i18n_module/VIQR/citrus_viqr.c
@@ -250,11 +250,11 @@ _citrus_VIQR_unpack_state(_VIQREncodingInfo * __restrict ei __unused,
 
 static int
 _citrus_VIQR_mbrtowc_priv(_VIQREncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
+    wchar_t * __restrict pwc, char ** __restrict s, size_t n,
     _VIQRState * __restrict psenc, size_t * __restrict nresult)
 {
 	mnemonic_t *m, *m0;
-	const char *s0;
+	char *s0;
 	wchar_t wc;
 	ssize_t i;
 	int ch, escape;
diff --git a/lib/i18n_module/ZW/citrus_zw.c b/lib/i18n_module/ZW/citrus_zw.c
index 6ac3598d05..271cfaa368 100644
--- a/lib/i18n_module/ZW/citrus_zw.c
+++ b/lib/i18n_module/ZW/citrus_zw.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libiconv_modules/ZW/citrus_zw.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libiconv_modules/ZW/citrus_zw.c 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_zw.c,v 1.4 2008/06/14 16:01:08 tnozaki Exp $ */
 
 /*-
@@ -105,10 +105,10 @@ _citrus_ZW_unpack_state(_ZWEncodingInfo * __restrict ei __unused,
 
 static int
 _citrus_ZW_mbrtowc_priv(_ZWEncodingInfo * __restrict ei,
-    wchar_t * __restrict pwc, const char **__restrict s, size_t n,
+    wchar_t * __restrict pwc, char **__restrict s, size_t n,
     _ZWState * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
+	char *s0;
 	wchar_t  wc;
 	int ch, len;
 
diff --git a/lib/i18n_module/iconv_none/citrus_iconv_none.c b/lib/i18n_module/iconv_none/citrus_iconv_none.c
index fe74ee5ed4..a2fdef9dfc 100644
--- a/lib/i18n_module/iconv_none/citrus_iconv_none.c
+++ b/lib/i18n_module/iconv_none/citrus_iconv_none.c
@@ -1,5 +1,5 @@
-/* $FreeBSD: head/lib/libiconv_modules/iconv_none/citrus_iconv_none.c 252583 2013-07-03 18:27:45Z peter $ */
-/*	$NetBSD: citrus_iconv_none.c,v 1.2 2003/07/01 09:42:16 tshiozak Exp $	*/
+/* $FreeBSD: head/lib/libiconv_modules/iconv_none/citrus_iconv_none.c 281550 2015-04-15 09:09:20Z tijl $ */
+/*	$NetBSD: citrus_iconv_none.c,v 1.3 2011/05/23 14:45:44 joerg Exp $	*/
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -97,7 +97,7 @@ _citrus_iconv_none_iconv_uninit_context(struct _citrus_iconv *cv __unused)
 static int
 /*ARGSUSED*/
 _citrus_iconv_none_iconv_convert(struct _citrus_iconv * __restrict ci __unused,
-    const char * __restrict * __restrict in, size_t * __restrict inbytes,
+    char * __restrict * __restrict in, size_t * __restrict inbytes,
     char * __restrict * __restrict out, size_t * __restrict outbytes,
     uint32_t flags __unused, size_t * __restrict invalids)
 {
diff --git a/lib/i18n_module/iconv_std/citrus_iconv_std.c b/lib/i18n_module/iconv_std/citrus_iconv_std.c
index a510c694b1..8f2e2a1939 100644
--- a/lib/i18n_module/iconv_std/citrus_iconv_std.c
+++ b/lib/i18n_module/iconv_std/citrus_iconv_std.c
@@ -1,5 +1,5 @@
-/* $FreeBSD: head/lib/libiconv_modules/iconv_std/citrus_iconv_std.c 252583 2013-07-03 18:27:45Z peter $ */
-/*	$NetBSD: citrus_iconv_std.c,v 1.15 2006/11/13 19:08:19 tnozaki Exp $	*/
+/* $FreeBSD: head/lib/libiconv_modules/iconv_std/citrus_iconv_std.c 281550 2015-04-15 09:09:20Z tijl $ */
+/*	$NetBSD: citrus_iconv_std.c,v 1.16 2012/02/12 13:51:29 wiz Exp $	*/
 
 /*-
  * Copyright (c)2003 Citrus Project,
@@ -104,7 +104,7 @@ init_encoding_state(struct _citrus_iconv_std_encoding *se)
 
 static __inline int
 mbtocsx(struct _citrus_iconv_std_encoding *se,
-    _csid_t *csid, _index_t *idx, const char **s, size_t n, size_t *nresult,
+    _csid_t *csid, _index_t *idx, char **s, size_t n, size_t *nresult,
     struct iconv_hooks *hooks)
 {
 
@@ -461,7 +461,7 @@ _citrus_iconv_std_iconv_uninit_context(struct _citrus_iconv *cv)
 
 static int
 _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
-    const char * __restrict * __restrict in, size_t * __restrict inbytes,
+    char * __restrict * __restrict in, size_t * __restrict inbytes,
     char * __restrict * __restrict out, size_t * __restrict outbytes,
     uint32_t flags, size_t * __restrict invalids)
 {
@@ -469,7 +469,7 @@ _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
 	struct _citrus_iconv_std_context *sc = cv->cv_closure;
 	_csid_t csid;
 	_index_t idx;
-	const char *tmpin;
+	char *tmpin;
 	size_t inval, szrin, szrout;
 	int ret, state = 0;
 
diff --git a/lib/libarchive/config.h b/lib/libarchive/config.h
index 272da9aaca..2a7edd3767 100644
--- a/lib/libarchive/config.h
+++ b/lib/libarchive/config.h
@@ -906,7 +906,7 @@
 /* #undef HAVE__MKGMTIME64 */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Version number of libarchive as a single integer */
 /* #undef LIBARCHIVE_VERSION_NUMBER */
diff --git a/lib/libc/citrus/citrus_iconv.h b/lib/libc/citrus/citrus_iconv.h
index f8f303fd0a..d786caec31 100644
--- a/lib/libc/citrus/citrus_iconv.h
+++ b/lib/libc/citrus/citrus_iconv.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libc/iconv/citrus_iconv.h 252547 2013-07-03 07:03:19Z peter $ */
+/* $FreeBSD: head/lib/libc/iconv/citrus_iconv.h 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_iconv.h,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
 
 /*-
@@ -52,7 +52,7 @@ __END_DECLS
  */
 static __inline int
 _citrus_iconv_convert(struct _citrus_iconv * __restrict cv,
-    const char * __restrict * __restrict in, size_t * __restrict inbytes,
+    char * __restrict * __restrict in, size_t * __restrict inbytes,
     char * __restrict * __restrict out, size_t * __restrict outbytes,
     uint32_t flags, size_t * __restrict nresults)
 {
diff --git a/lib/libc/citrus/citrus_iconv_local.h b/lib/libc/citrus/citrus_iconv_local.h
index df0347c00e..4335ca3a52 100644
--- a/lib/libc/citrus/citrus_iconv_local.h
+++ b/lib/libc/citrus/citrus_iconv_local.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libc/iconv/citrus_iconv_local.h 255297 2013-09-06 09:46:44Z theraven $ */
+/* $FreeBSD: head/lib/libc/iconv/citrus_iconv_local.h 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_iconv_local.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
 
 /*-
@@ -46,7 +46,7 @@ static void	 _citrus_##_m_##_iconv_uninit_shared			\
 		    (struct _citrus_iconv_shared *);			\
 static int	 _citrus_##_m_##_iconv_convert				\
 		    (struct _citrus_iconv * __restrict,			\
-		    const char * __restrict * __restrict,		\
+		    char * __restrict * __restrict,			\
 		    size_t * __restrict,				\
 		    char * __restrict * __restrict,			\
 		    size_t * __restrict outbytes,			\
@@ -75,7 +75,7 @@ typedef void (*_citrus_iconv_uninit_shared_t)
     (struct _citrus_iconv_shared *);
 typedef int (*_citrus_iconv_convert_t)
     (struct _citrus_iconv * __restrict,
-    const char *__restrict* __restrict, size_t * __restrict,
+    char *__restrict* __restrict, size_t * __restrict,
     char * __restrict * __restrict, size_t * __restrict, uint32_t,
     size_t * __restrict);
 typedef int (*_citrus_iconv_init_context_t)(struct _citrus_iconv *);
diff --git a/lib/libc/citrus/citrus_none.c b/lib/libc/citrus/citrus_none.c
index 19c0a3a0fd..b48610a980 100644
--- a/lib/libc/citrus/citrus_none.c
+++ b/lib/libc/citrus/citrus_none.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libc/iconv/citrus_none.c 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libc/iconv/citrus_none.c 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $ */
 
 /*-
@@ -83,7 +83,7 @@ _citrus_NONE_stdenc_init_state(struct _citrus_stdenc * __restrict ce __unused,
 
 static int
 _citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused,
-    _citrus_csid_t *csid, _citrus_index_t *idx, const char **s, size_t n, 
+    _citrus_csid_t *csid, _citrus_index_t *idx, char **s, size_t n, 
     void *ps __unused, size_t *nresult, struct iconv_hooks *hooks)
 {
 
@@ -159,7 +159,7 @@ _citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __restrict ce __unused,
 
 static int
 _citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused,
-    _wc_t * __restrict pwc, const char ** __restrict s, size_t n,
+    _wc_t * __restrict pwc, char ** __restrict s, size_t n,
     void * __restrict pspriv __unused, size_t * __restrict nresult,
     struct iconv_hooks *hooks)
 {
diff --git a/lib/libc/citrus/citrus_stdenc.h b/lib/libc/citrus/citrus_stdenc.h
index fb65bd478d..2da59f2944 100644
--- a/lib/libc/citrus/citrus_stdenc.h
+++ b/lib/libc/citrus/citrus_stdenc.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libc/iconv/citrus_stdenc.h 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libc/iconv/citrus_stdenc.h 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_stdenc.h,v 1.4 2005/10/29 18:02:04 tshiozak Exp $ */
 
 /*-
@@ -69,7 +69,7 @@ _citrus_stdenc_init_state(struct _citrus_stdenc * __restrict ce,
 static __inline int
 _citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce,
     _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,
-    const char ** __restrict s, size_t n, void * __restrict ps,
+    char ** __restrict s, size_t n, void * __restrict ps,
     size_t * __restrict nresult, struct iconv_hooks *hooks)
 {
 
diff --git a/lib/libc/citrus/citrus_stdenc_local.h b/lib/libc/citrus/citrus_stdenc_local.h
index 89408902d2..84cc62f8e6 100644
--- a/lib/libc/citrus/citrus_stdenc_local.h
+++ b/lib/libc/citrus/citrus_stdenc_local.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libc/iconv/citrus_stdenc_local.h 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libc/iconv/citrus_stdenc_local.h 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_stdenc_local.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
 
 /*-
@@ -55,7 +55,7 @@ static int	 _citrus_##_e_##_stdenc_mbtocs				\
 		    (struct _citrus_stdenc * __restrict,		\
 		    _citrus_csid_t * __restrict,			\
 		    _citrus_index_t * __restrict,			\
-		    const char ** __restrict, size_t,			\
+		    char ** __restrict, size_t,				\
 		    void * __restrict, size_t * __restrict,		\
 		    struct iconv_hooks *);				\
 static int	 _citrus_##_e_##_stdenc_cstomb				\
@@ -66,7 +66,7 @@ static int	 _citrus_##_e_##_stdenc_cstomb				\
 static int	 _citrus_##_e_##_stdenc_mbtowc				\
 		    (struct _citrus_stdenc * __restrict,		\
 		    _citrus_wc_t * __restrict,				\
-		    const char ** __restrict, size_t,				\
+		    char ** __restrict, size_t,				\
 		    void * __restrict, size_t * __restrict,		\
 		    struct iconv_hooks *);				\
 static int	 _citrus_##_e_##_stdenc_wctomb				\
@@ -106,7 +106,7 @@ typedef int (*_citrus_stdenc_init_state_t)
 typedef int (*_citrus_stdenc_mbtocs_t)
     (struct _citrus_stdenc * __restrict,
     _citrus_csid_t * __restrict, _citrus_index_t * __restrict,
-    const char ** __restrict, size_t,
+    char ** __restrict, size_t,
     void * __restrict, size_t * __restrict,
     struct iconv_hooks *);
 typedef int (*_citrus_stdenc_cstomb_t)
@@ -116,7 +116,7 @@ typedef int (*_citrus_stdenc_cstomb_t)
 typedef int (*_citrus_stdenc_mbtowc_t)
     (struct _citrus_stdenc * __restrict,
     _citrus_wc_t * __restrict,
-    const char ** __restrict, size_t,
+    char ** __restrict, size_t,
     void * __restrict, size_t * __restrict,
     struct iconv_hooks *);
 typedef int (*_citrus_stdenc_wctomb_t)
diff --git a/lib/libc/citrus/citrus_stdenc_template.h b/lib/libc/citrus/citrus_stdenc_template.h
index 5326416b24..6f95858104 100644
--- a/lib/libc/citrus/citrus_stdenc_template.h
+++ b/lib/libc/citrus/citrus_stdenc_template.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/lib/libc/iconv/citrus_stdenc_template.h 252583 2013-07-03 18:27:45Z peter $ */
+/* $FreeBSD: head/lib/libc/iconv/citrus_stdenc_template.h 281550 2015-04-15 09:09:20Z tijl $ */
 /* $NetBSD: citrus_stdenc_template.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
 
 /*-
@@ -112,7 +112,7 @@ _FUNCNAME(stdenc_init_state)(struct _citrus_stdenc * __restrict ce,
 static int
 _FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce,
     _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,
-    const char ** __restrict s, size_t n, void * __restrict ps,
+    char ** __restrict s, size_t n, void * __restrict ps,
     size_t * __restrict nresult, struct iconv_hooks *hooks)
 {
 	wchar_t wc;
@@ -151,7 +151,7 @@ _FUNCNAME(stdenc_cstomb)(struct _citrus_stdenc * __restrict ce,
 
 static int
 _FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce,
-    _citrus_wc_t * __restrict wc, const char ** __restrict s, size_t n,
+    _citrus_wc_t * __restrict wc, char ** __restrict s, size_t n,
     void * __restrict ps, size_t * __restrict nresult,
     struct iconv_hooks *hooks)
 {
diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c
index 0f887ea0e2..2f04682259 100644
--- a/lib/libc/iconv/iconv.c
+++ b/lib/libc/iconv/iconv.c
@@ -123,7 +123,7 @@ iconv_close(iconv_t handle)
 }
 
 size_t
-iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
+iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout)
 {
 	size_t ret;
 	int err;
@@ -144,7 +144,7 @@ iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
 }
 
 size_t
-__iconv(iconv_t handle, const char **in, size_t *szin, char **out,
+__iconv(iconv_t handle, char **in, size_t *szin, char **out,
     size_t *szout, uint32_t flags, size_t *invalids)
 {
 	size_t ret;
diff --git a/lib/libc/locale/cXXrtomb_iconv.h b/lib/libc/locale/cXXrtomb_iconv.h
index 8a3500dfb2..c29bb7fbf0 100644
--- a/lib/libc/locale/cXXrtomb_iconv.h
+++ b/lib/libc/locale/cXXrtomb_iconv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/lib/libc/locale/cXXrtomb_iconv.h 252547 2013-07-03 07:03:19Z peter $
+ * $FreeBSD: head/lib/libc/locale/cXXrtomb_iconv.h 281550 2015-04-15 09:09:20Z tijl $
  */
 
 
@@ -57,8 +57,7 @@ cXXrtomb_l(char * __restrict s, charXX_t c, mbstate_t * __restrict ps,
 {
 	_ConversionState *cs;
 	struct _citrus_iconv *handle;
-	const char *src;
-	char *dst;
+	char *src, *dst;
 	size_t srcleft, dstleft, invlen;
 	int err;
 
diff --git a/lib/libc/locale/mbrtocXX_iconv.h b/lib/libc/locale/mbrtocXX_iconv.h
index 42161579a3..326535d626 100644
--- a/lib/libc/locale/mbrtocXX_iconv.h
+++ b/lib/libc/locale/mbrtocXX_iconv.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/lib/libc/locale/mbrtocXX_iconv.h 252547 2013-07-03 07:03:19Z peter $
+ * $FreeBSD: head/lib/libc/locale/mbrtocXX_iconv.h 281550 2015-04-15 09:09:20Z tijl $
  */
 
 #include <sys/queue.h>
@@ -98,8 +98,7 @@ mbrtocXX_l(charXX_t * __restrict pc, const char * __restrict s, size_t n,
 
 	/* Convert as few characters to the dst buffer as possible. */
 	for (i = 0; ; i++) {
-		const char *src;
-		char *dst;
+		char *src, *dst;
 		size_t srcleft, dstleft, invlen;
 		int err;
 
diff --git a/lib/libkiconv/xlat16_iconv.c b/lib/libkiconv/xlat16_iconv.c
index 4c939cfadd..079ad48aae 100644
--- a/lib/libkiconv/xlat16_iconv.c
+++ b/lib/libkiconv/xlat16_iconv.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: head/lib/libkiconv/xlat16_iconv.c 254273 2013-08-13 07:15:01Z peter $
+ * $FreeBSD: head/lib/libkiconv/xlat16_iconv.c 281550 2015-04-15 09:09:20Z tijl $
  */
 
 /*
@@ -62,7 +62,7 @@ static int chklocale(int, const char *);
 typedef void *iconv_t;
 static int my_iconv_init(void);
 static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t (*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
+static size_t (*my_iconv)(iconv_t, char **, size_t *, char **, size_t *);
 static int (*my_iconv_close)(iconv_t);
 #else
 #include <iconv.h>
@@ -71,7 +71,7 @@ static int (*my_iconv_close)(iconv_t);
 #define my_iconv iconv
 #define my_iconv_close iconv_close
 #endif
-static size_t my_iconv_char(iconv_t, const u_char **, size_t *, u_char **, size_t *);
+static size_t my_iconv_char(iconv_t, u_char **, size_t *, u_char **, size_t *);
 
 int
 kiconv_add_xlat16_cspair(const char *tocode, const char *fromcode, int flag)
@@ -221,8 +221,8 @@ kiconv_xlat16_open(const char *tocode, const char *fromcode, int lcase)
 			src[0] = (u_char)(c >> 8);
 			src[1] = (u_char)c;
 
-			ret = my_iconv_char(cd, (const u_char **)&srcp,
-			    &inbytesleft, &dstp, &outbytesleft);
+			ret = my_iconv_char(cd, &srcp, &inbytesleft,
+				&dstp, &outbytesleft);
 			if (ret == -1) {
 				table[us] = 0;
 				continue;
@@ -338,11 +338,10 @@ my_iconv_init(void)
 #endif
 
 static size_t
-my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf,
+my_iconv_char(iconv_t cd, u_char **ibuf, size_t * ilen, u_char **obuf,
 	size_t * olen)
 {
-	const u_char *sp;
-	u_char *dp, ilocal[3], olocal[3];
+	u_char *sp, *dp, ilocal[3], olocal[3];
 	u_char c1, c2;
 	int ret;
 	size_t ir, or;
@@ -352,7 +351,7 @@ my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf,
 	ir = *ilen;
 
 	bzero(*obuf, *olen);
-	ret = my_iconv(cd, (const char **)&sp, ilen, (char **)&dp, olen);
+	ret = my_iconv(cd, (char **)&sp, ilen, (char **)&dp, olen);
 	c1 = (*obuf)[0];
 	c2 = (*obuf)[1];
 
@@ -375,7 +374,7 @@ my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf,
 	sp = ilocal;
 	dp = olocal;
 
-	if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) !=
+	if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) !=
 	    (size_t)-1) {
 		if (olocal[0] != c1)
 			return (ret);
@@ -430,7 +429,7 @@ my_iconv_char(iconv_t cd, const u_char **ibuf, size_t * ilen, u_char **obuf,
 	sp = ilocal + 1;
 	dp = olocal;
 
-	if ((my_iconv(cd,(const char **)&sp, &ir, (char **)&dp, &or)) !=
+	if ((my_iconv(cd,(char **)&sp, &ir, (char **)&dp, &or)) !=
 	    (size_t)-1) {
 		if (olocal[0] == c2)
 			/*
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 5044957d1f..45087fc924 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -123,9 +123,10 @@
  * 400107 - Add futimens() and utimensat() syscalls
  * 400200 - 4.2 release
  * 400300 - 4.3 development
+ * 400301 - posix compliant iconv (no const qualifier)
  */
 #undef __DragonFly_version
-#define __DragonFly_version 400300	/* propagated to newvers */
+#define __DragonFly_version 400301	/* propagated to newvers */
 
 #include <sys/_null.h>
 
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index 66811107c5..6df3cb0d0b 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -73,8 +73,7 @@ do_conv(FILE *fp, const char *from, const char *to, bool silent,
     bool hide_invalid)
 {
 	iconv_t cd;
-	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;
-	const char *in;
+	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *in, *out;
 	size_t inbytes, outbytes, ret;
 
 	if ((cd = iconv_open(to, from)) == (iconv_t)-1)