- Update to 1.18

  sort pkg-plist

3 files changed, 140 insertions, 137 deletions

diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index 0f6c3f36237d..d3fce37218e9 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Locale-libintl
-PORTVERSION=	1.16
-PORTREVISION=	1
+PORTVERSION=	1.18
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -168,5 +167,7 @@ MAN3=	Locale::RecodeData::IBM862.3 \
 	Locale::RecodeData::ATARI_ST_EURO.3 \
 	Locale::RecodeData::IBM290.3 \
 	Locale::RecodeData::IBM903.3 \
+	Locale::Util.3 \
+	Locale::libintlFAQ.3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Locale-libintl/distinfo b/devel/p5-Locale-libintl/distinfo
index 31a03e0516e8..f341e83c851f 100644
--- a/devel/p5-Locale-libintl/distinfo
+++ b/devel/p5-Locale-libintl/distinfo
@@ -1,3 +1,3 @@
-MD5 (libintl-perl-1.16.tar.gz) = 7dfcd9ac3a4ff41038a2c67a733d42b9
-SHA256 (libintl-perl-1.16.tar.gz) = 1a64895c9a6cdbb5cdfff81f1520541fee28e85fb940d9b0484de656d69ae8f5
-SIZE (libintl-perl-1.16.tar.gz) = 465597
+MD5 (libintl-perl-1.18.tar.gz) = 98d815f3a05e9795d92aa8e1fa6eb4fa
+SHA256 (libintl-perl-1.18.tar.gz) = bdd76276d803604eaf995ef5ad3c65f757bb7152c4763f23394708d5a0bf16cb
+SIZE (libintl-perl-1.18.tar.gz) = 496894
diff --git a/devel/p5-Locale-libintl/pkg-plist b/devel/p5-Locale-libintl/pkg-plist
index f128722e2384..238e0a213e22 100644
--- a/devel/p5-Locale-libintl/pkg-plist
+++ b/devel/p5-Locale-libintl/pkg-plist
@@ -1,156 +1,158 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/libintl-perl/.packlist
-%%SITE_PERL%%/Locale/RecodeData/IBM284.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM862.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM278.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_5427.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_5.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_11.pm
-%%SITE_PERL%%/Locale/RecodeData/MACCYRILLIC.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM273.pm
-%%SITE_PERL%%/Locale/RecodeData/LATIN_GREEK_1.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM851.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_IT.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM871.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM891.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM865.pm
-%%SITE_PERL%%/Locale/RecodeData/CP1250.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_8.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_FI_SE.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_DK_NO.pm
-%%SITE_PERL%%/Locale/RecodeData/MAC_IS.pm
-%%SITE_PERL%%/Locale/RecodeData/KOI8_R.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_14.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_5427_EXT.pm
-%%SITE_PERL%%/Locale/RecodeData/INIS_CYRILLIC.pm
-%%SITE_PERL%%/Locale/RecodeData/US_ASCII.pm
-%%SITE_PERL%%/Locale/RecodeData/MAC_UK.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM424.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM256.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM860.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM880.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_3.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM874.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM868.pm
-%%SITE_PERL%%/Locale/RecodeData/CP1253.pm
-%%SITE_PERL%%/Locale/RecodeData/MACGREEK.pm
-%%SITE_PERL%%/Locale/RecodeData/MACICELAND.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_ES_S.pm
-%%SITE_PERL%%/Locale/RecodeData/SAMI_WS2.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_2033_1983.pm
-%%SITE_PERL%%/Locale/RecodeData/TIS_620.pm
-%%SITE_PERL%%/Locale/RecodeData/HP_ROMAN8.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM500.pm
-%%SITE_PERL%%/Locale/RecodeData/GEORGIAN_PS.pm
-%%SITE_PERL%%/Locale/RecodeData/KOI8_U.pm
+%%SITE_PERL%%/Locale/Messages.pm
+%%SITE_PERL%%/Locale/Recode.pm
+%%SITE_PERL%%/Locale/Recode/_Aliases.pm
+%%SITE_PERL%%/Locale/Recode/_Conversions.pm
+%%SITE_PERL%%/Locale/RecodeData.pm
 %%SITE_PERL%%/Locale/RecodeData/ASMO_449.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM037.pm
