- Update to 2.55

PR:		ports/182095
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@>

3 files changed, 28 insertions, 32 deletions

diff --git a/converters/p5-Encode/Makefile b/converters/p5-Encode/Makefile
index 54e840f51069..e7b84aea7853 100644
--- a/converters/p5-Encode/Makefile
+++ b/converters/p5-Encode/Makefile
@@ -1,9 +1,8 @@
-# Created by:	Rong-En Fan <rafan@infor.org>
-#
+# Created by: Rong-En Fan <rafan@infor.org>
 # $FreeBSD$
 
 PORTNAME=	Encode
-PORTVERSION=	2.49
+PORTVERSION=	2.55
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DANKOGAI
@@ -15,8 +14,8 @@ COMMENT=	Provides interfaces between strings and the rest of the system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-USES=	perl5
-USE_PERL5=	patch configure
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Encode.3 \
 		Encode::Alias.3 \
@@ -38,11 +37,7 @@ MAN3=		Encode.3 \
 		encoding.3
 
 post-patch:
-	${PERL} -pi -e '$$_="" if $$.>=24 && $$.<=26; $$_="my \@exe_files=();\n" if $$.==25' ${WRKSRC}/Makefile.PL
-
-post-configure:
-	@${FIND} ${WRKSRC}/ -name Makefile -exec \
-		${REINPLACE_CMD} -e 's,^CC =,CC ?=,' {} \;
+	@${REINPLACE_CMD} -e 's|bin/enc2xs||; s|bin/piconv||' ${WRKSRC}/Makefile.PL
 
 regression-test:
 	cd ${WRKSRC} && ${MAKE} test
diff --git a/converters/p5-Encode/distinfo b/converters/p5-Encode/distinfo
index ec01d8993746..b6b0a94ddc64 100644
--- a/converters/p5-Encode/distinfo
+++ b/converters/p5-Encode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Encode-2.49.tar.gz) = 73fd2c8d1f71bb3c47bdf7f9528befb336174d1579ffada32fde6461c0b1e239
-SIZE (Encode-2.49.tar.gz) = 2004160
+SHA256 (Encode-2.55.tar.gz) = 3f2b2d989885f5c565dc6aed7345ee58d7d65c4fcf9bff0831930c00ac72f62e
+SIZE (Encode-2.55.tar.gz) = 2009082
diff --git a/converters/p5-Encode/pkg-plist b/converters/p5-Encode/pkg-plist
index 0deea9966483..ad2b1e641425 100644
--- a/converters/p5-Encode/pkg-plist
+++ b/converters/p5-Encode/pkg-plist
@@ -1,23 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/encoding.pm
+@comment $FreeBSD$
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Alias.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Byte.pm
@@ -51,6 +32,26 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/_PM.e2x
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/_T.e2x
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/encode.h
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte/Byte.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN/CN.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC/EBCDIC.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Encode.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP/JP.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR/KR.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol/Symbol.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW/TW.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode/Unicode.so
+%%SITE_PERL%%/%%PERL_ARCH%%/encoding.pm
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol