diff options
| author | mat <mat@FreeBSD.org> | 2015-04-25 01:43:33 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-04-25 01:43:33 +0800 |
| commit | f6d62783c84d74b7def4a04ff383510982852afe (patch) | |
| tree | 51ae6a01848b8b065c1607a42b738241b8a79927 | |
| parent | 9353ee3bb997b861a50660a290e5e93e965a1f6c (diff) | |
| download | freebsd-ports-gnome-f6d62783c84d74b7def4a04ff383510982852afe.tar.gz freebsd-ports-gnome-f6d62783c84d74b7def4a04ff383510982852afe.tar.zst freebsd-ports-gnome-f6d62783c84d74b7def4a04ff383510982852afe.zip | |
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
| -rw-r--r-- | japanese/p5-Text-MeCab/Makefile | 7 | ||||
| -rw-r--r-- | japanese/p5-Text-MeCab/files/patch-inc_Module_Install_Makefile.pm (renamed from japanese/p5-Text-MeCab/files/patch-Makefile.pm) | 0 | ||||
| -rw-r--r-- | japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm | 11 | ||||
| -rw-r--r-- | japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl | 11 |
4 files changed, 22 insertions, 7 deletions
diff --git a/japanese/p5-Text-MeCab/Makefile b/japanese/p5-Text-MeCab/Makefile index f00102e98e3a..3165745eb7c8 100644 --- a/japanese/p5-Text-MeCab/Makefile +++ b/japanese/p5-Text-MeCab/Makefile @@ -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> diff --git a/japanese/p5-Text-MeCab/files/patch-Makefile.pm b/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_Makefile.pm index 9d1e9c8cc5b6..9d1e9c8cc5b6 100644 --- a/japanese/p5-Text-MeCab/files/patch-Makefile.pm +++ b/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_Makefile.pm diff --git a/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm b/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm new file mode 100644 index 000000000000..2f23525a5dd2 --- /dev/null +++ b/japanese/p5-Text-MeCab/files/patch-inc_Module_Install_XSUtil.pm @@ -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; diff --git a/japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl b/japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl new file mode 100644 index 000000000000..678f9f8f2ca6 --- /dev/null +++ b/japanese/p5-Text-MeCab/files/patch-tools_probe__mecab.pl @@ -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; |