From e6758ec86323539c674dcf5ecc380ba5f1cc78ff Mon Sep 17 00:00:00 2001
From: skv <skv@FreeBSD.org>
Date: Sun, 5 Dec 2010 14:28:58 +0000
Subject: Remove encodings "koi8-r" and "windows-1251" because they are shipped
 with XML-Parser since 2.40

---
 russian/p5-XML-Parser-encodings/Makefile  | 22 ++++++++--------------
 russian/p5-XML-Parser-encodings/pkg-plist |  2 --
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'russian')

diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile
index 276ec06e7558..904b8094ceb8 100644
--- a/russian/p5-XML-Parser-encodings/Makefile
+++ b/russian/p5-XML-Parser-encodings/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	XML-Parser-encodings
-PORTVERSION=	1.02
+PORTVERSION=	1.03
 CATEGORIES=	russian textproc perl5
 PKGNAMEPREFIX=	p5-
 DISTFILES=
@@ -14,17 +14,15 @@ DISTFILES=
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Additional russian encodings for XML::Parser
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${SITE_PERL}/XML/Encoding.pm:${PORTSDIR}/textproc/p5-XML-Encoding \
 		${NONEXISTENT}:${PORTSDIR}/converters/iconv:extract \
 		${NONEXISTENT}:${PORTSDIR}/converters/iconv-extra:extract
 
-BROKEN=		bad plist
-
 NO_WRKSUBDIR=	YES
 USE_PERL5=	YES
-RUSSIANENC=	windows-1251 koi8-r cp1251 cp866 mac-cyrillic
+RUSSIANENC=	cp1251 cp866 mac-cyrillic
 
 post-extract:
 .for ICONVPORT in iconv iconv-extra
@@ -34,21 +32,17 @@ post-extract:
 .endfor
 
 do-configure:
-.for ENC in koi8-r cp866
-	@${CP} ${WRKSRC}/iconv/${ENC}.txt ${WRKDIR}
-.endfor
-.for ENC in mac-cyrillic windows-1251
-	@${CP} ${WRKSRC}/iconv-extra/${ENC}.txt ${WRKDIR}
-.endfor
-	@${CP} ${WRKDIR}/windows-1251.txt ${WRKDIR}/cp1251.txt
+	@${CP} ${WRKSRC}/iconv/cp866.txt ${WRKDIR}
+	@${CP} ${WRKSRC}/iconv-extra/windows-1251.txt ${WRKDIR}/cp1251.txt
+	@${CP} ${WRKSRC}/iconv-extra/mac-cyrillic.txt ${WRKDIR}
 	@${PERL} -pi -e 's/\r/\n/gm;' ${WRKDIR}/mac-cyrillic.txt
 
 do-build:
 .for ENC in ${RUSSIANENC}
-	@${PREFIX}/bin/make_encmap ${ENC} ${WRKDIR}/${ENC}.txt | \
+	@${LOCALBASE}/bin/make_encmap ${ENC} ${WRKDIR}/${ENC}.txt | \
 	${PERL} -pi -e "s/(?<=^<encmap name='${ENC}')()(?=>)/ expat='yes'/;" \
 		>${WRKDIR}/${ENC}.xml
-	@${PREFIX}/bin/compile_encoding \
+	@${LOCALBASE}/bin/compile_encoding \
 		-o ${WRKDIR}/${ENC}.enc ${WRKDIR}/${ENC}.xml
 .endfor
 
diff --git a/russian/p5-XML-Parser-encodings/pkg-plist b/russian/p5-XML-Parser-encodings/pkg-plist
index 2b5d3bfc40b7..46d549c1ef4e 100644
--- a/russian/p5-XML-Parser-encodings/pkg-plist
+++ b/russian/p5-XML-Parser-encodings/pkg-plist
@@ -1,8 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp1251.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/cp866.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
-- 
cgit