14 files changed, 228 insertions, 599 deletions

diff --git a/converters/iconv-extra/Makefile b/converters/iconv-extra/Makefile
index 642fc616ed08..ed2b6a00998e 100644
--- a/converters/iconv-extra/Makefile
+++ b/converters/iconv-extra/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	iconv-extra
-PORTVERSION=	1.1
+PORTVERSION=	2.0
 CATEGORIES=	converters
 MASTER_SITES=	http://www.dante.net/staff/konstantin/FreeBSD/iconv/
 
 MAINTAINER=	Konstantin.Chuguev@dante.org.uk
 
-LIB_DEPENDS=	iconv.1:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
 USE_PERL5=	yes
 
diff --git a/converters/iconv-extra/distinfo b/converters/iconv-extra/distinfo
index 3c53ec4dfc24..38cd929f1148 100644
--- a/converters/iconv-extra/distinfo
+++ b/converters/iconv-extra/distinfo
@@ -1 +1 @@
-MD5 (iconv-extra-1.1.tar.gz) = 279085a5619b43a4d62e7097d193d240
+MD5 (iconv-extra-2.0.tar.gz) = a3c2492966852e5949ef217913cc0a34
diff --git a/converters/iconv-extra/pkg-comment b/converters/iconv-extra/pkg-comment
index 0cd729233010..2780197ebe28 100644
--- a/converters/iconv-extra/pkg-comment
+++ b/converters/iconv-extra/pkg-comment
@@ -1 +1 @@
-Additional charset modules for the iconv library (from Unicode site)
+Additional charsets for the iconv library (those from the Unicode site)
diff --git a/converters/iconv-extra/pkg-plist b/converters/iconv-extra/pkg-plist
index 1b3d9b148b79..9f2c9c940b3a 100644
--- a/converters/iconv-extra/pkg-plist
+++ b/converters/iconv-extra/pkg-plist
@@ -1,188 +1,69 @@
-lib/iconv/424.so
-lib/iconv/437.so
-lib/iconv/857.so
-lib/iconv/860.so
-lib/iconv/861.so
-lib/iconv/862.so
-lib/iconv/863.so
-lib/iconv/865.so
-lib/iconv/869.so
-lib/iconv/adobe-stdenc.so
-lib/iconv/adobe-symbol.so
-lib/iconv/adobe-zdingbats.so
-lib/iconv/arabic.so
-lib/iconv/asmo-708.so
-lib/iconv/cp-gr.so
-lib/iconv/cp-is.so
-lib/iconv/cp037.so
-lib/iconv/cp037_ibmuscanada.so
-lib/iconv/cp10000.so
-lib/iconv/cp10000_macroman.so
-lib/iconv/cp10006.so
-lib/iconv/cp10006_macgreek.so
-lib/iconv/cp10007.so
-lib/iconv/cp10007_maccyrillic.so
-lib/iconv/cp10029.so
-lib/iconv/cp10029_maclatin2.so
-lib/iconv/cp1006.so
-lib/iconv/cp10079.so
-lib/iconv/cp10079_macicelandic.so
-lib/iconv/cp10081.so
-lib/iconv/cp10081_macturkish.so
-lib/iconv/cp1026.so
-lib/iconv/cp1250.so
-lib/iconv/cp1251.so
-lib/iconv/cp1252.so
-lib/iconv/cp1253.so
-lib/iconv/cp1254.so
-lib/iconv/cp1255.so
-lib/iconv/cp1256.so
-lib/iconv/cp1257.so
-lib/iconv/cp1258.so
-lib/iconv/cp424.so
-lib/iconv/cp437.so
-lib/iconv/cp500.so
-lib/iconv/cp737.so
-lib/iconv/cp737latingreek.so
-lib/iconv/cp856.so
-lib/iconv/cp856_hebrew_pc.so
-lib/iconv/cp857.so
-lib/iconv/cp860.so
-lib/iconv/cp861.so
-lib/iconv/cp862.so
-lib/iconv/cp863.so
-lib/iconv/cp864.so
-lib/iconv/cp865.so
-lib/iconv/cp869.so
-lib/iconv/cp874.so
-lib/iconv/cp875.so
-lib/iconv/cp875_ibmgreek.so
-lib/iconv/cp932.so
-lib/iconv/cp936.so
-lib/iconv/cp949.so
-lib/iconv/cp950.so
-lib/iconv/csibm1026.so
-lib/iconv/csibm424.so
-lib/iconv/csibm500.so
-lib/iconv/csibm857.so
-lib/iconv/csibm860.so
-lib/iconv/csibm861.so
-lib/iconv/csibm863.so
-lib/iconv/csibm864.so
-lib/iconv/csibm865.so
-lib/iconv/csibm869.so
-lib/iconv/csiso2022jp.so
-lib/iconv/csiso2022jp2.so
-lib/iconv/csisolatin3.so
-lib/iconv/csisolatin5.so
-lib/iconv/csisolatin6.so
-lib/iconv/csisolatinarabic.so
-lib/iconv/csisolatingreek.so
-lib/iconv/csisolatinhebrew.so
-lib/iconv/cspc862latinhebrew.so
-lib/iconv/cspc8codepage437.so
-lib/iconv/ebcdic-cp-be.so
-lib/iconv/ebcdic-cp-ca.so
-lib/iconv/ebcdic-cp-ch.so
-lib/iconv/ebcdic-cp-he.so
-lib/iconv/ebcdic-cp-nl.so
-lib/iconv/ebcdic-cp-us.so
-lib/iconv/ebcdic-cp-wt.so
-lib/iconv/ecma-114.so
-lib/iconv/ecma-118.so
-lib/iconv/elot_928.so
-lib/iconv/gb12345.so
-lib/iconv/greek.so
-lib/iconv/greek8.so
-lib/iconv/hebrew.so
-lib/iconv/ibm037.so
-lib/iconv/ibm1026.so
-lib/iconv/ibm424.so
-lib/iconv/ibm437.so
-lib/iconv/ibm500.so
-lib/iconv/ibm737.so
-lib/iconv/ibm857.so
-lib/iconv/ibm860.so
-lib/iconv/ibm861.so
-lib/iconv/ibm862.so
-lib/iconv/ibm863.so
-lib/iconv/ibm864.so
-lib/iconv/ibm865.so
-lib/iconv/ibm869.so
-lib/iconv/ibm874.so
-lib/iconv/iso-2022-cn.so
-lib/iconv/iso-2022-jp-2.so
-lib/iconv/iso-2022-jp.so
-lib/iconv/iso-2022-kr.so
-lib/iconv/iso-8859-10.so
-lib/iconv/iso-8859-13.so
-lib/iconv/iso-8859-14.so
-lib/iconv/iso-8859-3.so
-lib/iconv/iso-8859-6.so
-lib/iconv/iso-8859-7.so
-lib/iconv/iso-8859-8.so
-lib/iconv/iso-8859-9.so
-lib/iconv/iso-ir-109.so
-lib/iconv/iso-ir-126.so
-lib/iconv/iso-ir-127.so
-lib/iconv/iso-ir-138.so
-lib/iconv/iso-ir-148.so
-lib/iconv/iso-ir-157.so
-lib/iconv/iso_8859-10.so
-lib/iconv/iso_8859-10:1992.so
-lib/iconv/iso_8859-13.so
-lib/iconv/iso_8859-13:1998.so
-lib/iconv/iso_8859-14.so
-lib/iconv/iso_8859-14:1998.so
-lib/iconv/iso_8859-3.so
-lib/iconv/iso_8859-3:1988.so
-lib/iconv/iso_8859-6.so
-lib/iconv/iso_8859-6:1987.so
-lib/iconv/iso_8859-7.so
-lib/iconv/iso_8859-7:1987.so
-lib/iconv/iso_8859-8.so
-lib/iconv/iso_8859-8:1988.so
-lib/iconv/iso_8859-9.so
-lib/iconv/iso_8859-9:1989.so
-lib/iconv/johab.so
-lib/iconv/koi8-ru.so
-lib/iconv/l3.so
-lib/iconv/l5.so
-lib/iconv/l6.so
-lib/iconv/latin3.so
-lib/iconv/latin5.so
-lib/iconv/latin6.so
-lib/iconv/mac-ce.so
-lib/iconv/mac-croatian.so
-lib/iconv/mac-cyrillic.so
-lib/iconv/mac-dingbats.so
-lib/iconv/mac-greek.so
-lib/iconv/mac-iceland.so
-lib/iconv/mac-japan.so
-lib/iconv/mac-roman.so
-lib/iconv/mac-romania.so
-lib/iconv/mac-thai.so
-lib/iconv/mac-turkish.so
-lib/iconv/mac-ukraine.so
-lib/iconv/maccenteuro.so
-lib/iconv/maccroatian.so
-lib/iconv/maccyrillic.so
-lib/iconv/macdingbats.so
-lib/iconv/macgreek.so
-lib/iconv/maciceland.so
-lib/iconv/macroman.so
-lib/iconv/macromania.so
-lib/iconv/macthai.so
-lib/iconv/macturkish.so
-lib/iconv/macukraine.so
-lib/iconv/unicode-1-1-utf-7.so
-lib/iconv/utf-7.so
-lib/iconv/windows-1250.so
-lib/iconv/windows-1251.so
-lib/iconv/windows-1252.so
-lib/iconv/windows-1253.so
-lib/iconv/windows-1254.so
-lib/iconv/windows-1255.so
-lib/iconv/windows-1256.so
-lib/iconv/windows-1257.so
-lib/iconv/windows-1258.so
+libexec/iconv/iso-2022-cn.so
+libexec/iconv/iso-2022-jp-2.so
+libexec/iconv/iso-2022-jp.so
+libexec/iconv/iso-2022-kr.so
+libexec/iconv/unicode-1-1-utf-7.so
+share/iconv/adobe-stdenc.cct
+share/iconv/adobe-symbol.cct
+share/iconv/adobe-zdingbats.cct
+share/iconv/cp037.cct
+share/iconv/cp10000.cct
+share/iconv/cp10006.cct
+share/iconv/cp10007.cct
+share/iconv/cp10029.cct
+share/iconv/cp1006.cct
+share/iconv/cp10079.cct
+share/iconv/cp10081.cct
+share/iconv/cp1026.cct
+share/iconv/cp424.cct
+share/iconv/cp437.cct
+share/iconv/cp500.cct
+share/iconv/cp737.cct
+share/iconv/cp856.cct
+share/iconv/cp857.cct
+share/iconv/cp860.cct
+share/iconv/cp861.cct
+share/iconv/cp862.cct
+share/iconv/cp863.cct
+share/iconv/cp864.cct
+share/iconv/cp865.cct
+share/iconv/cp869.cct
+share/iconv/cp874.cct
+share/iconv/cp875.cct
+share/iconv/cp932.cct
+share/iconv/cp936.cct
+share/iconv/cp949.cct
+share/iconv/cp950.cct
+share/iconv/gb12345.cct
+share/iconv/iso-8859-10.cct
+share/iconv/iso-8859-13.cct
+share/iconv/iso-8859-14.cct
+share/iconv/iso-8859-3.cct
+share/iconv/iso-8859-6.cct
+share/iconv/iso-8859-7.cct
+share/iconv/iso-8859-8.cct
+share/iconv/iso-8859-9.cct
+share/iconv/johab.cct
+share/iconv/koi8-ru.cct
+share/iconv/mac-ce.cct
+share/iconv/mac-croatian.cct
+share/iconv/mac-cyrillic.cct
+share/iconv/mac-dingbats.cct
+share/iconv/mac-greek.cct
+share/iconv/mac-iceland.cct
+share/iconv/mac-japan.cct
+share/iconv/mac-roman.cct
+share/iconv/mac-romania.cct
+share/iconv/mac-thai.cct
+share/iconv/mac-turkish.cct
+share/iconv/mac-ukraine.cct
+share/iconv/windows-1250.cct
+share/iconv/windows-1251.cct
+share/iconv/windows-1252.cct
+share/iconv/windows-1253.cct
+share/iconv/windows-1254.cct
+share/iconv/windows-1255.cct
+share/iconv/windows-1256.cct
+share/iconv/windows-1257.cct
+share/iconv/windows-1258.cct
+@unexec sed '/^# BEGIN iconv-extra$/,/^# END iconv-extra$/d' %B/charset.aliases > %B/charset.aliases.new && mv -f %B/charset.aliases.new %B/charset.aliases
diff --git a/converters/iconv-rfc1345/Makefile b/converters/iconv-rfc1345/Makefile
index c3ab317c0983..587f8b2dafeb 100644
--- a/converters/iconv-rfc1345/Makefile
+++ b/converters/iconv-rfc1345/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	iconv-rfc1345
-PORTVERSION=	1.1
+PORTVERSION=	2.0
 CATEGORIES=	converters
 MASTER_SITES=	http://www.dante.net/staff/konstantin/FreeBSD/iconv/
 
 MAINTAINER=	Konstantin.Chuguev@dante.org.uk
 
