Update to 0.76. Pthread is not required any longer.

9 files changed, 22 insertions, 26 deletions

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 546ff68b70d5..8cd6eb097a8a 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -20,7 +20,7 @@ IPADIC_PORTDIR=	${PORTSDIR}/japanese/ipadic
 
 USE_PERL5_BUILD=	yes
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/japanese/mecab/Makefile.common b/japanese/mecab/Makefile.common
index 378eade3487c..55daf40d501c 100644
--- a/japanese/mecab/Makefile.common
+++ b/japanese/mecab/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 MECAB_PORTNAME=		mecab
-MECAB_PORTVERSION=	0.75
+MECAB_PORTVERSION=	0.76
 
 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 19b24cdbaa67..a32c2013b0ff 100644
--- a/japanese/mecab/distinfo
+++ b/japanese/mecab/distinfo
@@ -1 +1 @@
-MD5 (mecab-0.75.tar.gz) = 8917b1dfdaa2940d5020d9d570ed9fe2
+MD5 (mecab-0.76.tar.gz) = c312f2e218f6857dc487662c379d0f6e
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index d45aa84748ff..c49b977c139e 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -8,13 +8,12 @@
 PORTNAME=	MeCab
 PORTVERSION=	${MECAB_PORTVERSION}
 CATEGORIES=	japanese textproc perl5
-MASTER_SITES=	# none
-DISTFILES=	# none
+MASTER_SITES=	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/bindings/
+DISTNAME=	${PORTNAME:L}-perl-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	MeCab library module for Perl5
 
-EXTRACT_DEPENDS=	${NONEXISTENT}:${MECAB_PORTDIR}:patch
 LIB_DEPENDS=	mecab.0:${MECAB_PORTDIR}
 
 PERL_CONFIGURE=	yes
@@ -25,10 +24,6 @@ PERL_CONFIGURE=	yes
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
 
-do-extract:
-	${MKDIR} ${WRKDIR}
-	${LN} -fs `${MECAB_WRKSRC_CMD}`/perl ${WRKSRC}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/examples/mecab
diff --git a/japanese/p5-MeCab/distinfo b/japanese/p5-MeCab/distinfo
new file mode 100644
index 000000000000..aea5829599ef
--- /dev/null
+++ b/japanese/p5-MeCab/distinfo
@@ -0,0 +1 @@
+MD5 (mecab-perl-0.76.tar.gz) = 3517d8d3d5a744d365c7c6dd7e0c8184
diff --git a/japanese/p5-MeCab/pkg-plist b/japanese/p5-MeCab/pkg-plist
index 362a722409e4..c7c49ae34e2f 100644
--- a/japanese/p5-MeCab/pkg-plist
+++ b/japanese/p5-MeCab/pkg-plist
@@ -1,6 +1,6 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/MeCab.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MeCab/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MeCab/MeCab.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MeCab/MeCab.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/MeCab
+%%SITE_PERL%%/%%PERL_ARCH%%/MeCab.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/MeCab.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab/MeCab.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MeCab
 %%PORTDOCS%%share/examples/mecab/test.pl
diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index e1ae788669fb..7d38a2032c11 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -8,18 +8,16 @@
 PORTNAME=	${MECAB_PORTNAME}
 PORTVERSION=	${MECAB_PORTVERSION}
 CATEGORIES=	japanese textproc ruby
-MASTER_SITES=	# none
-DISTFILES=	# none
+MASTER_SITES=	http://cl.aist-nara.ac.jp/~taku-ku/software/mecab/bindings/
+DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	MeCab library module for Ruby
 
-EXTRACT_DEPENDS=	${NONEXISTENT}:${MECAB_PORTDIR}:patch
 LIB_DEPENDS=	mecab.0:${MECAB_PORTDIR}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-RUBY_WITH_PTHREAD=	yes
 
 INSTALL_TARGET=	site-install
 
@@ -29,14 +27,12 @@ INSTALL_TARGET=	site-install
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
-do-extract:
-	${MKDIR} ${WRKDIR}
-	${LN} -fs `${MECAB_WRKSRC_CMD}`/ruby ${WRKSRC}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/mecab
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${PREFIX}/share/examples/mecab/
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_MODEXAMPLESDIR}/
+	${MKDIR} ${RUBY_MODDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/bindings.html ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/ruby-mecab/distinfo b/japanese/ruby-mecab/distinfo
new file mode 100644
index 000000000000..f14c30095de1
--- /dev/null
+++ b/japanese/ruby-mecab/distinfo
@@ -0,0 +1 @@
+MD5 (mecab-ruby-0.76.tar.gz) = 8e454b10ec25f761b603917b7cdf9ced
diff --git a/japanese/ruby-mecab/pkg-plist b/japanese/ruby-mecab/pkg-plist
index 67daf7399869..74f2713a5c33 100644
--- a/japanese/ruby-mecab/pkg-plist
+++ b/japanese/ruby-mecab/pkg-plist
@@ -1,2 +1,5 @@
 %%RUBY_SITEARCHLIBDIR%%/MeCab.so
-%%PORTDOCS%%share/examples/mecab/test.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/bindings.html
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%