5 files changed, 28 insertions, 34 deletions

diff --git a/chinese/p5-Encode-HanConvert/Makefile b/chinese/p5-Encode-HanConvert/Makefile
index 5f6fc0f7a605..991a0190a295 100644
--- a/chinese/p5-Encode-HanConvert/Makefile
+++ b/chinese/p5-Encode-HanConvert/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	Encode-HanConvert
-PORTVERSION=	0.26
-CATEGORIES=	chinese
+PORTVERSION=	0.28
+CATEGORIES=	chinese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	LWP/AUTRIJUS
+MASTER_SITE_SUBDIR=	Encode
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	statue@freebsd.sinica.edu.tw
@@ -17,8 +17,16 @@ COMMENT=	Traditional and Simplified Chinese mappings
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN1=		b2g.pl.1 g2b.pl.1
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
 MAN3=		Encode::HanConvert.3 Encode::HanConvert::Perl.3
+PLIST_SUB+=	OLD="" NEW="@comment "
+.else
+PLIST_SUB+=	NEW="" OLD="@comment "
+.endif
+
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/chinese/p5-Encode-HanConvert/distinfo b/chinese/p5-Encode-HanConvert/distinfo
index ab6366261475..3056250678e2 100644
--- a/chinese/p5-Encode-HanConvert/distinfo
+++ b/chinese/p5-Encode-HanConvert/distinfo
@@ -1 +1 @@
-MD5 (Encode-HanConvert-0.26.tar.gz) = c4d3adf8895cfdedba8e6adec9a5bc99
+MD5 (Encode-HanConvert-0.28.tar.gz) = 88e27506a5a5b29612bdfb0d9c61be7e
diff --git a/chinese/p5-Encode-HanConvert/files/patch-lib::Encode::HanConvert.pm b/chinese/p5-Encode-HanConvert/files/patch-lib::Encode::HanConvert.pm
deleted file mode 100644
index 9cb715e4fe5c..000000000000
--- a/chinese/p5-Encode-HanConvert/files/patch-lib::Encode::HanConvert.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/Encode/HanConvert.pm.orig	Wed May 28 04:45:44 2003
-+++ lib/Encode/HanConvert.pm	Wed May 28 04:46:39 2003
-@@ -111,8 +111,6 @@
- 
- __END__
- 
--=for encoding big5
--
- =head1 NAME
- 
- Encode::HanConvert - Traditional and Simplified Chinese mappings
-@@ -204,6 +202,8 @@
-     print BIG5, <EUC>;
- 
- Or, more interestingly:
-+
-+=for encoding big5
- 
-     use encoding 'big5-simp';
-     print "¤¤¤å"; # prints simplified Chinese in unicode
diff --git a/chinese/p5-Encode-HanConvert/pkg-descr b/chinese/p5-Encode-HanConvert/pkg-descr
index 138c7143d9dc..311a7be98422 100644
--- a/chinese/p5-Encode-HanConvert/pkg-descr
+++ b/chinese/p5-Encode-HanConvert/pkg-descr
@@ -11,4 +11,4 @@ The module exports various xxx_to_yyy functions by default, where
 xxx and yyy are one of big5, gb (i.e. GBK/CP936), simp (simplified
 Chinese unicode), or trad (traditional Chinese unicode).
 
-WWW: http://search.cpan.org/search?dist=Encode-HanConvert
+WWW: http://search.cpan.org/dist/Encode-HanConvert/
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index 7d02c66c83f7..1cd13f83b8b7 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -1,11 +1,17 @@
 bin/b2g.pl
 bin/g2b.pl
-%%SITE_PERL%%/Encode/HanConvert.pm
-%%SITE_PERL%%/Encode/HanConvert.pm.orig
-%%SITE_PERL%%/Encode/HanConvert/Perl.pm
-%%SITE_PERL%%/Encode/HanConvert/Perl.pm-orig
+%%OLD%%%%SITE_PERL%%/Encode/HanConvert.pm
+%%OLD%%%%SITE_PERL%%/Encode/HanConvert/Perl.pm
+%%OLD%%%%SITE_PERL%%/Encode/HanConvert/Perl.pm-orig
+%%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert.pm
+%%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm
+%%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm-orig
+%%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/HanConvert.bs
+%%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/HanConvert.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert
-@dirrm %%SITE_PERL%%/Encode/HanConvert
-@dirrm %%SITE_PERL%%/Encode
-@dirrm %%SITE_PERL%%/auto/Encode
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
+%%OLD%%@dirrm %%SITE_PERL%%/Encode/HanConvert
+%%OLD%%@unexec rmdir %D/%%SITE_PERL%%/Encode 2>/dev/null || true
+%%NEW%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert
+%%NEW%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode 2>/dev/null || true