12 files changed, 23 insertions, 34 deletions

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 614201e811ac..14873c206ae8 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	${MECAB_PORTNAME}
 PORTVERSION=	${MECAB_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	japanese textproc
-MASTER_SITES=	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/src/ \
-		http://chasen.aist-nara.ac.jp/stable/ipadic/:ipadic
+MASTER_SITES=	http://chasen.org/~taku/software/mecab/src/ \
+		http://chasen.naist.jp/stable/ipadic/:ipadic
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${IPADIC_DISTNAME}${EXTRACT_SUFX}:ipadic
 
@@ -19,10 +18,9 @@ COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
 IPADIC_DISTNAME=	ipadic-2.5.1
 
-USE_PERL5_BUILD=	yes
 USE_REINPLACE=		yes
 
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
@@ -36,8 +34,8 @@ DOCS=		AUTHORS README doc/*.html doc/*.css
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+.if ${ARCH} == "sparc64"
+BROKEN=		"Does not compile on sparc64"
 .endif
 
 post-extract:
diff --git a/japanese/mecab/Makefile.common b/japanese/mecab/Makefile.common
index 55daf40d501c..1c486bb097a0 100644
--- a/japanese/mecab/Makefile.common
+++ b/japanese/mecab/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 MECAB_PORTNAME=		mecab
-MECAB_PORTVERSION=	0.76
+MECAB_PORTVERSION=	0.81
 
 MECAB_PORTDIR=		${PORTSDIR}/japanese/${MECAB_PORTNAME}
 MECAB_WRKSRC_CMD=	cd ${MECAB_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/japanese/mecab/distinfo b/japanese/mecab/distinfo
index 74e127b1132d..30f83cca9c40 100644
--- a/japanese/mecab/distinfo
+++ b/japanese/mecab/distinfo
@@ -1,4 +1,4 @@
-MD5 (mecab-0.76.tar.gz) = c312f2e218f6857dc487662c379d0f6e
-SIZE (mecab-0.76.tar.gz) = 322061
+MD5 (mecab-0.81.tar.gz) = c38a9b4551abc623d7f13d7e5a5d668e
+SIZE (mecab-0.81.tar.gz) = 358596
 MD5 (ipadic-2.5.1.tar.gz) = 18c37ad9d02aa79e9f9ce752ee4ecea6
 SIZE (ipadic-2.5.1.tar.gz) = 4212891
diff --git a/japanese/mecab/pkg-descr b/japanese/mecab/pkg-descr
index 696ab07d1555..b827eb9abc99 100644
--- a/japanese/mecab/pkg-descr
+++ b/japanese/mecab/pkg-descr
@@ -1,4 +1,4 @@
 MeCab: Yet Another Part-of-Speech and Morphological Analyzer
 
 Author:	Taku Kudoh <taku-ku@is.aist-nara.ac.jp>
-WWW:	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/
+WWW:	http://chasen.org/~taku/software/mecab/
diff --git a/japanese/mecab/pkg-plist b/japanese/mecab/pkg-plist
index 3661ca38a85b..1c6cb9cd3a4f 100644
--- a/japanese/mecab/pkg-plist
+++ b/japanese/mecab/pkg-plist
@@ -17,6 +17,7 @@ lib/mecab/dic/ipadic/token.me
 @dirrm lib/mecab/dic/ipadic
 @dirrm lib/mecab/dic
 @dirrm lib/mecab
+%%PORTDOCS%%%%EXAMPLESDIR%%/a.out
 %%PORTDOCS%%%%EXAMPLESDIR%%/example-thread.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/example-thread2.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/example-win32-dll.c
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index 42f94d0de151..320df638c418 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	MeCab
 PORTVERSION=	${MECAB_PORTVERSION}
 CATEGORIES=	japanese textproc perl5
-MASTER_SITES=	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/bindings/
+MASTER_SITES=	http://chasen.org/~taku/software/mecab/bindings/
 DISTNAME=	${PORTNAME:L}-perl-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
@@ -16,8 +16,6 @@ COMMENT=	MeCab library module for Perl5
 
 LIB_DEPENDS=	mecab.0:${MECAB_PORTDIR}
 
-BROKEN=		Unfetchable
-
 PERL_CONFIGURE=	yes
 
 .include "${.CURDIR}/../mecab/Makefile.common"
diff --git a/japanese/p5-MeCab/distinfo b/japanese/p5-MeCab/distinfo
index f149c037bdad..fd765dee8283 100644
--- a/japanese/p5-MeCab/distinfo
+++ b/japanese/p5-MeCab/distinfo
@@ -1,2 +1,2 @@
-MD5 (mecab-perl-0.76.tar.gz) = 3517d8d3d5a744d365c7c6dd7e0c8184
-SIZE (mecab-perl-0.76.tar.gz) = 15466
+MD5 (mecab-perl-0.81.tar.gz) = 0f0d1301b924b0f1c99dd3ed305c4112
+SIZE (mecab-perl-0.81.tar.gz) = 17319
diff --git a/japanese/p5-MeCab/pkg-descr b/japanese/p5-MeCab/pkg-descr
index 79459fd39384..432e3097c995 100644
--- a/japanese/p5-MeCab/pkg-descr
+++ b/japanese/p5-MeCab/pkg-descr
@@ -5,4 +5,4 @@ since mecab is linked with libc_r but perl is with libc, which
 conflict causes memory fault.
 
 Author:	Taku Kudoh <taku-ku@is.aist-nara.ac.jp>
-WWW:	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/
+WWW:	http://chasen.org/~taku/software/mecab/
diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index 7d38a2032c11..1e3272ecc166 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	${MECAB_PORTNAME}
 PORTVERSION=	${MECAB_PORTVERSION}
 CATEGORIES=	japanese textproc ruby
-MASTER_SITES=	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/bindings/
+MASTER_SITES=	http://chasen.org/~taku/software/mecab/bindings/
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
diff --git a/japanese/ruby-mecab/distinfo b/japanese/ruby-mecab/distinfo
index c3bc9fdd38b3..50f6e9e53721 100644
--- a/japanese/ruby-mecab/distinfo
+++ b/japanese/ruby-mecab/distinfo
@@ -1,2 +1,2 @@
-MD5 (mecab-ruby-0.76.tar.gz) = 8e454b10ec25f761b603917b7cdf9ced
-SIZE (mecab-ruby-0.76.tar.gz) = 18759
+MD5 (mecab-ruby-0.81.tar.gz) = 466575b190531260ae3a39d736ceb8bf
+SIZE (mecab-ruby-0.81.tar.gz) = 15339
diff --git a/japanese/ruby-mecab/files/patch-extconf.rb b/japanese/ruby-mecab/files/patch-extconf.rb
index 12da6565191b..8a9f781b3c4c 100644
--- a/japanese/ruby-mecab/files/patch-extconf.rb
+++ b/japanese/ruby-mecab/files/patch-extconf.rb
@@ -1,19 +1,11 @@
---- extconf.rb.orig	Fri Dec 12 09:36:59 2003
-+++ extconf.rb	Fri Dec 12 09:45:19 2003
-@@ -1,12 +1,12 @@
- require 'mkmf'
- 
--mecab_config = with_config ('mecab-config', 'mecab-config')
-+mecab_config = with_config('mecab-config', 'mecab-config')
+--- extconf.rb.orig	Sun Mar 20 22:19:10 2005
++++ extconf.rb	Mon May  2 02:03:15 2005
+@@ -3,7 +3,7 @@
+ mecab_config = with_config('mecab-config', 'mecab-config')
  use_mecab_config = enable_config('mecab-config')
  
 -`mecab-config --libs-only-l`.chomp.split.each { | lib |
--  have_library (lib)
 +`#{mecab_config} --libs-only-l`.chomp.split.each{ | lib |
-+  have_library(lib)
+   have_library(lib)
  }
  
- $CFLAGS += ' ' + `#{mecab_config} --cflags`.chomp
- 
--have_header ('mecab.h') && create_makefile('MeCab')
-+have_header('mecab.h') && create_makefile('MeCab')
diff --git a/japanese/ruby-mecab/pkg-descr b/japanese/ruby-mecab/pkg-descr
index fd7f9c91d361..bde325deaeb8 100644
--- a/japanese/ruby-mecab/pkg-descr
+++ b/japanese/ruby-mecab/pkg-descr
@@ -1,4 +1,4 @@
 This is the MeCab library module for Ruby.
 
 Author:	Taku Kudoh <taku-ku@is.aist-nara.ac.jp>
-WWW:	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/
+WWW:	http://chasen.org/~taku/software/mecab/