6 files changed, 38 insertions, 120 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 871a5ac0faa0..ddec8effa5a0 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	libiconv
-PORTVERSION=	1.13.1
-PORTREVISION=	2
+PORTVERSION=	1.14
 CATEGORIES=	converters devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A character set conversion library
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_CSTD=	gnu89
-LIBTOOLFILES=	configure libcharset/configure
+LIBTOOLFILES=	configure libcharset/configure preload/configure
 CONFIGURE_ARGS=	--enable-static \
 		--without-libintl-prefix \
 		--docdir=${DOCSDIR}
@@ -31,8 +28,8 @@ MAKE_JOBS_UNSAFE=	yes
 MAN1=		iconv.1
 MAN3=		iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3
 
-OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on \
-		EXTRA_PATCHES	"Apply patches to fix CP932, add EUCJP-MS" off
+OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on
+#		EXTRA_PATCHES	"Apply patches to fix CP932, add EUCJP-MS" off
 
 .ifdef USE_ICONV
 .error USE_ICONV is defined as an environment variable, or in the arguments \
@@ -45,13 +42,13 @@ OPTIONS=	EXTRA_ENCODINGS	"Include extra character sets" on \
 CONFIGURE_ARGS+=	--enable-extra-encodings
 .endif
 
-.if defined(WITH_EXTRA_PATCHES)
-PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
-PATCH_SITES+=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	nork
-PATCHFILES+=	${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz
-PATCH_DIST_STRIP+=	-p1
-.endif
+#.if defined(WITH_EXTRA_PATCHES)
+#PATCH_SITES+=	http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
+#PATCH_SITES+=	${MASTER_SITE_LOCAL}
+#PATCH_SITE_SUBDIR=	nork
+#PATCHFILES+=	${DISTNAME:C/1\.13\.1/1.13/}-ja-1.patch.gz
+#PATCH_DIST_STRIP+=	-p1
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 27cdec1ece08..692f78bac944 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,4 +1,2 @@
-SHA256 (libiconv-1.13.1.tar.gz) = 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49
-SIZE (libiconv-1.13.1.tar.gz) = 4716070
-SHA256 (libiconv-1.13-ja-1.patch.gz) = fcbca68796a206f033cb2e61ad6ce159396232acb1d598dfc4c6307e59e67c87
-SIZE (libiconv-1.13-ja-1.patch.gz) = 296487
+SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
+SIZE (libiconv-1.14.tar.gz) = 4984397
diff --git a/converters/libiconv/files/patch-endless-wchar_t-loop b/converters/libiconv/files/patch-endless-wchar_t-loop
deleted file mode 100644
index 5882ce0ce498..000000000000
--- a/converters/libiconv/files/patch-endless-wchar_t-loop
+++ /dev/null
@@ -1,32 +0,0 @@
---- lib/loop_wchar.h
-+++ lib/loop_wchar.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2000-2002, 2005-2006, 2008 Free Software Foundation, Inc.
-+ * Copyright (C) 2000-2002, 2005-2006, 2008-2009 Free Software Foundation, Inc.
-  * This file is part of the GNU LIBICONV Library.
-  *
-  * The GNU LIBICONV Library is free software; you can redistribute it
-@@ -321,7 +321,8 @@ static size_t wchar_to_loop_convert (iconv_t icd,
-   size_t result = 0;
-   while (*inbytesleft > 0) {
-     size_t incount;
--    for (incount = 1; incount <= *inbytesleft; incount++) {
-+    for (incount = 1; ; ) {
-+      /* Here incount <= *inbytesleft. */
-       char buf[BUF_SIZE];
-       const char* inptr = *inbuf;
-       size_t inleft = incount;
-@@ -403,6 +404,12 @@ static size_t wchar_to_loop_convert (iconv_t icd,
-           break;
-         }
-       }
-+      incount++;
-+      if (incount > *inbytesleft) {
-+        /* Incomplete input. */
-+        errno = EINVAL;
-+        return -1;
-+      }
-     }
-   }
-   return result;
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 917b61604b0c..000000000000
--- a/converters/libiconv/files/patch-include_iconv.h.in
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git include/iconv.h.in include/iconv.h.in
---- include/iconv.h.in
-+++ include/iconv.h.in
-@@ -89,6 +89,11 @@ extern size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbyteslef
- extern int iconv_close (iconv_t cd);
- 
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+
- #ifndef LIBICONV_PLUG
- 
- /* Nonstandard extensions. */
-@@ -106,6 +111,10 @@ extern int iconv_close (iconv_t cd);
- #include <wchar.h>
- #endif
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* A type that holds all memory needed by a conversion descriptor.
-    A pointer to such an object can be used as an iconv_t. */
- typedef struct {
-@@ -223,12 +232,11 @@ extern const char * iconv_canonicalize (const char * name);
- extern void libiconv_set_relocation_prefix (const char *orig_prefix,
-                                             const char *curr_prefix);
- 
--#endif
--
--
- #ifdef __cplusplus
- }
- #endif
- 
-+#endif
-+
- 
- #endif /* _LIBICONV_H */
--- 
-1.7.2.5
diff --git a/converters/libiconv/files/patch-lib_Makefile.in b/converters/libiconv/files/patch-lib_Makefile.in
index 5129cc869d8c..dfabe72bbb7d 100644
--- a/converters/libiconv/files/patch-lib_Makefile.in
+++ b/converters/libiconv/files/patch-lib_Makefile.in
@@ -1,5 +1,5 @@
---- lib/Makefile.in.orig	2009-03-25 22:14:26.000000000 -0400
-+++ lib/Makefile.in	2009-06-06 15:26:31.000000000 -0400
+--- lib/Makefile.in.orig	2011-08-07 19:48:03.000000000 +0200
++++ lib/Makefile.in	2011-10-23 22:03:44.000000000 +0200
 @@ -26,8 +26,8 @@
  -Dset_relocation_prefix=libiconv_set_relocation_prefix \
  -Drelocate=libiconv_relocate @DEFS@
@@ -11,11 +11,11 @@
  LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
  LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
  # Windows resource compiler (windres). Used via libtool.
-@@ -50,7 +50,7 @@ SHELL = /bin/sh
+@@ -50,7 +50,7 @@
  
  # Before making a release, change this according to the libtool documentation,
  # section "Library interface versions".
--LIBICONV_VERSION_INFO = 7:0:5
+-LIBICONV_VERSION_INFO = 7:1:5
 +LIBICONV_VERSION_INFO = 3
  
  PACKAGE_VERSION = @VERSION@
diff --git a/converters/libiconv/files/patch-libcharset::lib::config.charset b/converters/libiconv/files/patch-libcharset::lib::config.charset
index d6dc5973b659..f8bcbb5cf587 100644
--- a/converters/libiconv/files/patch-libcharset::lib::config.charset
+++ b/converters/libiconv/files/patch-libcharset::lib::config.charset
@@ -1,22 +1,19 @@
---- libcharset/lib/config.charset.orig	Thu Jan 30 03:43:59 2003
-+++ libcharset/lib/config.charset	Tue Oct 14 16:55:29 2003
-@@ -246,8 +246,8 @@
- 	#echo "sun_eu_greek ?" # what is this?
- 	echo "UTF-8 UTF-8"
- 	;;
--    freebsd* | os2*)
--	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-+    freebsd4.[0-5] | os2*)
-+	# FreeBSD up to 4.6 doesn't have nl_langinfo(CODESET); therefore
- 	# localcharset.c falls back to using the full locale name
- 	# from the environment variables.
- 	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
-@@ -282,6 +282,31 @@
- 	echo "ja_JP.SJIS SHIFT_JIS"
- 	echo "ja_JP.Shift_JIS SHIFT_JIS"
- 	echo "ko_KR.EUC EUC-KR"
-+	;;
-+    freebsd*)
+--- libcharset/lib/config.charset.orig	2010-04-05 02:25:38.000000000 +0200
++++ libcharset/lib/config.charset	2011-10-23 22:05:50.000000000 +0200
+@@ -348,7 +348,7 @@ case "$os" in
+     #echo "sun_eu_greek ?" # what is this?
+     echo "UTF-8 UTF-8"
+     ;;
+-  freebsd* | os2*)
++  freebsd4.[0-5]* | os2*)
+     # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+     # localcharset.c falls back to using the full locale name
+     # from the environment variables.
+@@ -385,6 +385,31 @@ case "$os" in
+     echo "ja_JP.Shift_JIS SHIFT_JIS"
+     echo "ko_KR.EUC EUC-KR"
+     ;;
++  freebsd*)
 +	echo "US-ASCII ASCII"
 +	echo "ISO8859-1 ISO-8859-1"
 +	echo "ISO_8859-1 ISO-8859-1"
@@ -40,6 +37,7 @@
 +	echo "Big5 BIG5"
 +	echo "SJIS SHIFT_JIS"
 +	echo "Shift_JIS SHIFT_JIS"
- 	;;
-     netbsd*)
- 	echo "646 ASCII"
++        ;;
+   netbsd*)
+     echo "646 ASCII"
+     echo "ISO8859-1 ISO-8859-1"