-LIB_DEPENDS=	iconv.1:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
 USE_PERL5=	yes
 
diff --git a/converters/iconv-rfc1345/distinfo b/converters/iconv-rfc1345/distinfo
index cb91467da778..76263409a4bd 100644
--- a/converters/iconv-rfc1345/distinfo
+++ b/converters/iconv-rfc1345/distinfo
@@ -1 +1 @@
-MD5 (iconv-rfc1345-1.1.tar.gz) = 8d41659f895895dd6a0ea05ca7b63872
+MD5 (iconv-rfc1345-2.0.tar.gz) = 6b3c03b5bbc2d065c589517366e33c47
diff --git a/converters/iconv-rfc1345/pkg-descr b/converters/iconv-rfc1345/pkg-descr
index e22f5624b64e..68e705d9e566 100644
--- a/converters/iconv-rfc1345/pkg-descr
+++ b/converters/iconv-rfc1345/pkg-descr
@@ -1,6 +1,6 @@
 ICONV is the library for conversion between various charsets.
 
-There are 108 charset modules in this port: those for most charsets
+There are 108 charset tables in this port: those for most charsets
 presented in RFC1345 but not included into the iconv and iconv-extra
 packages.
 
diff --git a/converters/iconv-rfc1345/pkg-plist b/converters/iconv-rfc1345/pkg-plist
index 738b30303169..adaf3a90b288 100644
--- a/converters/iconv-rfc1345/pkg-plist
+++ b/converters/iconv-rfc1345/pkg-plist
@@ -1,286 +1,109 @@
-lib/iconv/851.so
-lib/iconv/904.so
-lib/iconv/ansi_x3.110-1983.so
-lib/iconv/arabic7.so
-lib/iconv/asmo_449.so
-lib/iconv/bs_4730.so
-lib/iconv/bs_viewdata.so
-lib/iconv/ca.so
-lib/iconv/cp-ar.so
-lib/iconv/cp038.so
-lib/iconv/cp273.so
-lib/iconv/cp274.so
-lib/iconv/cp275.so
-lib/iconv/cp277.so
-lib/iconv/cp278.so
-lib/iconv/cp280.so
-lib/iconv/cp281.so
-lib/iconv/cp284.so
-lib/iconv/cp285.so
-lib/iconv/cp290.so
-lib/iconv/cp297.so
-lib/iconv/cp420.so
-lib/iconv/cp423.so
-lib/iconv/cp851.so
-lib/iconv/cp868.so
-lib/iconv/cp870.so
-lib/iconv/cp871.so
-lib/iconv/cp880.so
-lib/iconv/cp891.so
-lib/iconv/cp903.so
-lib/iconv/cp904.so
-lib/iconv/cp905.so
-lib/iconv/cp918.so
-lib/iconv/csa7-1.so
-lib/iconv/csa7-2.so
-lib/iconv/csa_t500-1983.so
-lib/iconv/csa_z243.4-1985-1.so
-lib/iconv/csa_z243.4-1985-2.so
-lib/iconv/csa_z243.4-1985-gr.so
-lib/iconv/csn_369103.so
-lib/iconv/cuba.so
-lib/iconv/de.so
-lib/iconv/dec-mcs.so
-lib/iconv/dec.so
-lib/iconv/din_66003.so
-lib/iconv/dk.so
-lib/iconv/ds2089.so
-lib/iconv/ds_2089.so
-lib/iconv/e13b.so
-lib/iconv/ebcdic-at-de-a.so
-lib/iconv/ebcdic-at-de.so
-lib/iconv/ebcdic-be.so
-lib/iconv/ebcdic-br.so
-lib/iconv/ebcdic-ca-fr.so
-lib/iconv/ebcdic-cp-ar1.so
-lib/iconv/ebcdic-cp-ar2.so
-lib/iconv/ebcdic-cp-dk.so
-lib/iconv/ebcdic-cp-es.so
-lib/iconv/ebcdic-cp-fi.so
-lib/iconv/ebcdic-cp-fr.so
-lib/iconv/ebcdic-cp-gb.so
-lib/iconv/ebcdic-cp-gr.so
-lib/iconv/ebcdic-cp-is.so
-lib/iconv/ebcdic-cp-it.so
-lib/iconv/ebcdic-cp-no.so
-lib/iconv/ebcdic-cp-roece.so
-lib/iconv/ebcdic-cp-se.so
-lib/iconv/ebcdic-cp-tr.so
-lib/iconv/ebcdic-cp-yu.so
-lib/iconv/ebcdic-cyrillic.so
-lib/iconv/ebcdic-dk-no-a.so
-lib/iconv/ebcdic-dk-no.so
-lib/iconv/ebcdic-es-a.so
-lib/iconv/ebcdic-es-s.so
-lib/iconv/ebcdic-es.so
-lib/iconv/ebcdic-fi-se-a.so
-lib/iconv/ebcdic-fi-se.so
-lib/iconv/ebcdic-fr.so
-lib/iconv/ebcdic-int.so
-lib/iconv/ebcdic-it.so
-lib/iconv/ebcdic-jp-e.so
-lib/iconv/ebcdic-jp-kana.so
-lib/iconv/ebcdic-pt.so
-lib/iconv/ebcdic-uk.so
-lib/iconv/ebcdic-us.so
-lib/iconv/ecma-cyrillic.so
-lib/iconv/es.so
-lib/iconv/es2.so
-lib/iconv/fi.so
-lib/iconv/fr.so
-lib/iconv/gb.so
-lib/iconv/gb_1988-80.so
-lib/iconv/gost_19768-74.so
-lib/iconv/greek-ccitt.so
-lib/iconv/greek7-old.so
-lib/iconv/greek7.so
-lib/iconv/hp-roman8.so
-lib/iconv/hu.so
-lib/iconv/ibm038.so
-lib/iconv/ibm273.so
-lib/iconv/ibm274.so
-lib/iconv/ibm275.so
-lib/iconv/ibm277.so
-lib/iconv/ibm278.so
-lib/iconv/ibm280.so
-lib/iconv/ibm281.so
-lib/iconv/ibm284.so
-lib/iconv/ibm285.so
-lib/iconv/ibm290.so
-lib/iconv/ibm297.so
-lib/iconv/ibm420.so
-lib/iconv/ibm423.so
-lib/iconv/ibm851.so
-lib/iconv/ibm868.so
-lib/iconv/ibm870.so
-lib/iconv/ibm871.so
-lib/iconv/ibm880.so
-lib/iconv/ibm891.so
-lib/iconv/ibm903.so
-lib/iconv/ibm904.so
-lib/iconv/ibm905.so
-lib/iconv/ibm918.so
-lib/iconv/iec_p27-1.so
-lib/iconv/inis-8.so
-lib/iconv/inis-cyrillic.so
-lib/iconv/inis.so
-lib/iconv/irv.so
-lib/iconv/iso-ir-10.so
-lib/iconv/iso-ir-102.so
-lib/iconv/iso-ir-103.so
-lib/iconv/iso-ir-11.so
-lib/iconv/iso-ir-111.so
-lib/iconv/iso-ir-121.so
-lib/iconv/iso-ir-122.so
-lib/iconv/iso-ir-123.so
-lib/iconv/iso-ir-128.so
-lib/iconv/iso-ir-13.so
-lib/iconv/iso-ir-139.so
-lib/iconv/iso-ir-14.so
-lib/iconv/iso-ir-141.so
-lib/iconv/iso-ir-142.so
-lib/iconv/iso-ir-143.so
-lib/iconv/iso-ir-146.so
-lib/iconv/iso-ir-147.so
-lib/iconv/iso-ir-15.so
-lib/iconv/iso-ir-150.so
-lib/iconv/iso-ir-151.so
-lib/iconv/iso-ir-152.so
-lib/iconv/iso-ir-153.so
-lib/iconv/iso-ir-154.so
-lib/iconv/iso-ir-155.so
-lib/iconv/iso-ir-158.so
-lib/iconv/iso-ir-16.so
-lib/iconv/iso-ir-17.so
-lib/iconv/iso-ir-18.so
-lib/iconv/iso-ir-19.so
-lib/iconv/iso-ir-2.so
-lib/iconv/iso-ir-21.so
-lib/iconv/iso-ir-25.so
-lib/iconv/iso-ir-27.so
-lib/iconv/iso-ir-37.so
-lib/iconv/iso-ir-4.so
-lib/iconv/iso-ir-47.so
-lib/iconv/iso-ir-49.so
-lib/iconv/iso-ir-50.so
-lib/iconv/iso-ir-51.so
-lib/iconv/iso-ir-54.so
-lib/iconv/iso-ir-55.so
-lib/iconv/iso-ir-57.so
-lib/iconv/iso-ir-60.so
-lib/iconv/iso-ir-61.so
-lib/iconv/iso-ir-69.so
-lib/iconv/iso-ir-70.so
-lib/iconv/iso-ir-8-1.so
-lib/iconv/iso-ir-8-2.so
-lib/iconv/iso-ir-84.so
-lib/iconv/iso-ir-85.so
-lib/iconv/iso-ir-86.so
-lib/iconv/iso-ir-88.so
-lib/iconv/iso-ir-89.so
-lib/iconv/iso-ir-9-1.so
-lib/iconv/iso-ir-9-2.so
-lib/iconv/iso-ir-90.so
-lib/iconv/iso-ir-91.so
-lib/iconv/iso-ir-92.so
-lib/iconv/iso-ir-93.so
-lib/iconv/iso-ir-94.so
-lib/iconv/iso-ir-95.so
-lib/iconv/iso-ir-96.so
-lib/iconv/iso-ir-98.so
-lib/iconv/iso-ir-99.so
-lib/iconv/iso646-ca.so
-lib/iconv/iso646-ca2.so
-lib/iconv/iso646-cu.so
-lib/iconv/iso646-de.so
-lib/iconv/iso646-dk.so
-lib/iconv/iso646-es.so
-lib/iconv/iso646-es2.so
-lib/iconv/iso646-fi.so
-lib/iconv/iso646-fr.so
-lib/iconv/iso646-fr1.so
-lib/iconv/iso646-gb.so
-lib/iconv/iso646-hu.so
-lib/iconv/iso646-it.so
-lib/iconv/iso646-jp-ocr-a.so
-lib/iconv/iso646-jp-ocr-b.so
-lib/iconv/iso646-jp.so
-lib/iconv/iso646-kr.so
-lib/iconv/iso646-no.so
-lib/iconv/iso646-no2.so
-lib/iconv/iso646-pt.so
-lib/iconv/iso646-pt2.so
-lib/iconv/iso646-se.so
-lib/iconv/iso646-se2.so
-lib/iconv/iso646-yu.so
-lib/iconv/iso_10367-box.so
-lib/iconv/iso_2033-1983.so
-lib/iconv/iso_5427.so
-lib/iconv/iso_5427:1981.so
-lib/iconv/iso_5428:1980.so
-lib/iconv/iso_646.irv:1983.so
-lib/iconv/iso_6937-2-25.so
-lib/iconv/iso_6937-2-add.so
-lib/iconv/iso_8859-supp.so
-lib/iconv/iso_9036.so
-lib/iconv/it.so
-lib/iconv/jis_c6220-1969-jp.so
-lib/iconv/jis_c6220-1969-ro.so
-lib/iconv/jis_c6220-1969.so
-lib/iconv/jis_c6229-1984-a.so
-lib/iconv/jis_c6229-1984-b-add.so
-lib/iconv/jis_c6229-1984-b.so
-lib/iconv/jis_c6229-1984-hand-add.so
-lib/iconv/jis_c6229-1984-hand.so
-lib/iconv/jis_c6229-1984-kana.so
-lib/iconv/jp-ocr-a.so
-lib/iconv/jp-ocr-b-add.so
-lib/iconv/jp-ocr-b.so
-lib/iconv/jp-ocr-hand-add.so
-lib/iconv/jp-ocr-hand.so
-lib/iconv/jp.so
-lib/iconv/js.so
-lib/iconv/jus_i.b1.002.so
-lib/iconv/jus_i.b1.003-mac.so
-lib/iconv/jus_i.b1.003-serb.so
-lib/iconv/katakana.so
-lib/iconv/ksc5636.so
-lib/iconv/lap.so
-lib/iconv/latin-greek-1.so
-lib/iconv/latin-greek.so
-lib/iconv/latin-lap.so
-lib/iconv/latin1-2-5.so
-lib/iconv/mac.so
-lib/iconv/macedonian.so
-lib/iconv/macintosh.so
-lib/iconv/msz_7795.3.so
-lib/iconv/naplps.so
-lib/iconv/nats-dano-add.so
-lib/iconv/nats-dano.so
-lib/iconv/nats-sefi-add.so
-lib/iconv/nats-sefi.so
-lib/iconv/nc_nc00-10:81.so
-lib/iconv/nf_z_62-010.so
-lib/iconv/nf_z_62-010_(1973).so
-lib/iconv/no.so
-lib/iconv/no2.so
-lib/iconv/ns_4551-1.so
-lib/iconv/ns_4551-2.so
-lib/iconv/pt.so
-lib/iconv/pt2.so
-lib/iconv/r8.so
-lib/iconv/roman8.so
-lib/iconv/se.so
-lib/iconv/se2.so
-lib/iconv/sen_850200_b.so
-lib/iconv/sen_850200_c.so
-lib/iconv/serbian.so
-lib/iconv/st_sev_358-88.so
-lib/iconv/t.101-g2.so
-lib/iconv/t.61-7bit.so
-lib/iconv/t.61-8bit.so
-lib/iconv/t.61.so
-lib/iconv/uk.so
-lib/iconv/videotex-suppl.so
-lib/iconv/x0201-7.so
-lib/iconv/yu.so
+share/iconv/cp038.cct
+share/iconv/cp273.cct
+share/iconv/cp274.cct
+share/iconv/cp275.cct
+share/iconv/cp277.cct
+share/iconv/cp278.cct
+share/iconv/cp280.cct
+share/iconv/cp281.cct
+share/iconv/cp284.cct
+share/iconv/cp285.cct
+share/iconv/cp290.cct
+share/iconv/cp297.cct
+share/iconv/cp420.cct
+share/iconv/cp423.cct
+share/iconv/cp851.cct
+share/iconv/cp868.cct
+share/iconv/cp870.cct
+share/iconv/cp871.cct
+share/iconv/cp880.cct
+share/iconv/cp891.cct
+share/iconv/cp903.cct
+share/iconv/cp904.cct
+share/iconv/cp905.cct
+share/iconv/cp918.cct
+share/iconv/dec-mcs.cct
+share/iconv/ebcdic-at-de-a.cct
+share/iconv/ebcdic-at-de.cct
+share/iconv/ebcdic-ca-fr.cct
+share/iconv/ebcdic-dk-no-a.cct
+share/iconv/ebcdic-dk-no.cct
+share/iconv/ebcdic-es-a.cct
+share/iconv/ebcdic-es-s.cct
+share/iconv/ebcdic-es.cct
+share/iconv/ebcdic-fi-se-a.cct
+share/iconv/ebcdic-fi-se.cct
+share/iconv/ebcdic-fr.cct
+share/iconv/ebcdic-it.cct
+share/iconv/ebcdic-pt.cct
+share/iconv/ebcdic-uk.cct
+share/iconv/ebcdic-us.cct
+share/iconv/hp-roman8.cct
+share/iconv/iso-ir-10.cct
+share/iconv/iso-ir-102.cct
+share/iconv/iso-ir-103.cct
+share/iconv/iso-ir-11.cct
+share/iconv/iso-ir-111.cct
+share/iconv/iso-ir-121.cct
+share/iconv/iso-ir-122.cct
+share/iconv/iso-ir-123.cct
+share/iconv/iso-ir-128.cct
+share/iconv/iso-ir-13.cct
+share/iconv/iso-ir-139.cct
+share/iconv/iso-ir-14.cct
+share/iconv/iso-ir-141.cct
+share/iconv/iso-ir-142.cct
+share/iconv/iso-ir-143.cct
+share/iconv/iso-ir-146.cct
+share/iconv/iso-ir-147.cct
+share/iconv/iso-ir-15.cct
+share/iconv/iso-ir-150.cct
+share/iconv/iso-ir-151.cct
+share/iconv/iso-ir-152.cct
+share/iconv/iso-ir-153.cct
+share/iconv/iso-ir-154.cct
+share/iconv/iso-ir-155.cct
+share/iconv/iso-ir-158.cct
+share/iconv/iso-ir-16.cct
+share/iconv/iso-ir-17.cct
+share/iconv/iso-ir-18.cct
+share/iconv/iso-ir-19.cct
+share/iconv/iso-ir-2.cct
+share/iconv/iso-ir-21.cct
+share/iconv/iso-ir-25.cct
+share/iconv/iso-ir-27.cct
+share/iconv/iso-ir-37.cct
+share/iconv/iso-ir-4.cct
+share/iconv/iso-ir-47.cct
+share/iconv/iso-ir-49.cct
+share/iconv/iso-ir-50.cct
+share/iconv/iso-ir-51.cct
+share/iconv/iso-ir-54.cct
+share/iconv/iso-ir-55.cct
+share/iconv/iso-ir-57.cct
+share/iconv/iso-ir-60.cct
+share/iconv/iso-ir-61.cct
+share/iconv/iso-ir-69.cct
+share/iconv/iso-ir-70.cct
+share/iconv/iso-ir-8-1.cct
+share/iconv/iso-ir-8-2.cct
+share/iconv/iso-ir-84.cct
+share/iconv/iso-ir-85.cct
+share/iconv/iso-ir-86.cct
+share/iconv/iso-ir-88.cct
+share/iconv/iso-ir-89.cct
+share/iconv/iso-ir-9-1.cct
+share/iconv/iso-ir-9-2.cct
+share/iconv/iso-ir-90.cct
+share/iconv/iso-ir-91.cct
+share/iconv/iso-ir-92.cct
+share/iconv/iso-ir-93.cct
+share/iconv/iso-ir-94.cct
+share/iconv/iso-ir-95.cct
+share/iconv/iso-ir-96.cct
+share/iconv/iso-ir-98.cct
+share/iconv/iso-ir-99.cct
+share/iconv/iso646-dk.cct
+share/iconv/iso646-kr.cct
+share/iconv/macintosh.cct
+@unexec sed '/^# BEGIN iconv-rfc1345$/,/^# END iconv-rfc1345$/d' %B/charset.aliases > %B/charset.aliases.new && mv -f %B/charset.aliases.new %B/charset.aliases
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
diff --git a/converters/ruby-iconv/Makefile b/converters/ruby-iconv/Makefile
index ee93374eb569..8333d299c69c 100644
--- a/converters/ruby-iconv/Makefile
+++ b/converters/ruby-iconv/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-LIB_DEPENDS=	iconv.1:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes