Index: head/japanese/mecab/Makefile
===================================================================
--- head/japanese/mecab/Makefile	(revision 370979)
+++ head/japanese/mecab/Makefile	(revision 370980)
@@ -1,47 +1,47 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	mecab
 PORTVERSION=	0.996
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
 LICENSE=	BSD3CLAUSE GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_lib_stdcpp_main=no
 INSTALL_TARGET=	install-strip
 USES=		iconv gettext:build libtool perl5
 USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtoolize
 AUTOMAKE_ARGS=	--add-missing --copy --force
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}.in
-	${REINPLACE_CMD} -e 's/conf_DATA = mecabrc/conf_DATA = mecabrc.dist/' ${WRKSRC}/Makefile.am
+	${REINPLACE_CMD} -e 's/conf_DATA = mecabrc/conf_DATA = mecabrc.sample/' ${WRKSRC}/Makefile.am
 
 post-configure:
-	${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.dist
+	${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.sample
 
 pre-install:
 	${CHMOD} a+x ${WRKSRC}/install-sh
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/japanese/mecab/pkg-plist
===================================================================
--- head/japanese/mecab/pkg-plist	(revision 370979)
+++ head/japanese/mecab/pkg-plist	(revision 370980)
@@ -1,17 +1,14 @@
 bin/mecab
 bin/mecab-config
 include/mecab.h
 lib/libmecab.a
 lib/libmecab.so
 lib/libmecab.so.2
 lib/libmecab.so.2.0.0
 libexec/mecab/mecab-cost-train
 libexec/mecab/mecab-dict-gen
 libexec/mecab/mecab-dict-index
 libexec/mecab/mecab-system-eval
 libexec/mecab/mecab-test-gen
 man/man1/mecab.1.gz
-@dirrm libexec/mecab
-@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
+@sample etc/mecabrc.sample