Depend on p5-Locale-libintl instead of installing included version of it.

Fix texi2html script to actually run.
Bump PKGREVISION.

5 files changed, 54 insertions, 308 deletions

diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index c97a46cf0b9..e23449b5ef7 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/12/02 15:31:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/12/03 12:23:26 wiz Exp $
 
 DISTNAME=	texi2html-5.0
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://savannah.nongnu.org/download/texi2html/
 
@@ -9,6 +10,8 @@ HOMEPAGE=	http://www.nongnu.org/texi2html/
 COMMENT=	Texinfo-to-HTML direct translator
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	p5-Locale-libintl-[0-9]*:../../misc/p5-Locale-libintl
+
 CONFLICTS=	teTeX-bin-1.*{,nb*}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
@@ -19,176 +22,27 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 INFO_FILES=		yes
 
-REPLACE_PERL+=	T2h_l2h.pm
 REPLACE_PERL+=	MySimple.pm
 REPLACE_PERL+=	T2h_i18n.pm
-REPLACE_PERL+=	lib/libintl-perl/sample/simplecal/lib/SimpleCal.pm
-REPLACE_PERL+=	lib/libintl-perl/gettext_xs/gettext_xs.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/Util.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/Messages.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/KOI8_T.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_UK.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1252.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/GEORGIAN_PS.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_5427.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_DK_NO_A.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IEC_P27_1.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM290.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/GEORGIAN_ACADEMY.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CSN_369103.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_14.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_US.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM850.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_IS_FRISS.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/TIS_620.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_15.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/GREEK_CCITT.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1251.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/GREEK7_OLD.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/DEC_MCS.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM1026.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/INIS.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACGREEK.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_8.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM256.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM281.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1256.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_4.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM866.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_9.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM852.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_10.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM297.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CWI.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACTHAI.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/US_ASCII.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/INIS_CYRILLIC.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM274.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM424.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_1.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM868.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACCROATIAN.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_5.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM1004.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES_A.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM861.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/GOST_19768_74.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACINTOSH.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_10367_BOX.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM865.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM285.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM500.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM278.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_5427_EXT.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ECMA_CYRILLIC.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACROMANIA.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM862.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES_S.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_CA_FR.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM855.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM860.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1253.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MAC_IS.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/SAMI_WS2.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_16.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM863.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_5428.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ASMO_449.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM905.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM284.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/GREEK7.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM277.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/HP_ROMAN8.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM864.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP10007.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM875.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/NATS_SEFI.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM874.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM904.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM903.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACUKRAINE.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1254.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM423.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/LATIN_GREEK_1.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/INIS_8.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/KOI_8.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_2033_1983.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM280.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/VISCII.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/KOI8_RU.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM437.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FI_SE.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_6.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/NEXTSTEP.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACCYRILLIC.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM275.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACHEBREW.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_PT.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1257.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_13.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/_Encode.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_11.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_3.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/CP1250.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM273.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_IT.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM038.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACTURKISH.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/NATS_DANO.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/LATIN_GREEK.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM880.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FR.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/KOI8_R.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_AT_DE_A.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM869.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM870.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM891.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM871.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_2.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM857.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM037.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MAC_UK.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM420.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_AT_DE.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/UTF_8.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_7.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACICELAND.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_DK_NO.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FI_SE_A.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM918.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MAC_SAMI.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/MACARABIC.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST_EURO.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/KOI8_U.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM851.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData/IBM1047.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/TextDomain.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/Recode.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/Recode/_Aliases.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/Recode/_Conversions.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/RecodeData.pm
-REPLACE_PERL+=	lib/libintl-perl/lib/Locale/gettext_pp.pm
-REPLACE_PERL+=	lib/libintl-perl/MyInstall.pm
+REPLACE_PERL+=	T2h_l2h.pm
 REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install.pm
-REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Makefile.pm
 REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Base.pm
-REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Metadata.pm
-REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/WriteAll.pm
-REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Win32.pm
 REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Can.pm
 REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Fetch.pm
+REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Makefile.pm
+REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Metadata.pm
+REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/Win32.pm
+REPLACE_PERL+=	lib/Unicode-EastAsianWidth/inc/Module/Install/WriteAll.pm
 REPLACE_PERL+=	lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm
-REPLACE_PERL+=	test/invalid/res/tex_not_closed/tex_not_closed-l2h_cache.pm
+REPLACE_PERL+=	test/formatting/res/block_EOL_tex/block_EOL-l2h_cache.pm
+REPLACE_PERL+=	test/formatting/res/tex/tex-l2h_cache.pm
+REPLACE_PERL+=	test/formatting/res/tex_l2h_mediawiki/tex-l2h_cache.pm
+REPLACE_PERL+=	test/formatting/res_all/tex_l2h_mediawiki/tex-l2h_cache.pm
 REPLACE_PERL+=	test/invalid/res/math_not_closed/math_not_closed-l2h_cache.pm
 REPLACE_PERL+=	test/invalid/res/tex_in_copying/tex_in_copying-l2h_cache.pm
+REPLACE_PERL+=	test/invalid/res/tex_not_closed/tex_not_closed-l2h_cache.pm
 REPLACE_PERL+=	test/many_input_files/tex_l2h_res/mini_ker-l2h_cache.pm
 REPLACE_PERL+=	test/many_input_files/tex_l2h_res/tex-l2h_cache.pm
-REPLACE_PERL+=	test/formatting/res_all/tex_l2h_mediawiki/tex-l2h_cache.pm
-REPLACE_PERL+=	test/formatting/res/tex_l2h_mediawiki/tex-l2h_cache.pm
-REPLACE_PERL+=	test/formatting/res/tex/tex-l2h_cache.pm
-REPLACE_PERL+=	test/formatting/res/block_EOL_tex/block_EOL-l2h_cache.pm
 REPLACE_PERL+=	test/misc/res/mini_ker_l2h/mini_ker-l2h_cache.pm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/texi2html/PLIST b/textproc/texi2html/PLIST
index 7d008bbbaa5..5dccf138f65 100644
--- a/textproc/texi2html/PLIST
+++ b/textproc/texi2html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/12/02 15:31:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/12/03 12:23:26 wiz Exp $
 bin/texi2html
 info/texi2html.info
 man/man1/texi2html.1
@@ -85,152 +85,6 @@ share/texi2html/images/xy_previoussection_gr.png
 share/texi2html/images/xy_up.png
 share/texi2html/images/xy_up_gr.png
 share/texi2html/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm
-share/texi2html/lib/libintl-perl/lib/Locale/Messages.pm
-share/texi2html/lib/libintl-perl/lib/Locale/Recode.pm
-share/texi2html/lib/libintl-perl/lib/Locale/Recode/_Aliases.pm
-share/texi2html/lib/libintl-perl/lib/Locale/Recode/_Conversions.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ASMO_449.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST_EURO.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP10007.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1250.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1251.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1252.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1253.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1254.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1256.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CP1257.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CSN_369103.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/CWI.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/DEC_MCS.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_AT_DE.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_AT_DE_A.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_CA_FR.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_DK_NO.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_DK_NO_A.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES_A.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES_S.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FI_SE.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FI_SE_A.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FR.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_IS_FRISS.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_IT.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_PT.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_UK.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_US.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ECMA_CYRILLIC.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/GEORGIAN_ACADEMY.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/GEORGIAN_PS.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/GOST_19768_74.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/GREEK7.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/GREEK7_OLD.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/GREEK_CCITT.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/HP_ROMAN8.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM037.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM038.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM1004.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM1026.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM1047.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM256.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM273.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM274.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM275.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM277.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM278.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM280.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM281.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM284.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM285.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM290.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM297.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM420.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM423.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM424.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM437.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM500.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM850.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM851.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM852.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM855.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM857.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM860.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM861.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM862.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM863.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM864.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM865.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM866.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM868.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM869.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM870.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM871.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM874.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM875.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM880.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM891.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM903.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM904.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM905.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IBM918.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/IEC_P27_1.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/INIS.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/INIS_8.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/INIS_CYRILLIC.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_10367_BOX.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_2033_1983.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_5427.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_5427_EXT.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_5428.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_1.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_10.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_11.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_13.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_14.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_15.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_16.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_2.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_3.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_4.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_5.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_6.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_7.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_8.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_9.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/KOI8_R.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/KOI8_RU.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/KOI8_T.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/KOI8_U.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/KOI_8.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/LATIN_GREEK.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/LATIN_GREEK_1.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACARABIC.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACCROATIAN.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACCYRILLIC.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACGREEK.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACHEBREW.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACICELAND.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACINTOSH.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACROMANIA.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACTHAI.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACTURKISH.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MACUKRAINE.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MAC_IS.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MAC_SAMI.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/MAC_UK.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/NATS_DANO.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/NATS_SEFI.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/NEXTSTEP.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/SAMI_WS2.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/TIS_620.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/US_ASCII.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/UTF_8.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/VISCII.pm
-share/texi2html/lib/libintl-perl/lib/Locale/RecodeData/_Encode.pm
-share/texi2html/lib/libintl-perl/lib/Locale/TextDomain.pm
-share/texi2html/lib/libintl-perl/lib/Locale/Util.pm
-share/texi2html/lib/libintl-perl/lib/Locale/gettext_pp.pm
 share/texinfo/init/book.init
 share/texinfo/init/chm.init
 share/texinfo/init/html32.init
