Attachment 166287 Details for Bug 200325 – Updated patch.

[patch] Updated patch.

patch-japanese_mecab-ipadic (text/plain), 3.70 KB, created by Yasuhiro Kimura on 2016-01-29 23:05:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2016-01-29 23:05:59 UTC

Size: 3.70 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 407494)
>+++ MOVED	(working copy)
>@@ -8118,3 +8118,4 @@
> www/ojs2||2016-01-25|Has expired: PHP 5.4 EOL reached
> www/webcalendar||2016-01-25|Has expired: PHP 5.4 EOL reached
> devel/py-msgpack|devel/py-msgpack-python|2016-01-28|Renamed to match upstream naming
>+japanese/mecab-ipadic|japanese/mecab-ipadic-eucjp|2016-01-29|Renamed to include character set
>Index: japanese/Makefile
>===================================================================
>--- japanese/Makefile	(revision 407494)
>+++ japanese/Makefile	(working copy)
>@@ -160,7 +160,9 @@
>     SUBDIR += man
>     SUBDIR += man-doc
>     SUBDIR += mecab
>-    SUBDIR += mecab-ipadic
>+    SUBDIR += mecab-ipadic-eucjp
>+    SUBDIR += mecab-ipadic-sjis
>+    SUBDIR += mecab-ipadic-utf8
>     SUBDIR += mg
>     SUBDIR += mh
>     SUBDIR += migemo
>Index: japanese/mecab-ipadic-eucjp/Makefile
>===================================================================
>--- japanese/mecab-ipadic-eucjp/Makefile	(revision 407494)
>+++ japanese/mecab-ipadic-eucjp/Makefile	(working copy)
>@@ -3,12 +3,14 @@
> 
> PORTNAME=	mecab-ipadic
> DISTVERSION=	2.7.0-20070801
>+PORTREVISION=	1
> CATEGORIES=	japanese textproc
> MASTER_SITES=	GOOGLE_CODE
> PROJECTHOST=	mecab
>+PKGNAMESUFFIX?=	-eucjp
> 
> MAINTAINER=	yasu@utahime.org
>-COMMENT=	Japanese Morphological Dictionary for MeCab
>+COMMENT?=	Japanese Morphological Dictionary for MeCab (EUC-JP)
> 
> LICENSE=	NAIST ICOT
> LICENSE_COMB=	multi
>@@ -26,21 +28,15 @@
> GNU_CONFIGURE=		yes
> CONFIGURE_ARGS+=	--with-dicdir=${PREFIX}/lib/mecab/dic/ipadic
> 
>-OPTIONS_RADIO=	CHARSET
>-OPTIONS_RADIO_CHARSET=	EUCJP SHIFTJIS UTF8
>-
>-EUCJP_DESC=	Use EUC-JP as dictionary charset.
>-SHIFTJIS_DESC=	Use SHIFT-JIS as dictionary charset.
>-UTF8_DESC=	Use UTF-8 as dictionary charset.
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MEUCJP}
>+.if ${PKGNAMESUFFIX:S,-,,} == "eucjp"
> CONFIGURE_ARGS+=	--with-charset=euc-jp
>-.elif ${PORT_OPTIONS:MSHIFTJIS}
>-CONFIGURE_ARGS+=	--with-charset=shift_jis
>-.elif ${PORT_OPTIONS:MUTF8}
>+CONFLICTS_INSTALL=	ja-mecab-ipadic-utf8-[0-9]* ja-mecab-ipadic-sjis-[0-9]*
>+.elif ${PKGNAMESUFFIX:S,-,,} == "sjis"
>+CONFIGURE_ARGS+=	--with-charset=shiftjis
>+CONFLICTS_INSTALL=	ja-mecab-ipadic-eucjp-[0-9]* ja-mecab-ipadic-utf8-[0-9]*
>+.elif ${PKGNAMESUFFIX:S,-,,} == "utf8"
> CONFIGURE_ARGS+=	--with-charset=utf-8
>+CONFLICTS_INSTALL=	ja-mecab-ipadic-eucjp-[0-9]* ja-mecab-ipadic-sjis-[0-9]*
> .endif
> 
> .include <bsd.port.mk>
>Index: japanese/mecab-ipadic-eucjp/distinfo
>===================================================================
>Index: japanese/mecab-ipadic-eucjp/pkg-descr
>===================================================================
>Index: japanese/mecab-ipadic-eucjp/pkg-plist
>===================================================================
>Index: japanese/mecab-ipadic-sjis/Makefile
>===================================================================
>--- japanese/mecab-ipadic-sjis/Makefile	(nonexistent)
>+++ japanese/mecab-ipadic-sjis/Makefile	(working copy)
>@@ -0,0 +1,10 @@
>+# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
>+# $FreeBSD$
>+
>+PKGNAMESUFFIX=	-sjis
>+
>+COMMENT=	Japanese Morphological Dictionary for MeCab (Shift JIS)
>+
>+MASTERDIR=	${.CURDIR}/../mecab-ipadic-eucjp
>+
>+.include "${MASTERDIR}/Makefile"
>Index: japanese/mecab-ipadic-utf8/Makefile
>===================================================================
>--- japanese/mecab-ipadic-utf8/Makefile	(nonexistent)
>+++ japanese/mecab-ipadic-utf8/Makefile	(working copy)
>@@ -0,0 +1,10 @@
>+# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
>+# $FreeBSD$
>+
>+PKGNAMESUFFIX=	-utf8
>+
>+COMMENT=	Japanese Morphological Dictionary for MeCab (UTF-8)
>+
>+MASTERDIR=	${.CURDIR}/../mecab-ipadic-eucjp
>+
>+.include "${MASTERDIR}/Makefile"

Flags:

yasu: maintainer-approval+

Actions: View | Diff

Attachments on bug 200325: 156933 | 156934 | 156935 | 156936 | 156937 | 156966 | 156967 | 158907 | 165988 | 166287