Update to 1.9.1.

PR:	52893
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

14 files changed, 39 insertions, 377 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 650cf358ebfa..131b8e24538b 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.8
-PORTREVISION=	2
+PORTVERSION=	1.9.1
 CATEGORIES=	converters devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +14,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
+USE_GNOME=	gnometarget
 LIBTOOLFILES=	configure libcharset/configure
 CONFIGURE_ARGS=	--enable-static \
 		--without-libintl-prefix
@@ -24,17 +25,7 @@ INSTALLS_SHLIB=	yes
 MAN1=		iconv.1
 MAN3=		iconv.3 iconv_open.3 iconv_close.3
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
 
-# gperf 2.7.2 required
-.if ${OSVERSION} < 430000
-BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
-GPERF=	${LOCALBASE}/bin/gperf
-.else
-GPERF=	/usr/bin/gperf
-.endif
-
-pre-build:
-	@cd ${WRKSRC} ; ${GPERF} -t -L ANSI-C -H aliases_hash -N aliases_lookup -G -W aliases -7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf > lib/aliases.h
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 7a88a1b1e8a9..4fb77ce57749 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1 +1 @@
-MD5 (libiconv-1.8.tar.gz) = fd2a95a4b79fbdc8ea55ad093a8bb6cf
+MD5 (libiconv-1.9.1.tar.gz) = 0c99a05e0c3c153bac1c960f78711155
diff --git a/converters/libiconv/files/patch-aa b/converters/libiconv/files/patch-aa
deleted file mode 100644
index fd162499d97c..000000000000
--- a/converters/libiconv/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Tue Apr 30 10:23:47 2002
-+++ Makefile.in	Sun Oct 27 22:11:16 2002
-@@ -27,12 +27,12 @@
- SHELL = /bin/sh
- 
- all : force
--	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib"
-+	builddir="`pwd`"; cd libcharset && $(MAKE) all && $(MAKE) install-lib libdir="$$builddir/lib" includedir="$$builddir/lib" sysconfdir="$$builddir/lib"
- 	cd lib && $(MAKE) all
- 	cd src && $(MAKE) all
- 	cd po && $(MAKE) all
- 	cd man && $(MAKE) all
--	if test -d tests; then cd tests && $(MAKE) all; fi
-+	#if test -d tests; then cd tests && $(MAKE) all; fi
- 
- # Installs the library and include files only. Typically called with only
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
diff --git a/converters/libiconv/files/patch-ac b/converters/libiconv/files/patch-ac
deleted file mode 100644
index e5b6a109d0ff..000000000000
--- a/converters/libiconv/files/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
---- man/Makefile.in.orig	Mon May 21 08:34:42 2001
-+++ man/Makefile.in	Sun Oct 27 22:09:17 2002
-@@ -10,7 +10,7 @@
- local_prefix = /usr/local
- exec_prefix = @exec_prefix@
- mandir = @mandir@
--docdir = $(prefix)/doc/libiconv
-+docdir = $(prefix)/share/doc/libiconv
- htmldir = $(docdir)
- 
- # Programs used by "make":
-@@ -35,7 +35,6 @@
- 	cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done
- 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
- 	cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done
--	if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
- 	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
- 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
- 	cd $(srcdir) && for f in *.html ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/$$f ; done
-@@ -45,7 +44,6 @@
- 	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
- 	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi
- 	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
--	if [ ! -d $(DESTDIR)$(prefix)/doc ] ; then mkdir $(DESTDIR)$(prefix)/doc ; fi
- 	if [ ! -d $(DESTDIR)$(docdir) ] ; then mkdir $(DESTDIR)$(docdir) ; fi
- 	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
- 
diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae
index 22a5f0a133f0..18cea1f55c06 100644
--- a/converters/libiconv/files/patch-ae
+++ b/converters/libiconv/files/patch-ae
@@ -1,14 +1,14 @@
---- libcharset/lib/Makefile.in.orig	Wed Jun 27 18:56:56 2001
-+++ libcharset/lib/Makefile.in	Sat Apr 27 15:57:01 2002
+--- libcharset/lib/Makefile.in.orig	Mon Apr 14 09:51:06 2003
++++ libcharset/lib/Makefile.in	Wed Jun 11 13:35:35 2003
 @@ -10,6 +10,7 @@
  local_prefix = /usr/local
  exec_prefix = @exec_prefix@
  libdir = @libdir@
