- Update to 2.03.

- Since 2.x, Jcode is the wrapper of Encode module with perl-5.8.1
  and after.

4 files changed, 27 insertions, 38 deletions

diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 79aa4d03825d..6363a7226886 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Jcode
-PORTVERSION=	0.88
+PORTVERSION=	2.03
 CATEGORIES=	japanese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DANKOGAI
@@ -15,22 +15,20 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension interface to convert Japanese text
 
 PERL_CONFIGURE=	yes
-MAN3=		Jcode.3 Jcode::Unicode.3 Jcode::Unicode::Constants.3 \
-		Jcode::Unicode::NoXS.3
-
-post-configure:
-.for DIR in Unicode
-	${PERL} -pi -e "s:CCFLAGS = :CCFLAGS = ${CFLAGS} :g ; \
-			s:CC = cc:CC = ${CC}:g" ${WRKSRC}/${DIR}/Makefile
-.endfor
+MAN3=		Jcode.3 Jcode::Nihongo.3
 
 .include <bsd.port.pre.mk>
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
 
-.if ${PERL_LEVEL} < 500804
+.if ${PERL_LEVEL} < 500801
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+MAN3+=		Jcode::Unicode.3 Jcode::Unicode::Constants.3 \
+		Jcode::Unicode::NoXS.3
+PLIST_SUB=	WRAPPER="@comment " REALMOD=""
+.else
+PLIST_SUB=	WRAPPER="" REALMOD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/p5-Jcode/distinfo b/japanese/p5-Jcode/distinfo
index 9cecbe8f45d0..f801ce547d0f 100644
--- a/japanese/p5-Jcode/distinfo
+++ b/japanese/p5-Jcode/distinfo
@@ -1,2 +1,2 @@
-MD5 (Jcode-0.88.tar.gz) = 49d4c96b209d3e7feed25b4847ec8fb1
-SIZE (Jcode-0.88.tar.gz) = 233586
+MD5 (Jcode-2.03.tar.gz) = 8d285ebf5e5d4f60938829a2c11bdef6
+SIZE (Jcode-2.03.tar.gz) = 334975
diff --git a/japanese/p5-Jcode/files/patch-Jcode.pm b/japanese/p5-Jcode/files/patch-Jcode.pm
deleted file mode 100644
index 7495f388acfa..000000000000
--- a/japanese/p5-Jcode/files/patch-Jcode.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- Jcode.pm.orig	Mon Mar 29 20:49:24 2004
-+++ Jcode.pm	Mon Mar 29 20:50:01 2004
-@@ -198,7 +198,7 @@
- folds lines in jcode string every $bytes_per_line (default: 72) 
- in a way that does not clobber the multibyte string.
- (Sorry, no Kinsoku done!)
--with a newline string spified by $newline_str (default: \n).  
-+with a newline string specified by $newline_str (default: \n).  
- 
- =back
- 
diff --git a/japanese/p5-Jcode/pkg-plist b/japanese/p5-Jcode/pkg-plist
index e37c3724965c..34d9641de759 100644
--- a/japanese/p5-Jcode/pkg-plist
+++ b/japanese/p5-Jcode/pkg-plist
@@ -1,17 +1,19 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/H2Z.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Tr.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/Constants.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/NoXS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/_test.pl
+%%WRAPPER%%%%SITE_PERL%%/Jcode.pm
+%%WRAPPER%%%%SITE_PERL%%/Jcode/Nihongo.pod
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Constants.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/H2Z.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Nihongo.pod
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Tr.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/Constants.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode/NoXS.pm
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/Jcode/_Classic.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.so
-%%SITE_PERL%%/%%PERL_ARCH%%/mac_install.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/win_install.pl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.bs
+%%REALMOD%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode/Unicode.so
+%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode/Unicode
+%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Jcode
+%%REALMOD%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode/Unicode
+%%WRAPPER%%@dirrm %%SITE_PERL%%/Jcode
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jcode