4 files changed, 31 insertions, 38 deletions

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 2bdca0d259fc..998e64ef54e7 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -1,18 +1,20 @@
-# New ports collection makefile for:	mecab
-# Date created:		2 April 2003
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mecab
-PORTVERSION=	0.994
+PORTVERSION=	0.995
 CATEGORIES=	japanese textproc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
+LICENSE=	BSD GPLv2 LGPL21
+LICENSE_COMB=	dual
+LICENSE_FILE_BSD=	${WRKSRC}/BSD
+LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
+LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL
+
 USE_AUTOTOOLS=	libtool
 USE_ICONV=	yes
 USE_PERL5_BUILD=	yes
@@ -22,16 +24,13 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	${PTHREAD_CFLAGS} -I ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-# Default charset (euc-jp/shift_jis/utf-8)
-.if defined(WITH_CHARSET)
-CONFIGURE_ARGS+=	--with-charset=${WITH_CHARSET}
-.endif
-
 MAN1=		mecab.1
 
-DOCS=		AUTHORS README doc/*.html
+PORTDOCS=	AUTHORS README *.html
+
+OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
@@ -48,12 +47,13 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/mecabrc ]; then \
 		${INSTALL_DATA} ${PREFIX}/etc/mecabrc.dist ${PREFIX}/etc/mecabrc; \
 	fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.for f in ${DOCS}
+.for f in ${PORTDOCS:N*.html}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/mecab/distinfo b/japanese/mecab/distinfo
index 5b5092ef101d..ed056a2be0aa 100644
--- a/japanese/mecab/distinfo
+++ b/japanese/mecab/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mecab-0.994.tar.gz) = d271a0b91e0cda09f13f62a6b28367648afb9b4dcb68178ea1fb0af4c0c866bc
-SIZE (mecab-0.994.tar.gz) = 1387966
+SHA256 (mecab-0.995.tar.gz) = a281cac1a7053c9d16e3885a677398566923d7e4c5fc34654d4ebc6c3b3aa520
+SIZE (mecab-0.995.tar.gz) = 1377686
diff --git a/japanese/mecab/pkg-descr b/japanese/mecab/pkg-descr
index 06d33c3647d1..4cb482ba7a8b 100644
--- a/japanese/mecab/pkg-descr
+++ b/japanese/mecab/pkg-descr
@@ -1,4 +1,13 @@
-MeCab: Yet Another Part-of-Speech and Morphological Analyzer
+MeCab is open source Japanese dependency structure analyzer developed
+through the joint research project between Graduate School of Informatics
+Kyoto University and NTT (Nippon Telegraph and Telephone)
+Communication Science Laboratories. It has following featers:
 
-Author:	Taku Kudo <taku@chasen.org>
-WWW:	http://mecab.sourceforge.net/
+* General-purpose design independent from language, dictionary and
+  corpus.
+* High precision of analysis based on Conditional Random Fields.
+* Faster than ChaSen, Juman and KAKASI.
+* Library is reentrant.
+* Scripting language bindings such as Perl/Ruby/Python/Java/C#.
+
+WWW: https://code.google.com/p/mecab/
diff --git a/japanese/mecab/pkg-plist b/japanese/mecab/pkg-plist
index 77a117f05b28..158c871ae4c8 100644
--- a/japanese/mecab/pkg-plist
+++ b/japanese/mecab/pkg-plist
@@ -14,19 +14,3 @@ libexec/mecab/mecab-test-gen
 @unexec if cmp -s %D/etc/mecabrc.dist %D/etc/mecabrc; then rm -f %D/etc/mecabrc; else true; fi
 etc/mecabrc.dist
 @exec if [ ! -f %D/etc/mecabrc ]; then cp -p %D/%F %B/mecabrc; fi
-%%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.html
-%%PORTDOCS%%%%DOCSDIR%%/partial.html
-%%PORTDOCS%%%%DOCSDIR%%/posid.html
-%%PORTDOCS%%%%DOCSDIR%%/soft.html
-%%PORTDOCS%%%%DOCSDIR%%/unk.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%