Attachment #166287 for bug #200325

Lines 8118-8120 Link Here

(-)MOVED (+1 lines)
8118	www/ojs2\|\|2016-01-25\|Has expired: PHP 5.4 EOL reached	8118	www/ojs2\|\|2016-01-25\|Has expired: PHP 5.4 EOL reached
8119	www/webcalendar\|\|2016-01-25\|Has expired: PHP 5.4 EOL reached	8119	www/webcalendar\|\|2016-01-25\|Has expired: PHP 5.4 EOL reached
8120	devel/py-msgpack\|devel/py-msgpack-python\|2016-01-28\|Renamed to match upstream naming	8120	devel/py-msgpack\|devel/py-msgpack-python\|2016-01-28\|Renamed to match upstream naming
		8121	japanese/mecab-ipadic\|japanese/mecab-ipadic-eucjp\|2016-01-29\|Renamed to include character set

Lines 160-166 Link Here

(-)japanese/Makefile (-1 / +3 lines)
160	SUBDIR += man	160	SUBDIR += man
161	SUBDIR += man-doc	161	SUBDIR += man-doc
162	SUBDIR += mecab	162	SUBDIR += mecab
163	SUBDIR += mecab-ipadic	163	SUBDIR += mecab-ipadic-eucjp
		164	SUBDIR += mecab-ipadic-sjis
		165	SUBDIR += mecab-ipadic-utf8
164	SUBDIR += mg	166	SUBDIR += mg
165	SUBDIR += mh	167	SUBDIR += mh
166	SUBDIR += migemo	168	SUBDIR += migemo





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 (EUC-JP)

LICENSE=	NAIST ICOT
LICENSE_COMB=	multi

GNU_CONFIGURE=		yes
CONFIGURE_ARGS+=	--with-dicdir=${PREFIX}/lib/mecab/dic/ipadic

.if ${PKGNAMESUFFIX:S,-,,} == "eucjp"
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}
CONFIGURE_ARGS+=	--with-charset=euc-jp
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>

Line 0 Link Here

(-)japanese/mecab-ipadic-sjis/Makefile (+10 lines)
	1	# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
	2	# $FreeBSD$
	3
	4	PKGNAMESUFFIX= -sjis
	5
	6	COMMENT= Japanese Morphological Dictionary for MeCab (Shift JIS)
	7
	8	MASTERDIR= ${.CURDIR}/../mecab-ipadic-eucjp
	9
	10	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)japanese/mecab-ipadic-utf8/Makefile (+10 lines)
	1	# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
	2	# $FreeBSD$
	3
	4	PKGNAMESUFFIX= -utf8
	5
	6	COMMENT= Japanese Morphological Dictionary for MeCab (UTF-8)
	7
	8	MASTERDIR= ${.CURDIR}/../mecab-ipadic-eucjp
	9
	10	.include "${MASTERDIR}/Makefile"

Return to bug 200325

Lines 3-14 Link Here

(-)japanese/mecab-ipadic-eucjp/Makefile (-14 / +10 lines)
3		3
4	PORTNAME= mecab-ipadic	4	PORTNAME= mecab-ipadic
5	DISTVERSION= 2.7.0-20070801	5	DISTVERSION= 2.7.0-20070801
		6	PORTREVISION= 1
6	CATEGORIES= japanese textproc	7	CATEGORIES= japanese textproc
7	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= GOOGLE_CODE
8	PROJECTHOST= mecab	9	PROJECTHOST= mecab
		10	PKGNAMESUFFIX?= -eucjp
9		11
10	MAINTAINER= yasu@utahime.org	12	MAINTAINER= yasu@utahime.org
11	COMMENT= Japanese Morphological Dictionary for MeCab	13	COMMENT?= Japanese Morphological Dictionary for MeCab (EUC-JP)
12		14
13	LICENSE= NAIST ICOT	15	LICENSE= NAIST ICOT
14	LICENSE_COMB= multi	16	LICENSE_COMB= multi
Lines 26-46 Link Here
26	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS+= --with-dicdir=${PREFIX}/lib/mecab/dic/ipadic	29	CONFIGURE_ARGS+= --with-dicdir=${PREFIX}/lib/mecab/dic/ipadic
28		30
29	OPTIONS_RADIO= CHARSET	31	.if ${PKGNAMESUFFIX:S,-,,} == "eucjp"
30	OPTIONS_RADIO_CHARSET= EUCJP SHIFTJIS UTF8
31
32	EUCJP_DESC= Use EUC-JP as dictionary charset.
33	SHIFTJIS_DESC= Use SHIFT-JIS as dictionary charset.
34	UTF8_DESC= Use UTF-8 as dictionary charset.
35
36	.include <bsd.port.options.mk>
37
38	.if ${PORT_OPTIONS:MEUCJP}
39	CONFIGURE_ARGS+= --with-charset=euc-jp	32	CONFIGURE_ARGS+= --with-charset=euc-jp
40	.elif ${PORT_OPTIONS:MSHIFTJIS}	33	CONFLICTS_INSTALL= ja-mecab-ipadic-utf8-[0-9]* ja-mecab-ipadic-sjis-[0-9]*
41	CONFIGURE_ARGS+= --with-charset=shift_jis	34	.elif ${PKGNAMESUFFIX:S,-,,} == "sjis"
42	.elif ${PORT_OPTIONS:MUTF8}	35	CONFIGURE_ARGS+= --with-charset=shiftjis
		36	CONFLICTS_INSTALL= ja-mecab-ipadic-eucjp-[0-9]* ja-mecab-ipadic-utf8-[0-9]*
		37	.elif ${PKGNAMESUFFIX:S,-,,} == "utf8"
43	CONFIGURE_ARGS+= --with-charset=utf-8	38	CONFIGURE_ARGS+= --with-charset=utf-8
		39	CONFLICTS_INSTALL= ja-mecab-ipadic-eucjp-[0-9]* ja-mecab-ipadic-sjis-[0-9]*
44	.endif	40	.endif
45		41
46	.include <bsd.port.mk>	42	.include <bsd.port.mk>