svn commit: r384670 - in head/japanese/p5-Text-MeCab: . files

[Mathieu Arnold]

Author: mat
Date: Fri Apr 24 17:43:33 2015
New Revision: 384670
URL: https://svnweb.freebsd.org/changeset/ports/384670

Log:
  Fix build with Perl 5.18+
  
     qw(...) can no longer be used as parentheses
  
  Also, rename a patch to stick to our naming scheme.
  
  Sponsored by:	Absolight

Added:
  head/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_Makefile.pm
     - copied unchanged from r384650, head/japanese/p5-Text-MeCab/files/patch-Makefile.pm
  head/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm   (contents, props changed)
  head/japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl   (contents, props changed)
Deleted:
  head/japanese/p5-Text-MeCab/files/patch-Makefile.pm
Modified:
  head/japanese/p5-Text-MeCab/Makefile

Modified: head/japanese/p5-Text-MeCab/Makefile
==============================================================================
--- head/japanese/p5-Text-MeCab/Makefile	Fri Apr 24 17:27:29 2015	(r384669)
+++ head/japanese/p5-Text-MeCab/Makefile	Fri Apr 24 17:43:33 2015	(r384670)
@@ -25,9 +25,6 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ARGS=	</dev/null
 
-DEPRECATED=	Does not work with 5.18 or above
-EXPIRATION_DATE=2015-07-31
-
 # dictionary encoding (euc-jp, shift_jis, utf-8)
 ENCODING?=	euc-jp
 
@@ -43,8 +40,4 @@ post-configure:
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
 
-.if ${PERL_VER} >= 5.18
-BROKEN=		Does not build with Perl 5.18 or above
-.endif
-
 .include <bsd.port.post.mk>

Copied: head/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_Makefile.pm (from r384650, head/japanese/p5-Text-MeCab/files/patch-Makefile.pm)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_Makefile.pm	Fri Apr 24 17:43:33 2015	(r384670, copy of r384650, head/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;

Added: head/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm	Fri Apr 24 17:43:33 2015	(r384670)
@@ -0,0 +1,11 @@
+--- inc/Module/Install/XSUtil.pm.orig	2015-04-24 17:35:21 UTC
++++ inc/Module/Install/XSUtil.pm
+@@ -242,7 +242,7 @@ sub cc_assert_lib {
+ 
+     if ( ! $self->{xsu_loaded_checklib} ) {
+         my $loaded_lib = 0;
+-        foreach my $checklib qw(inc::Devel::CheckLib Devel::CheckLib) {
++        foreach my $checklib ( qw(inc::Devel::CheckLib Devel::CheckLib) ) {
+             eval "use $checklib 0.4";
+             if (!$@) {
+                 $loaded_lib = 1;

Added: head/japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl	Fri Apr 24 17:43:33 2015	(r384670)
@@ -0,0 +1,11 @@
+--- tools/probe_mecab.pl.orig	2015-04-24 17:31:37 UTC
++++ tools/probe_mecab.pl
+@@ -43,7 +43,7 @@ if ($^O eq 'MSWin32') {
+ } else {
+     # try probing in places where we expect it to be
+     my $default_config;
+-    foreach my $path qw(/usr/bin /usr/local/bin /opt/local/bin) {
++    foreach my $path ( qw(/usr/bin /usr/local/bin /opt/local/bin) ) {
+         my $tmp = File::Spec->catfile($path, 'mecab-config');
+         if (-f $tmp && -x _) {
+             $default_config = $tmp;