Update iconv to 2.0 and reflect shared library version bump.

PR:		23163, 23164, 23165
Submitted by:	maintainer

4 files changed, 73 insertions, 192 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