- Update to 0.93

- Add WITH_CHARSET knob to set default charset
- Install mecabrc as mecab.dist and preserve modified mecabrc

PR:		ports/101068
Submitted by:	TAOKA Fumiyoshi <fmysh_AT_iijmio-mail dot jp>

4 files changed, 28 insertions, 15 deletions

diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 8e393444cfca..0e1ad135fa16 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mecab
-PORTVERSION=	0.92
+PORTVERSION=	0.93
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${SUB_DIR}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Yet Another Part-of-Speech and Morphological Analyzer
 
-SUB_DIR=	20917
+SUB_DIR=	21187
 
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
@@ -23,6 +23,11 @@ INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
 
+# Default charset (euc/sjis/utf8)
+.if defined(WITH_CHARSET)
+CONFIGURE_ARGS=	--with-charset=${WITH_CHARSET}
+.endif
+
 MAN1=		mecab.1
 
 DOCS=		AUTHORS README doc/*.html
@@ -33,7 +38,18 @@ DOCS=		AUTHORS README doc/*.html
 IGNORE=		requires perl 5.8.x or later.  Install lang/perl5.8 and try again
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
+			 -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	${REINPLACE_CMD} -e 's/conf_DATA = mecabrc/conf_DATA = mecabrc.dist/' ${WRKSRC}/Makefile.in
+
+post-configure:
+	${CP} ${WRKSRC}/mecabrc ${WRKSRC}/mecabrc.dist
+
 post-install:
+	@if [ ! -f ${PREFIX}/etc/mecabrc ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/mecabrc.dist ${PREFIX}/etc/mecabrc; \
+	fi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
@@ -42,8 +58,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-post-patch:
-	${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' \
-			 -e 's/-O3/${CFLAGS}/' ${WRKSRC}/${CONFIGURE_SCRIPT}
-
 .include <bsd.port.post.mk>
diff --git a/japanese/mecab/distinfo b/japanese/mecab/distinfo
index cd86561b0cfc..eb52220e23ec 100644
--- a/japanese/mecab/distinfo
+++ b/japanese/mecab/distinfo
@@ -1,3 +1,3 @@
-MD5 (mecab-0.92.tar.gz) = 381dd3e289647a2cf6df0a1f3e782609
-SHA256 (mecab-0.92.tar.gz) = 55f4e1eb8d305715b236136526984fec35d94fa76007d0d62e631a101fd4c423
-SIZE (mecab-0.92.tar.gz) = 1071184
+MD5 (mecab-0.93.tar.gz) = 93ee80c5ea101c798e3954b19bd0088d
+SHA256 (mecab-0.93.tar.gz) = 139716223a25660121c2e8cbb3e9f2ba53d031a356b4f7ccd0a6cee0287253db
+SIZE (mecab-0.93.tar.gz) = 1072942
diff --git a/japanese/mecab/pkg-message b/japanese/mecab/pkg-message
index c9bc463bcf42..eceb72065179 100644
--- a/japanese/mecab/pkg-message
+++ b/japanese/mecab/pkg-message
@@ -3,4 +3,3 @@
                      **** NOTE ****
   ipadic was splitted into japanese/mecab-ipadic port.
 ========================================================
-
diff --git a/japanese/mecab/pkg-plist b/japanese/mecab/pkg-plist
index 9d723a361c22..3cb2fea4069f 100644
--- a/japanese/mecab/pkg-plist
+++ b/japanese/mecab/pkg-plist
@@ -1,10 +1,10 @@
-lib/libmecab.la
-lib/libmecab.so.1
-lib/libmecab.so
-lib/libmecab.a
 bin/mecab
 bin/mecab-config
 include/mecab.h
+lib/libmecab.a
+lib/libmecab.la
+lib/libmecab.so
+lib/libmecab.so.1
 libexec/mecab/mecab-cost-train
 libexec/mecab/mecab-dict-gen
 libexec/mecab/mecab-dict-index
@@ -12,7 +12,9 @@ libexec/mecab/mecab-dict-info
 libexec/mecab/mecab-system-eval
 libexec/mecab/mecab-test-gen
 @dirrm libexec/mecab
-etc/mecabrc
+@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