-%%SITE_PERL%%/Locale/RecodeData/INIS.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM904.pm
-%%SITE_PERL%%/Locale/RecodeData/NATS_DANO.pm
-%%SITE_PERL%%/Locale/RecodeData/MACTHAI.pm
 %%SITE_PERL%%/Locale/RecodeData/ATARI_ST.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM285.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM863.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM918.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_IS_FRISS.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM857.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_6.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_5428.pm
-%%SITE_PERL%%/Locale/RecodeData/GEORGIAN_ACADEMY.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_FI_SE_A.pm
-%%SITE_PERL%%/Locale/RecodeData/MACUKRAINE.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM1026.pm
+%%SITE_PERL%%/Locale/RecodeData/ATARI_ST_EURO.pm
+%%SITE_PERL%%/Locale/RecodeData/CP10007.pm
+%%SITE_PERL%%/Locale/RecodeData/CP1250.pm
+%%SITE_PERL%%/Locale/RecodeData/CP1251.pm
+%%SITE_PERL%%/Locale/RecodeData/CP1252.pm
+%%SITE_PERL%%/Locale/RecodeData/CP1253.pm
+%%SITE_PERL%%/Locale/RecodeData/CP1254.pm
 %%SITE_PERL%%/Locale/RecodeData/CP1256.pm
-%%SITE_PERL%%/Locale/RecodeData/MACCROATIAN.pm
-%%SITE_PERL%%/Locale/RecodeData/GREEK_CCITT.pm
-%%SITE_PERL%%/Locale/RecodeData/LATIN_GREEK.pm
-%%SITE_PERL%%/Locale/RecodeData/UTF_8.pm
-%%SITE_PERL%%/Locale/RecodeData/INIS_8.pm
+%%SITE_PERL%%/Locale/RecodeData/CP1257.pm
+%%SITE_PERL%%/Locale/RecodeData/CSN_369103.pm
+%%SITE_PERL%%/Locale/RecodeData/CWI.pm
 %%SITE_PERL%%/Locale/RecodeData/DEC_MCS.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_ES_A.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM280.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM274.pm
 %%SITE_PERL%%/Locale/RecodeData/EBCDIC_AT_DE.pm
 %%SITE_PERL%%/Locale/RecodeData/EBCDIC_AT_DE_A.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM852.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_1.pm
-%%SITE_PERL%%/Locale/RecodeData/CSN_369103.pm
-%%SITE_PERL%%/Locale/RecodeData/IEC_P27_1.pm
-%%SITE_PERL%%/Locale/RecodeData/MACTURKISH.pm
-%%SITE_PERL%%/Locale/RecodeData/CP1251.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM866.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_9.pm
-%%SITE_PERL%%/Locale/RecodeData/GREEK7_OLD.pm
-%%SITE_PERL%%/Locale/RecodeData/MACINTOSH.pm
-%%SITE_PERL%%/Locale/RecodeData/_Encode.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_15.pm
-%%SITE_PERL%%/Locale/RecodeData/MACHEBREW.pm
-%%SITE_PERL%%/Locale/RecodeData/MACARABIC.pm
-%%SITE_PERL%%/Locale/RecodeData/GOST_19768_74.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM861.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM277.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM297.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM855.pm
-%%SITE_PERL%%/Locale/RecodeData/NEXTSTEP.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_4.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM875.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_PT.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM1004.pm
-%%SITE_PERL%%/Locale/RecodeData/CP1254.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM869.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_CA_FR.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_DK_NO.pm
 %%SITE_PERL%%/Locale/RecodeData/EBCDIC_DK_NO_A.pm
