- Update to 0.91.

- Split ipadic into upcoming japanese/mecab-ipadic port.

PR:		ports/96887
Submitted by:	TAKATSU Tomonari <tota@rtfm.jp>

6 files changed, 31 insertions, 78 deletions

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 430cf8f6d7d0..007216b6a0dc 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -5,50 +5,30 @@
 # $FreeBSD$
 #
 
-PORTNAME=	${MECAB_PORTNAME}
-PORTVERSION=	${MECAB_PORTVERSION}
+PORTNAME=	mecab
+PORTVERSION=	0.91
 CATEGORIES=	japanese textproc
-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
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${SUB_DIR}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
-IPADIC_DISTNAME=	ipadic-2.5.1
+SUB_DIR=	20027
 
 USE_PERL5_BUILD=	yes
-USE_REINPLACE=		yes
-
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
 
-.include "${.CURDIR}/Makefile.common"
-
 MAN1=		mecab.1
 
-EXAMPLES=	example/*
-DOCS=		AUTHORS README doc/*.html doc/*.css
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		"Does not compile on sparc64"
-.endif
-
-post-extract:
-	${LN} -s ${WRKDIR}/${IPADIC_DISTNAME} ${WRKSRC}/dic/
+DOCS=		AUTHORS README doc/*.html
 
 post-install:
-	${RM} -f ${PREFIX}/lib/libmecab.la
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}/
-.endfor
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
@@ -59,4 +39,4 @@ post-patch:
 	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
 			 -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/mecab/Makefile.common b/japanese/mecab/Makefile.common
deleted file mode 100644
index 1c486bb097a0..000000000000
--- a/japanese/mecab/Makefile.common
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MECAB_PORTNAME=		mecab
-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 c27c7297ffbb..6e1b68039d30 100644
--- a/japanese/mecab/distinfo
+++ b/japanese/mecab/distinfo
@@ -1,6 +1,3 @@
-MD5 (mecab-0.81.tar.gz) = c38a9b4551abc623d7f13d7e5a5d668e
-SHA256 (mecab-0.81.tar.gz) = 0a6eb607f4fd0a69d47bd4b7a8def57e9a2924ce661ebb83db0e43612d71010c
-SIZE (mecab-0.81.tar.gz) = 358596
-MD5 (ipadic-2.5.1.tar.gz) = 18c37ad9d02aa79e9f9ce752ee4ecea6
-SHA256 (ipadic-2.5.1.tar.gz) = 0bff8ca355329dfc5f9587963cc6035144582764b4478a1d1319a4d582b2ebc2
-SIZE (ipadic-2.5.1.tar.gz) = 4212891
+MD5 (mecab-0.91.tar.gz) = 38775e8f0db0487a979e9704bba5b2d7
+SHA256 (mecab-0.91.tar.gz) = 12d5a3f4cbd3bb749ad9deb43f758b66c57f959a46d0a8b9f68eb211ee476f29
+SIZE (mecab-0.91.tar.gz) = 1060359
diff --git a/japanese/mecab/files/patch-ltmain.sh b/japanese/mecab/files/patch-ltmain.sh
deleted file mode 100644
index 66a3bfe5f002..000000000000
--- a/japanese/mecab/files/patch-ltmain.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- ltmain.sh.orig	Mon Oct 20 21:58:16 2003
-+++ ltmain.sh	Mon Oct 20 21:58:39 2003
-@@ -1075,7 +1075,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
diff --git a/japanese/mecab/pkg-descr b/japanese/mecab/pkg-descr
index b827eb9abc99..3a1fc3994d91 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://chasen.org/~taku/software/mecab/
+Author:	Taku Kudo <taku@chasen.org>
+WWW:	http://mecab.sourceforge.jp/
diff --git a/japanese/mecab/pkg-plist b/japanese/mecab/pkg-plist
index 1c6cb9cd3a4f..7b0fee07269d 100644
--- a/japanese/mecab/pkg-plist
+++ b/japanese/mecab/pkg-plist
@@ -1,36 +1,30 @@
+lib/libmecab.la
+lib/libmecab.so.1
+lib/libmecab.so
+lib/libmecab.a
 bin/mecab
 bin/mecab-config
-bin/mkmecabdic
-etc/mecabrc
 include/mecab.h
-lib/libmecab.a
-lib/libmecab.so
-lib/libmecab.so.0
-lib/mecab/dic/ipadic/connect.csv
-lib/mecab/dic/ipadic/da.me
-lib/mecab/dic/ipadic/dic.csv
-lib/mecab/dic/ipadic/dicrc
-lib/mecab/dic/ipadic/feature.me
-lib/mecab/dic/ipadic/info.me
-lib/mecab/dic/ipadic/matrix.me
-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
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/example2.cpp
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+libexec/mecab/Util.pm
+libexec/mecab/mecab-cost-train
+libexec/mecab/mecab-dict-gen
+libexec/mecab/mecab-dict-index
+libexec/mecab/mecab-dict-info
+libexec/mecab/mecab-system-eval
+libexec/mecab/mecab-test-gen
+libexec/mecab/mecab-tool
+etc/mecabrc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/bindings.html
+%%PORTDOCS%%%%DOCSDIR%%/dic-detail.html
 %%PORTDOCS%%%%DOCSDIR%%/dic.html
+%%PORTDOCS%%%%DOCSDIR%%/feature.html
 %%PORTDOCS%%%%DOCSDIR%%/format.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/learn.html
 %%PORTDOCS%%%%DOCSDIR%%/libmecab.html
-%%PORTDOCS%%%%DOCSDIR%%/mecab.css
 %%PORTDOCS%%%%DOCSDIR%%/mecab.html
+%%PORTDOCS%%%%DOCSDIR%%/soft.html
+%%PORTDOCS%%%%DOCSDIR%%/unk.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%