5 files changed, 51 insertions, 24 deletions

diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile
index 49a6d98d4815..9a1bb7730d98 100644
--- a/japanese/p5-Text-MeCab/Makefile
+++ b/japanese/p5-Text-MeCab/Makefile
@@ -6,13 +6,20 @@
 #
 
 PORTNAME=		Text-MeCab
-PORTVERSION=		0.20007
+PORTVERSION=		0.20009
 CATEGORIES=		japanese textproc perl5
 MASTER_SITES=		CPAN
 
 MAINTAINER=		fmysh@iijmio-mail.jp
 COMMENT=		Alternate Interface To libmecab
 
+BUILD_DEPENDS=		p5-Devel-PPPort>=3.19:${PORTSDIR}/devel/p5-Devel-PPPort \
+			p5-ExtUtils-ParseXS>=2.21:${PORTSDIR}/devel/p5-ExtUtils-ParseXS \
+			p5-Test-Simple>=0.84:${PORTSDIR}/devel/p5-Test-Simple \
+			p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+RUN_DEPENDS=		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
+			p5-Encode>0:${PORTSDIR}/converters/p5-Encode\
+			p5-XSLoader>0.1:${PORTSDIR}/devel/p5-XSLoader
 LIB_DEPENDS=		mecab.1:${PORTSDIR}/japanese/mecab
 
 MAN3=			Text::MeCab.3 \
@@ -23,12 +30,16 @@ PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	</dev/null
 
 # dictionary encoding (euc-jp, shift_jis, utf-8)
-ENCODING?=	utf-8
+ENCODING?=	euc-jp
 
 post-patch:
-	@${REINPLACE_CMD} -e "/default_encoding = /s/utf-8/${ENCODING}/" \
+	@${REINPLACE_CMD} -e "/default_encoding = /s/euc-jp/${ENCODING}/" \
 		${WRKSRC}/tools/probe_mecab.pl
 
+post-configure:
+	@${REINPLACE_CMD} -e "/^LD = /s/cc/cc -pthread/" \
+		${WRKSRC}/Makefile
+
 .include <bsd.port.pre.mk>
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
diff --git a/japanese/p5-Text-MeCab/distinfo b/japanese/p5-Text-MeCab/distinfo
index e36904fa05e8..b64d2999f80c 100644
--- a/japanese/p5-Text-MeCab/distinfo
+++ b/japanese/p5-Text-MeCab/distinfo
@@ -1,3 +1,3 @@
-MD5 (Text-MeCab-0.20007.tar.gz) = 69c4ddab7866f45c5813359bffbbbaa3
-SHA256 (Text-MeCab-0.20007.tar.gz) = f2d0b25bb3016305b769da20ad545de5b9b86892f6eb9c3a23fabab53e8b4143
-SIZE (Text-MeCab-0.20007.tar.gz) = 62275
+MD5 (Text-MeCab-0.20009.tar.gz) = 65de56666e8315c948609b12a2bc79e0
+SHA256 (Text-MeCab-0.20009.tar.gz) = bbf43d8bacf3de98d0efc2005176247957b8c2e3651a5bbd99be079ad1e38336
+SIZE (Text-MeCab-0.20009.tar.gz) = 86542
diff --git a/japanese/p5-Text-MeCab/files/patch-Makefile.PL b/japanese/p5-Text-MeCab/files/patch-Makefile.PL
index d24e73596662..f0805916ccc4 100644
--- a/japanese/p5-Text-MeCab/files/patch-Makefile.PL
+++ b/japanese/p5-Text-MeCab/files/patch-Makefile.PL
@@ -1,19 +1,12 @@
---- Makefile.PL.orig	2008-03-08 20:51:04.000000000 +0900
-+++ Makefile.PL	2008-03-13 05:47:28.000000000 +0900
-@@ -129,7 +129,6 @@
+--- Makefile.PL.orig	2010-05-19 09:21:41.000000000 +0900
++++ Makefile.PL	2010-07-03 02:52:50.694347458 +0900
+@@ -5,8 +5,8 @@
+ my $RUNNING_IN_HELL = $^O eq 'MSWin32';
  
+ my $config = run_probes();
+-check_lib($config);
+ define_symbols($config);
++push(@{ $config->{define} }, $config->{cflags});
+ extract_constants($config);
  
-     my $config = run_probes();
--    check_lib($config);
-     define_symbols($config);
-     extract_constants($config);
- 
-@@ -137,7 +136,7 @@
-     my %INFO = (
-         ABSTRACT     => 'Alternative Interface To libmecab',
-         AUTHOR       => 'Daisuke Maki <daisuke@endeworks.jp>',
--        CCFLAGS      => $config->{cflags},
-+        INC          => $config->{cflags},
-         DEFINE       => join( " ", @{ $config->{define} } ),
-         DISTNAME     => 'Text-MeCab',
-         INSTALLDIRS  => 'site',
+ name 'Text-MeCab';
diff --git a/japanese/p5-Text-MeCab/files/patch-Makefile.pm b/japanese/p5-Text-MeCab/files/patch-Makefile.pm
new file mode 100644
index 000000000000..9d1e9c8cc5b6
--- /dev/null
+++ b/japanese/p5-Text-MeCab/files/patch-Makefile.pm
@@ -0,0 +1,24 @@
+--- inc/Module/Install/Makefile.pm.orig	2010-07-09 05:30:37.888238012 +0900
++++ inc/Module/Install/Makefile.pm	2010-07-09 05:31:07.586884004 +0900
+@@ -213,21 +213,6 @@
+ 	# Make sure we have a new enough MakeMaker
+ 	require ExtUtils::MakeMaker;
+ 
+-	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
+-		# MakeMaker can complain about module versions that include
+-		# an underscore, even though its own version may contain one!
+-		# Hence the funny regexp to get rid of it.  See RT #35800
+-		# for details.
+-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+-		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
+-		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+-	} else {
+-		# Allow legacy-compatibility with 5.005 by depending on the
+-		# most recent EU:MM that supported 5.005.
+-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
+-		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+-	}
+-
+ 	# Generate the MakeMaker params
+ 	my $args = $self->makemaker_args;
+ 	$args->{DISTNAME} = $self->name;
diff --git a/japanese/p5-Text-MeCab/pkg-plist b/japanese/p5-Text-MeCab/pkg-plist
index 22337d1b74f4..1d630e786925 100644
--- a/japanese/p5-Text-MeCab/pkg-plist
+++ b/japanese/p5-Text-MeCab/pkg-plist
@@ -1,5 +1,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab.xs
 %%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab/Dict.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Text/MeCab/Node.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MeCab/.packlist