-%%SITE_PERL%%/Locale/RecodeData/GREEK7.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_10.pm
-%%SITE_PERL%%/Locale/RecodeData/CP10007.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM420.pm
 %%SITE_PERL%%/Locale/RecodeData/EBCDIC_ES.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM038.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_10367_BOX.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM850.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM905.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM870.pm
-%%SITE_PERL%%/Locale/RecodeData/MACROMANIA.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_ES_A.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_ES_S.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_FI_SE.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_FI_SE_A.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_FR.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_IS_FRISS.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_IT.pm
+%%SITE_PERL%%/Locale/RecodeData/EBCDIC_PT.pm
 %%SITE_PERL%%/Locale/RecodeData/EBCDIC_UK.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM864.pm
-%%SITE_PERL%%/Locale/RecodeData/KOI_8.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_7.pm
 %%SITE_PERL%%/Locale/RecodeData/EBCDIC_US.pm
-%%SITE_PERL%%/Locale/RecodeData/CP1257.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM1047.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_13.pm
 %%SITE_PERL%%/Locale/RecodeData/ECMA_CYRILLIC.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM423.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_FR.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM281.pm
-%%SITE_PERL%%/Locale/RecodeData/EBCDIC_CA_FR.pm
+%%SITE_PERL%%/Locale/RecodeData/GEORGIAN_ACADEMY.pm
+%%SITE_PERL%%/Locale/RecodeData/GEORGIAN_PS.pm
+%%SITE_PERL%%/Locale/RecodeData/GOST_19768_74.pm
+%%SITE_PERL%%/Locale/RecodeData/GREEK7.pm
+%%SITE_PERL%%/Locale/RecodeData/GREEK7_OLD.pm
+%%SITE_PERL%%/Locale/RecodeData/GREEK_CCITT.pm
+%%SITE_PERL%%/Locale/RecodeData/HP_ROMAN8.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM037.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM038.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM1004.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM1026.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM1047.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM256.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM273.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM274.pm
 %%SITE_PERL%%/Locale/RecodeData/IBM275.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM277.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM278.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM280.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM281.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM284.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM285.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM290.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM297.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM420.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM423.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM424.pm
 %%SITE_PERL%%/Locale/RecodeData/IBM437.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM500.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM850.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM851.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM852.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM855.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM857.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM860.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM861.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM862.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM863.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM864.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM865.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM866.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM868.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM869.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM870.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM871.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM874.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM875.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM880.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM891.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM903.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM904.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM905.pm
+%%SITE_PERL%%/Locale/RecodeData/IBM918.pm
+%%SITE_PERL%%/Locale/RecodeData/IEC_P27_1.pm
+%%SITE_PERL%%/Locale/RecodeData/INIS.pm
+%%SITE_PERL%%/Locale/RecodeData/INIS_8.pm
+%%SITE_PERL%%/Locale/RecodeData/INIS_CYRILLIC.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_10367_BOX.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_2033_1983.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_5427.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_5427_EXT.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_5428.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_1.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_10.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_11.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_13.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_14.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_15.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_16.pm
 %%SITE_PERL%%/Locale/RecodeData/ISO_8859_2.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_3.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_4.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_5.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_6.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_7.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_8.pm