diff --git a/textproc/texi2html/distinfo b/textproc/texi2html/distinfo
index d714ab3ac98..426e2ca6020 100644
--- a/textproc/texi2html/distinfo
+++ b/textproc/texi2html/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2010/12/02 15:31:04 wiz Exp $
+$NetBSD: distinfo,v 1.9 2010/12/03 12:23:26 wiz Exp $
 
 SHA1 (texi2html-5.0.tar.gz) = 79264fccd434b0f1f4398ba69c839cff669226c1
 RMD160 (texi2html-5.0.tar.gz) = e94524216b93093729db0867f14efb3b78113307
 Size (texi2html-5.0.tar.gz) = 23284843 bytes
 SHA1 (patch-aa) = 9f1d1cd149b9c5adee08652a5e974e21e9b93f38
+SHA1 (patch-ab) = 9da6954e03cb91fb8a51eefed9986e491d134084
+SHA1 (patch-ac) = fdccaa8679a2c80b765d89bfe5b966d7527be4fc
diff --git a/textproc/texi2html/patches/patch-ab b/textproc/texi2html/patches/patch-ab
new file mode 100644
index 00000000000..af2414e976b
--- /dev/null
+++ b/textproc/texi2html/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2010/12/03 12:23:26 wiz Exp $
+
+Don't install included libintl-perl, use pkgsrc one.
+
+--- Makefile.in.orig	2010-06-30 22:02:28.000000000 +0000
++++ Makefile.in
+@@ -1080,14 +1080,6 @@ distclean-local:
+ install-data-local: i18n
+ 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/i18n
+ 	$(INSTALL_DATA) i18n/*.thl  $(DESTDIR)$(pkgdatadir)/i18n
+-	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/*.pm \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/Recode/*.pm \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
+-	$(INSTALL_DATA) $(srcdir)/lib/libintl-perl/lib/Locale/RecodeData/*.pm \
+-	  $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
+ 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
+ 	$(INSTALL_DATA) $(srcdir)/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
+ 	 $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
diff --git a/textproc/texi2html/patches/patch-ac b/textproc/texi2html/patches/patch-ac
new file mode 100644
index 00000000000..860bc8fb7f4
--- /dev/null
+++ b/textproc/texi2html/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2010/12/03 12:23:26 wiz Exp $
+
+Make it find libintl-perl.
+
+--- texi2html.pl.orig	2010-06-30 22:01:27.000000000 +0000
++++ texi2html.pl
+@@ -48,6 +48,8 @@ use File::Basename;
+ use File::Spec;
+ # to determine the path separator and null file
+ use Config;
++# for libintl-perl
++use Locale::Messages;
+ 
+ #use encoding::warnings;
+ # for translations