Index: head/japanese/mecab/Makefile
===================================================================
--- head/japanese/mecab/Makefile	(revision 328623)
+++ head/japanese/mecab/Makefile	(revision 328624)
@@ -1,61 +1,52 @@
 # Created by: Akinori MUSHA aka knu <knu@idaemons.org>
 # $FreeBSD$
 
 PORTNAME=	mecab
 PORTVERSION=	0.996
 CATEGORIES=	japanese textproc
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
 LICENSE=	BSD GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtool
 USES=		iconv gettext:build perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	ac_cv_lib_stdcpp_main=no
 
 CPPFLAGS+=	${PTHREAD_CFLAGS} -I ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 ACLOCAL_ARGS=	--system-acdir=${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 
-MAN1=		mecab.1
-
 PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
 			 -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}.in
 	${REINPLACE_CMD} -e 's/conf_DATA = mecabrc/conf_DATA = mecabrc.dist/' ${WRKSRC}/Makefile.am
 
 post-configure:
 	${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.dist
 
 pre-install:
 	${CHMOD} a+x ${WRKSRC}/install-sh
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/mecabrc ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/mecabrc.dist ${PREFIX}/etc/mecabrc; \
-	fi
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS:N*.html}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: head/japanese/mecab/pkg-plist
===================================================================
--- head/japanese/mecab/pkg-plist	(revision 328623)
+++ head/japanese/mecab/pkg-plist	(revision 328624)
@@ -1,16 +1,17 @@
 bin/mecab
 bin/mecab-config
 include/mecab.h
 lib/libmecab.a
 lib/libmecab.la
 lib/libmecab.so
 lib/libmecab.so.2
 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