-+sysconfdir = $(exec_prefix)/libdata
++sysconfdir = ${exec_prefix}/libdata
  
  # Programs used by "make":
  CC = @CC@
-@@ -38,7 +39,7 @@
+@@ -42,7 +43,7 @@
  
  # Before making a release, change this according to the libtool documentation,
  # section "Library interface versions".
@@ -17,21 +17,22 @@
  
  # Needed by $(LIBTOOL).
  top_builddir = ..
-@@ -53,7 +54,7 @@
+@@ -57,7 +58,7 @@
  	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) -no-undefined $(OBJECTS)
  
  localcharset.lo : $(srcdir)/localcharset.c
--	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c
-+	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
+-	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/localcharset.c
++	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c
  
- charset.alias: $(srcdir)/config.charset
- 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-@@ -72,11 +73,12 @@
+ relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h
+ 	$(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c
+@@ -78,12 +79,13 @@
+ # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
- 	$(MKINSTALLDIRS) $(libdir)
+ 	$(mkinstalldirs) $(libdir)
++	$(mkinstalldirs) $(sysconfdir)
  	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la
 -	test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \
-+	$(MKINSTALLDIRS) $(sysconfdir)
 +	test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \
  	                                || orig=charset.alias; \
 -	sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \
@@ -43,15 +44,15 @@
  
  # The following is needed in order to install a simple file in $(libdir)
  # which is shared with other installed packages. We use a list of referencing
-@@ -88,15 +90,16 @@
+@@ -95,15 +97,16 @@
  install : all force
- 	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
  	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la
 -	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 -	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \
 -	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \
 -	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
-+	$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
 +	if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \
 +	  sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \
 +	  $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \
diff --git a/converters/libiconv/files/patch-configure b/converters/libiconv/files/patch-configure
index 64d0b10e1d51..977469874538 100644
--- a/converters/libiconv/files/patch-configure
+++ b/converters/libiconv/files/patch-configure
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure	2002/04/30 07:59:47	1.1
-+++ configure	2002/04/30 08:00:22
-@@ -5256,6 +5256,7 @@
+--- configure.orig	Fri May 23 05:19:20 2003
++++ configure	Fri May 30 11:22:14 2003
+@@ -1905,7 +1905,6 @@
+ 
+ 
+ 
+-test "$mandir" != '${prefix}/man' || mandir='${datadir}/man'
+ 
+ 
+ ac_ext=c
+@@ -19236,6 +19235,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/converters/libiconv/files/patch-include::iconv.h.in b/converters/libiconv/files/patch-include::iconv.h.in
deleted file mode 100644
index 44f5177078e7..000000000000
--- a/converters/libiconv/files/patch-include::iconv.h.in
+++ /dev/null
@@ -1,49 +0,0 @@
-
-$FreeBSD$
-
---- include/iconv.h.in.orig	Thu May 23 07:48:42 2002
-+++ include/iconv.h.in	Sat Jun 15 14:04:11 2002
-@@ -21,6 +21,11 @@
- #ifndef _LIBICONV_H
- #define _LIBICONV_H
- 
-+#ifdef __FreeBSD__
-+#define LIBICONV_PLUG
-+#endif
-+
-+
- #define _LIBICONV_VERSION 0x0108    /* version number: (major<<8) + minor */
- extern int _libiconv_version;       /* Likewise */
- 
-@@ -68,6 +73,8 @@
-    encoding `tocode'. */
- #ifndef LIBICONV_PLUG
- #define iconv_open libiconv_open
-+#else
-+#define libiconv_open iconv_open
- #endif
- extern iconv_t iconv_open (const char* tocode, const char* fromcode);
- 
-@@ -78,17 +85,21 @@
-    Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */
- #ifndef LIBICONV_PLUG
- #define iconv libiconv
-+#else
-+#define libiconv iconv
- #endif
- extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
- 
- /* Frees resources allocated for conversion descriptor `cd'. */
- #ifndef LIBICONV_PLUG
- #define iconv_close libiconv_close
-+#else
-+#define libiconv_close iconv_close
- #endif
- extern int iconv_close (iconv_t cd);
- 
- 
--#ifndef LIBICONV_PLUG
-+#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
- 
- /* Nonstandard extensions. */
- 
diff --git a/converters/libiconv/files/patch-lib::iconv.c b/converters/libiconv/files/patch-lib::iconv.c
deleted file mode 100644
index dbbc94f4e0cc..000000000000
--- a/converters/libiconv/files/patch-lib::iconv.c
+++ /dev/null
@@ -1,58 +0,0 @@
-
-$FreeBSD$
-
---- lib/iconv.c.orig	Sat May 26 03:25:09 2001
-+++ lib/iconv.c	Sun Mar 17 15:47:32 2002
-@@ -176,6 +176,13 @@
- }
- #endif
- 
-+#undef libiconv_open
-+
-+iconv_t libiconv_open (const char* tocode, const char* fromcode)
-+{
-+  return (iconv_open(tocode, fromcode));
-+}
-+
- iconv_t iconv_open (const char* tocode, const char* fromcode)
- {
-   struct conv_struct * cd;
-@@ -358,6 +365,15 @@
-   return (iconv_t)(-1);
- }
- 
-+#undef libiconv
-+
-+size_t libiconv (iconv_t icd,
-+		 ICONV_CONST char* * inbuf, size_t *inbytesleft,
-+		 char* * outbuf, size_t *outbytesleft)
-+{
-+  return (iconv(icd, inbuf, inbytesleft, outbuf, outbytesleft));
-+}
-+
- size_t iconv (iconv_t icd,
-               ICONV_CONST char* * inbuf, size_t *inbytesleft,
-               char* * outbuf, size_t *outbytesleft)
-@@ -371,6 +387,13 @@
-                                    outbuf,outbytesleft);
- }
- 
-+#undef libiconv_close
-+
-+int libiconv_close (iconv_t icd)
-+{
-+  return (iconv_close(icd));
-+}
-+
- int iconv_close (iconv_t icd)
- {
-   conv_t cd = (conv_t) icd;
-@@ -378,7 +401,7 @@
-   return 0;
- }
- 
--#ifndef LIBICONV_PLUG
-+#if !defined(LIBICONV_PLUG) || defined(__FreeBSD__)
- 
- int iconvctl (iconv_t icd, int request, void* argument)
- {
diff --git a/converters/libiconv/files/patch-ad b/converters/libiconv/files/patch-lib_Makefile.in
index 27f36729367a..4a59d96cf9e3 100644
--- a/converters/libiconv/files/patch-ad
+++ b/converters/libiconv/files/patch-lib_Makefile.in
@@ -1,10 +1,10 @@
---- lib/Makefile.in.orig	Sat Jun 15 14:42:20 2002
-+++ lib/Makefile.in	Sat Jun 15 14:42:27 2002
-@@ -39,7 +39,7 @@
+--- lib/Makefile.in.orig	Wed Jun 11 13:05:08 2003
++++ lib/Makefile.in	Wed Jun 11 13:05:15 2003
+@@ -44,7 +44,7 @@
  
  # Before making a release, change this according to the libtool documentation,
  # section "Library interface versions".
--LIBICONV_VERSION_INFO = 3:0:1
+-LIBICONV_VERSION_INFO = 4:0:2
 +LIBICONV_VERSION_INFO = 3
  
  # Needed by $(LIBTOOL).
diff --git a/converters/libiconv/files/patch-lib_aliases.gperf b/converters/libiconv/files/patch-lib_aliases.gperf
deleted file mode 100644
index 2ffead2983df..000000000000
--- a/converters/libiconv/files/patch-lib_aliases.gperf
+++ /dev/null
@@ -1,134 +0,0 @@
---- lib/aliases.gperf.orig	Wed May 29 10:16:47 2002
-+++ lib/aliases.gperf	Mon Oct 14 12:31:58 2002
-@@ -12,6 +12,7 @@
- US, ei_ascii
- CSASCII, ei_ascii
- UTF-8, ei_utf8
-+UTF8, ei_utf8
- UCS-2, ei_ucs2
- ISO-10646-UCS-2, ei_ucs2
- CSUNICODE, ei_ucs2
-@@ -43,6 +44,7 @@
- JAVA, ei_java
- ISO-8859-1, ei_iso8859_1
- ISO_8859-1, ei_iso8859_1
-+ISO8859-1, ei_iso8859_1
- ISO_8859-1:1987, ei_iso8859_1
- ISO-IR-100, ei_iso8859_1
- CP819, ei_iso8859_1
-@@ -52,6 +54,7 @@
- CSISOLATIN1, ei_iso8859_1
- ISO-8859-2, ei_iso8859_2
- ISO_8859-2, ei_iso8859_2
-+ISO8859-2, ei_iso8859_2
- ISO_8859-2:1987, ei_iso8859_2
- ISO-IR-101, ei_iso8859_2
- LATIN2, ei_iso8859_2
-@@ -59,6 +62,7 @@
- CSISOLATIN2, ei_iso8859_2
- ISO-8859-3, ei_iso8859_3
- ISO_8859-3, ei_iso8859_3
-+ISO8859-3, ei_iso8859_3
- ISO_8859-3:1988, ei_iso8859_3
- ISO-IR-109, ei_iso8859_3
- LATIN3, ei_iso8859_3
-@@ -66,6 +70,7 @@
- CSISOLATIN3, ei_iso8859_3
- ISO-8859-4, ei_iso8859_4
- ISO_8859-4, ei_iso8859_4
-+ISO8859-4, ei_iso8859_4
- ISO_8859-4:1988, ei_iso8859_4
- ISO-IR-110, ei_iso8859_4
- LATIN4, ei_iso8859_4
-@@ -73,12 +78,14 @@
- CSISOLATIN4, ei_iso8859_4
- ISO-8859-5, ei_iso8859_5
- ISO_8859-5, ei_iso8859_5
-+ISO8859-5, ei_iso8859_5
- ISO_8859-5:1988, ei_iso8859_5
- ISO-IR-144, ei_iso8859_5
- CYRILLIC, ei_iso8859_5
- CSISOLATINCYRILLIC, ei_iso8859_5
- ISO-8859-6, ei_iso8859_6
- ISO_8859-6, ei_iso8859_6
-+ISO8859-6, ei_iso8859_6
- ISO_8859-6:1987, ei_iso8859_6
- ISO-IR-127, ei_iso8859_6
- ECMA-114, ei_iso8859_6
-@@ -87,6 +94,7 @@
- CSISOLATINARABIC, ei_iso8859_6
- ISO-8859-7, ei_iso8859_7
- ISO_8859-7, ei_iso8859_7
-+ISO8859-7, ei_iso8859_7
- ISO_8859-7:1987, ei_iso8859_7
- ISO-IR-126, ei_iso8859_7
- ECMA-118, ei_iso8859_7
-@@ -96,12 +104,14 @@
- CSISOLATINGREEK, ei_iso8859_7
- ISO-8859-8, ei_iso8859_8
- ISO_8859-8, ei_iso8859_8
-+ISO8859-8, ei_iso8859_8
- ISO_8859-8:1988, ei_iso8859_8
- ISO-IR-138, ei_iso8859_8
- HEBREW, ei_iso8859_8
- CSISOLATINHEBREW, ei_iso8859_8
- ISO-8859-9, ei_iso8859_9
- ISO_8859-9, ei_iso8859_9
-+ISO8859-9, ei_iso8859_9
- ISO_8859-9:1989, ei_iso8859_9
- ISO-IR-148, ei_iso8859_9
- LATIN5, ei_iso8859_9
-@@ -109,6 +119,7 @@
- CSISOLATIN5, ei_iso8859_9
- ISO-8859-10, ei_iso8859_10
- ISO_8859-10, ei_iso8859_10
-+ISO8859-10, ei_iso8859_10
- ISO_8859-10:1992, ei_iso8859_10
- ISO-IR-157, ei_iso8859_10
- LATIN6, ei_iso8859_10
-@@ -116,11 +127,13 @@
- CSISOLATIN6, ei_iso8859_10
- ISO-8859-13, ei_iso8859_13
- ISO_8859-13, ei_iso8859_13
-+ISO8859-13, ei_iso8859_13
- ISO-IR-179, ei_iso8859_13
- LATIN7, ei_iso8859_13
- L7, ei_iso8859_13
- ISO-8859-14, ei_iso8859_14
- ISO_8859-14, ei_iso8859_14
-+ISO8859-14, ei_iso8859_14
- ISO_8859-14:1998, ei_iso8859_14
- ISO-IR-199, ei_iso8859_14
- LATIN8, ei_iso8859_14
-@@ -128,10 +141,12 @@
- ISO-CELTIC, ei_iso8859_14
- ISO-8859-15, ei_iso8859_15
- ISO_8859-15, ei_iso8859_15
-+ISO8859-15, ei_iso8859_15
- ISO_8859-15:1998, ei_iso8859_15
- ISO-IR-203, ei_iso8859_15
- ISO-8859-16, ei_iso8859_16
- ISO_8859-16, ei_iso8859_16
-+ISO8859-16, ei_iso8859_16
- ISO_8859-16:2000, ei_iso8859_16
- ISO-IR-226, ei_iso8859_16
- KOI8-R, ei_koi8_r
-@@ -253,12 +268,12 @@
- CHINESE, ei_gb2312
- ISO-IR-165, ei_isoir165
- CN-GB-ISOIR165, ei_isoir165
--KSC_5601, ei_ksc5601
--KS_C_5601-1987, ei_ksc5601
--KS_C_5601-1989, ei_ksc5601
--ISO-IR-149, ei_ksc5601
--CSKSC56011987, ei_ksc5601
--KOREAN, ei_ksc5601
-+KSC_5601, ei_euc_kr
-+KS_C_5601-1987, ei_euc_kr
-+KS_C_5601-1989, ei_euc_kr
-+ISO-IR-149, ei_euc_kr
-+CSKSC56011987, ei_euc_kr
-+KOREAN, ei_euc_kr
- EUC-JP, ei_euc_jp
- EUCJP, ei_euc_jp
- EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp
diff --git a/converters/libiconv/files/patch-lib_loop-unicode.h b/converters/libiconv/files/patch-lib_loop-unicode.h
deleted file mode 100644
index f06f9765ab52..000000000000
--- a/converters/libiconv/files/patch-lib_loop-unicode.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- lib/loop_unicode.h.orig	Mon May  6 06:17:43 2002
-+++ lib/loop_unicode.h	Sat Jun 15 14:07:14 2002
-@@ -52,8 +52,7 @@
-       cd->ostate = backup_state;
-       outptr = backup_outptr;
-       outleft = backup_outleft;
--      if (sub_outcount < 0)
--        return RET_TOOSMALL;
-+      return sub_outcount;
-     }
-   }
-   {
-@@ -96,8 +95,7 @@
-           cd->ostate = backup_state;
-           outptr = backup_outptr;
-           outleft = backup_outleft;
--          if (sub_outcount < 0)
--            return RET_TOOSMALL;
-+	  return sub_outcount;
-         }
-         if (last)
-           break;
-@@ -144,8 +142,7 @@
-       cd->ostate = backup_state;
-       outptr = backup_outptr;
-       outleft = backup_outleft;
--      if (sub_outcount != RET_ILUNI)
--        return RET_TOOSMALL;
-+      return sub_outcount;
-     }
-   }
-   return RET_ILUNI;
diff --git a/converters/libiconv/files/patch-libcharset_Makefile.in b/converters/libiconv/files/patch-libcharset_Makefile.in
deleted file mode 100644
index ad70aeded163..000000000000
--- a/converters/libiconv/files/patch-libcharset_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcharset/Makefile.in.orig	Mon May 21 23:48:37 2001
-+++ libcharset/Makefile.in	Sat Apr  6 21:25:39 2002
-@@ -38,7 +38,7 @@
- # Installs the library and include files only. Typically called with only
- # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
- install-lib : all force
--	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
-+	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)' sysconfdir='$(sysconfdir)'
- 	$(MKINSTALLDIRS) $(includedir)
- 	$(INSTALL_DATA) include/libcharset.h $(includedir)/libcharset.h
- 
diff --git a/converters/libiconv/files/patch-src_Makefile.in b/converters/libiconv/files/patch-src_Makefile.in
deleted file mode 100644
index 105eace66fd2..000000000000
--- a/converters/libiconv/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sat Jun 15 14:25:55 2002
-+++ src/Makefile.in	Sat Jun 15 14:26:05 2002
-@@ -77,7 +77,7 @@
- 	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
- 	if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
- 	case "@host_os@" in \
--	  hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
-+	  hpux*|freebsd*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
- 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
- 	esac
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist
index 05e9dab15474..d17aade6e30b 100644
--- a/converters/libiconv/pkg-plist
+++ b/converters/libiconv/pkg-plist
@@ -1,6 +1,7 @@
 bin/iconv
 include/iconv.h
 include/libcharset.h
+include/localcharset.h
 lib/libcharset.a
 lib/libcharset.so
 lib/libcharset.so.1