5 files changed, 41 insertions, 116 deletions

diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 0088cd481422..f779c7eb8e26 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	iconv
-PORTVERSION=	1.1
+PORTVERSION=	2.0
 CATEGORIES=	converters
 MASTER_SITES=	http://www.dante.net/staff/konstantin/FreeBSD/iconv/
 
diff --git a/converters/iconv/distinfo b/converters/iconv/distinfo
index eacf2942372d..c3b90a01da7c 100644
--- a/converters/iconv/distinfo
+++ b/converters/iconv/distinfo
@@ -1 +1 @@
-MD5 (iconv-1.1.tar.gz) = 0d942f816cccc881cb6f34e093f6a02c
+MD5 (iconv-2.0.tar.gz) = 9466242dcdc54a71a0e0232b1e686e29
diff --git a/converters/iconv/pkg-comment b/converters/iconv/pkg-comment
index 02cb16c96704..3be3c1e24eef 100644
--- a/converters/iconv/pkg-comment
+++ b/converters/iconv/pkg-comment
@@ -1 +1 @@
-Charset conversion library and utility
+Charset conversion library and utilities
diff --git a/converters/iconv/pkg-descr b/converters/iconv/pkg-descr
index b3bdca6b26c6..66849cb10974 100644
--- a/converters/iconv/pkg-descr
+++ b/converters/iconv/pkg-descr
@@ -1,9 +1,10 @@
 ICONV is 1) the library (libiconv.a and .so) for conversion between
-various charsets and 2) the command line utility (iconv).
+various charsets, 2) the command line utility (iconv) and 3) a set
+of charsets (tables and shared modules).
 
 33 charsets are supported in this port: most Unicode encodings,
 all charsets for which locale exist in FreeBSD, few IBM-DOS ones.
 Other charsets are provided as standalone ports.
 
 	Konstantin Chuguev <Konstantin.Chuguev@dante.org.uk>
-	September 2000.
+	November 2000.
diff --git a/converters/iconv/pkg-plist b/converters/iconv/pkg-plist
index 8dcd8f17c50b..a8086ccadc2a 100644
--- a/converters/iconv/pkg-plist
+++ b/converters/iconv/pkg-plist
@@ -1,115 +1,39 @@
 bin/iconv
+bin/iconv_mktbl
 include/iconv.h