+%%SITE_PERL%%/Locale/RecodeData/ISO_8859_9.pm
+%%SITE_PERL%%/Locale/RecodeData/KOI8_R.pm
+%%SITE_PERL%%/Locale/RecodeData/KOI8_RU.pm
+%%SITE_PERL%%/Locale/RecodeData/KOI8_T.pm
+%%SITE_PERL%%/Locale/RecodeData/KOI8_U.pm
+%%SITE_PERL%%/Locale/RecodeData/KOI_8.pm
+%%SITE_PERL%%/Locale/RecodeData/LATIN_GREEK.pm
+%%SITE_PERL%%/Locale/RecodeData/LATIN_GREEK_1.pm
+%%SITE_PERL%%/Locale/RecodeData/MACARABIC.pm
+%%SITE_PERL%%/Locale/RecodeData/MACCROATIAN.pm
+%%SITE_PERL%%/Locale/RecodeData/MACCYRILLIC.pm
+%%SITE_PERL%%/Locale/RecodeData/MACGREEK.pm
+%%SITE_PERL%%/Locale/RecodeData/MACHEBREW.pm
+%%SITE_PERL%%/Locale/RecodeData/MACICELAND.pm
+%%SITE_PERL%%/Locale/RecodeData/MACINTOSH.pm
+%%SITE_PERL%%/Locale/RecodeData/MACROMANIA.pm
+%%SITE_PERL%%/Locale/RecodeData/MACTHAI.pm
+%%SITE_PERL%%/Locale/RecodeData/MACTURKISH.pm
+%%SITE_PERL%%/Locale/RecodeData/MACUKRAINE.pm
+%%SITE_PERL%%/Locale/RecodeData/MAC_IS.pm
 %%SITE_PERL%%/Locale/RecodeData/MAC_SAMI.pm
+%%SITE_PERL%%/Locale/RecodeData/MAC_UK.pm
+%%SITE_PERL%%/Locale/RecodeData/NATS_DANO.pm
 %%SITE_PERL%%/Locale/RecodeData/NATS_SEFI.pm
-%%SITE_PERL%%/Locale/RecodeData/CP1252.pm
-%%SITE_PERL%%/Locale/RecodeData/KOI8_RU.pm
-%%SITE_PERL%%/Locale/RecodeData/CWI.pm
+%%SITE_PERL%%/Locale/RecodeData/NEXTSTEP.pm
+%%SITE_PERL%%/Locale/RecodeData/SAMI_WS2.pm
+%%SITE_PERL%%/Locale/RecodeData/TIS_620.pm
+%%SITE_PERL%%/Locale/RecodeData/US_ASCII.pm
+%%SITE_PERL%%/Locale/RecodeData/UTF_8.pm
 %%SITE_PERL%%/Locale/RecodeData/VISCII.pm
-%%SITE_PERL%%/Locale/RecodeData/KOI8_T.pm
-%%SITE_PERL%%/Locale/RecodeData/ISO_8859_16.pm
-%%SITE_PERL%%/Locale/RecodeData/ATARI_ST_EURO.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM290.pm
-%%SITE_PERL%%/Locale/RecodeData/IBM903.pm
-%%SITE_PERL%%/Locale/Recode/_Aliases.pm
-%%SITE_PERL%%/Locale/Recode/_Conversions.pm
-%%SITE_PERL%%/Locale/gettext_pp.pm
+%%SITE_PERL%%/Locale/RecodeData/_Encode.pm
 %%SITE_PERL%%/Locale/TextDomain.pm
-%%SITE_PERL%%/Locale/RecodeData.pm
-%%SITE_PERL%%/Locale/Recode.pm
-%%SITE_PERL%%/Locale/gettext_xs.pod
-%%SITE_PERL%%/Locale/Messages.pm
+%%SITE_PERL%%/Locale/Util.pm
+%%SITE_PERL%%/Locale/gettext_pp.pm
 %%SITE_PERL%%/Locale/gettext_xs.pm
-%%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.so
+%%SITE_PERL%%/Locale/gettext_xs.pod
+%%SITE_PERL%%/Locale/libintlFAQ.pod
 %%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.bs
-@dirrm %%SITE_PERL%%/mach/auto/Locale/gettext_xs
-@dirrmtry %%SITE_PERL%%/mach/auto/Locale
+%%SITE_PERL%%/mach/auto/Locale/gettext_xs/gettext_xs.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libintl-perl
-@dirrm %%SITE_PERL%%/Locale/RecodeData
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext_xs
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
 @dirrm %%SITE_PERL%%/Locale/Recode
+@dirrm %%SITE_PERL%%/Locale/RecodeData
 @dirrmtry %%SITE_PERL%%/Locale