-lib/iconv/850.so
-lib/iconv/852.so
-lib/iconv/855.so
-lib/iconv/866.so
-lib/iconv/_tbl_simple.so
-lib/iconv/ansi_x3.4-1968.so
-lib/iconv/ansi_x3.4-1986.so
-lib/iconv/ascii.so
-lib/iconv/big5.so
-lib/iconv/chinese.so
-lib/iconv/cns11643-plane1.so
-lib/iconv/cns11643-plane14.so
-lib/iconv/cns11643-plane2.so
-lib/iconv/cp367.so
-lib/iconv/cp775.so
-lib/iconv/cp819.so
-lib/iconv/cp850.so
-lib/iconv/cp852.so
-lib/iconv/cp855.so
-lib/iconv/cp866.so
-lib/iconv/csascii.so
-lib/iconv/csbig5.so
-lib/iconv/cseuckr.so
-lib/iconv/cseucpkdfmtjapanese.so
-lib/iconv/csgb2312.so
-lib/iconv/cshalfwidthkatakana.so
-lib/iconv/csibm855.so
-lib/iconv/csibm866.so
-lib/iconv/csisolatin1.so
-lib/iconv/csisolatin2.so
-lib/iconv/csisolatin4.so
-lib/iconv/csisolatincyrillic.so
-lib/iconv/cskoi8r.so
-lib/iconv/cspc775baltic.so
-lib/iconv/cspc850multilingual.so
-lib/iconv/cspcp852.so
-lib/iconv/csshiftjis.so
-lib/iconv/csunicode.so
-lib/iconv/cyrillic.so
-lib/iconv/euc-cn.so
-lib/iconv/euc-jp.so
-lib/iconv/euc-kr.so
-lib/iconv/euc-tw.so
-lib/iconv/extended_unix_code_packed_format_for_japanese.so
-lib/iconv/gb2312.so
-lib/iconv/gb_2312-80.so
-lib/iconv/ibm367.so
-lib/iconv/ibm775.so
-lib/iconv/ibm819.so
-lib/iconv/ibm850.so
-lib/iconv/ibm852.so
-lib/iconv/ibm855.so
-lib/iconv/ibm866.so
-lib/iconv/iso-10646-ucs-2.so
-lib/iconv/iso-10646-ucs-4.so
-lib/iconv/iso-10646-utf-16.so
-lib/iconv/iso-10646-utf-8.so
-lib/iconv/iso-8859-1.so
-lib/iconv/iso-8859-15.so
-lib/iconv/iso-8859-2.so
-lib/iconv/iso-8859-4.so
-lib/iconv/iso-8859-5.so
-lib/iconv/iso-ir-100.so
-lib/iconv/iso-ir-101.so
-lib/iconv/iso-ir-110.so
-lib/iconv/iso-ir-144.so
-lib/iconv/iso-ir-58.so
-lib/iconv/iso-ir-87.so
-lib/iconv/iso646-us.so
-lib/iconv/iso_646.irv:1991.so
-lib/iconv/iso_8859-1.so
-lib/iconv/iso_8859-15.so
-lib/iconv/iso_8859-15:1998.so
-lib/iconv/iso_8859-1:1987.so
-lib/iconv/iso_8859-2.so
-lib/iconv/iso_8859-2:1987.so
-lib/iconv/iso_8859-4.so
-lib/iconv/iso_8859-4:1988.so
-lib/iconv/iso_8859-5.so
-lib/iconv/iso_8859-5:1988.so
-lib/iconv/jis_c6226-1983.so
-lib/iconv/jis_x0201.so
-lib/iconv/jis_x0208-1983.so
-lib/iconv/jis_x0212-1990.so
-lib/iconv/koi8-r.so
-lib/iconv/koi8-u.so
-lib/iconv/ks_x_1001.so
-lib/iconv/ksx1001.so
-lib/iconv/l1.so
-lib/iconv/l2.so
-lib/iconv/l4.so
-lib/iconv/latin1.so
-lib/iconv/latin2.so
-lib/iconv/latin4.so
-lib/iconv/ms_kanji.so
-lib/iconv/shift_jis.so
-lib/iconv/ucs-2.so
-lib/iconv/ucs-4.so
-lib/iconv/ucs2-internal.so
-lib/iconv/ucs4-internal.so
-lib/iconv/ucs4.so
-lib/iconv/us-ascii.so
-lib/iconv/us.so
-lib/iconv/utf-16.so
-lib/iconv/utf-8.so
-lib/iconv/utf16.so
-lib/iconv/utf8.so
-lib/iconv/x0201.so
-lib/iconv/x0208.so
 lib/libiconv.a
 lib/libiconv.so
-lib/libiconv.so.1
-@dirrm lib/iconv
+lib/libiconv.so.2
+libexec/iconv/euc-jp.so
+libexec/iconv/euc-kr.so
+libexec/iconv/euc-tw.so
+libexec/iconv/gb2312.so
+libexec/iconv/iso-10646-ucs-2.so
+libexec/iconv/iso-10646-ucs-4.so
+libexec/iconv/ucs-2-internal.so
+libexec/iconv/utf-16.so
+share/iconv/big5.cct
+share/iconv/charset.aliases
+share/iconv/cns11643-plane1.cct
+share/iconv/cns11643-plane14.cct
+share/iconv/cns11643-plane2.cct
+share/iconv/cp775.cct
+share/iconv/cp850.cct
+share/iconv/cp852.cct
+share/iconv/cp855.cct
+share/iconv/cp866.cct
+share/iconv/gb_2312-80.cct
+share/iconv/iso-8859-1.cct
+share/iconv/iso-8859-15.cct
+share/iconv/iso-8859-2.cct
+share/iconv/iso-8859-4.cct
+share/iconv/iso-8859-5.cct
+share/iconv/jis_x0201.cct
+share/iconv/jis_x0208-1983.cct
+share/iconv/jis_x0212-1990.cct
+share/iconv/koi8-r.cct
+share/iconv/koi8-u.cct
+share/iconv/ksx1001.cct
+share/iconv/shift_jis.cct
+@dirrm libexec/iconv
+@dirrm share/iconv