svn commit: r375323 - in head/japanese: cmigemo cmigemo-dict cmigemo/files
MANTANI Nobutaka
nobutaka at FreeBSD.org
Tue Dec 23 13:30:14 UTC 2014
Author: nobutaka
Date: Tue Dec 23 13:30:12 2014
New Revision: 375323
URL: https://svnweb.freebsd.org/changeset/ports/375323
QAT: https://qat.redports.org/buildarchive/r375323/
Log:
Update to 20141220.
Change MASTER_SITES to GitHub.
Use nkf to generate dictionaries and data files.
PR: ports/193305
Submitted by: katsuyoshi.ohara at gmail.com
Deleted:
head/japanese/cmigemo/files/patch-src_wordbuf.c
Modified:
head/japanese/cmigemo-dict/Makefile
head/japanese/cmigemo/Makefile
head/japanese/cmigemo/distinfo
head/japanese/cmigemo/files/patch-compile_config.mk.in
head/japanese/cmigemo/files/patch-dict_dict.mak
Modified: head/japanese/cmigemo-dict/Makefile
==============================================================================
--- head/japanese/cmigemo-dict/Makefile Tue Dec 23 13:18:09 2014 (r375322)
+++ head/japanese/cmigemo-dict/Makefile Tue Dec 23 13:30:12 2014 (r375323)
@@ -2,9 +2,8 @@
# $FreeBSD$
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- ${MASTER_SITE_LOCAL:S/$/:skkdic/}
-MASTER_SITE_SUBDIR= nobutaka/:skkdic
+MASTER_SITES= GH \
+n ${MASTER_SITE_LOCAL:S/%SUBDIR%\/$/nobutaka\/:skkdic/}
PKGNAMESUFFIX= -dict
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${SKKDIC_FILE}:skkdic
Modified: head/japanese/cmigemo/Makefile
==============================================================================
--- head/japanese/cmigemo/Makefile Tue Dec 23 13:18:09 2014 (r375322)
+++ head/japanese/cmigemo/Makefile Tue Dec 23 13:30:12 2014 (r375323)
@@ -2,12 +2,17 @@
# $FreeBSD$
PORTNAME= cmigemo
-PORTVERSION= 20110227
+PORTVERSION= 20141220
CATEGORIES= japanese
-MASTER_SITES?= ${MASTER_SITE_GOOGLE_CODE}
-DISTNAME= ${PORTNAME}-default-src-${PORTVERSION}
+MASTER_SITES?= GH
DIST_SUBDIR= cmigemo
+USE_GITHUB= yes
+GH_ACCOUNT= koron
+GH_PROJECT= cmigemo
+GH_COMMIT= ${GH_TAGNAME}
+GH_TAGNAME= 6a1c438
+
MAINTAINER= nobutaka at FreeBSD.org
COMMENT= C implementation of Migemo Japanese incremental search tool
@@ -28,13 +33,12 @@ PORTDOCS= README_j.txt
.endif
OPTIONS_DEFINE+=DOCS
-USES+= iconv:build,wchar_t gmake zip
+USES+= gmake
+BUILD_DEPENDS= ${LOCALBASE}/bin/nkf:${PORTSDIR}/japanese/nkf
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${STAGEDIR}${PREFIX}
-WRKSRC= ${WRKDIR}/${PORTNAME}-default-src
-
.include <bsd.port.options.mk>
.if !defined(PKGNAMESUFFIX) && ${PORT_OPTIONS:MDOCS}
Modified: head/japanese/cmigemo/distinfo
==============================================================================
--- head/japanese/cmigemo/distinfo Tue Dec 23 13:18:09 2014 (r375322)
+++ head/japanese/cmigemo/distinfo Tue Dec 23 13:30:12 2014 (r375323)
@@ -1,4 +1,4 @@
-SHA256 (cmigemo/cmigemo-default-src-20110227.zip) = 4aa759b2e055ef3c3fbeb9e92f7f0aacc1fd1f8602fdd2f122719793ee14414c
-SIZE (cmigemo/cmigemo-default-src-20110227.zip) = 116574
+SHA256 (cmigemo/cmigemo-20141220.tar.gz) = 3e377072b8e1b770512875c56b7e7cab30162d84760ad6420fcc1bb192356060
+SIZE (cmigemo/cmigemo-20141220.tar.gz) = 69788
SHA256 (cmigemo/SKK-JISYO.L-20110813.bz2) = 560da93401f0a58417d61e2ff41a43a24f0886877797bbea879ba9db3e70e3d9
SIZE (cmigemo/SKK-JISYO.L-20110813.bz2) = 1694235
Modified: head/japanese/cmigemo/files/patch-compile_config.mk.in
==============================================================================
--- head/japanese/cmigemo/files/patch-compile_config.mk.in Tue Dec 23 13:18:09 2014 (r375322)
+++ head/japanese/cmigemo/files/patch-compile_config.mk.in Tue Dec 23 13:30:12 2014 (r375323)
@@ -18,9 +18,9 @@
-FILTER_CP932 = ${PROGRAM_ENCODEFILTER} -s
-FILTER_EUCJP = ${PROGRAM_ENCODEFILTER} -e
-FILTER_UTF8 = iconv -t utf-8 -f cp932
-+FILTER_CP932 = %%LOCALBASE%%/bin/iconv -t cp932 -f euc-jp
-+FILTER_EUCJP = %%LOCALBASE%%/bin/iconv -t euc-jp -f cp932
-+FILTER_UTF8 = %%LOCALBASE%%/bin/iconv -t utf-8 -f cp932
++ICONV_EUCJP_TO_CP932 = %%LOCALBASE%%/bin/nkf --ic=eucJP-ms --oc=CP932
++ICONV_CP932_TO_EUCJP = %%LOCALBASE%%/bin/nkf --ic=CP932 --oc=eucJP-ms
++ICONV_CP932_TO_UTF8 = %%LOCALBASE%%/bin/nkf --ic=CP932 --oc=UTF-8
INSTALL = ${PROGRAM_INSTALL} -c
INSTALL_PROGRAM = $(INSTALL) -m 755
INSTALL_DATA = $(INSTALL) -m 644
Modified: head/japanese/cmigemo/files/patch-dict_dict.mak
==============================================================================
--- head/japanese/cmigemo/files/patch-dict_dict.mak Tue Dec 23 13:18:09 2014 (r375322)
+++ head/japanese/cmigemo/files/patch-dict_dict.mak Tue Dec 23 13:30:12 2014 (r375323)
@@ -1,6 +1,15 @@
---- dict/dict.mak.orig 2011-02-27 19:45:40.000000000 +0900
-+++ dict/dict.mak 2011-08-17 01:04:58.000000000 +0900
-@@ -32,10 +32,10 @@
+--- dict/dict.mak.orig 2014-12-20 13:39:02.000000000 +0900
++++ dict/dict.mak 2014-12-21 22:31:28.000000000 +0900
+@@ -15,7 +15,7 @@
+ # Dictionary
+ #
+ $(DICT): $(DICT_BASE)
+- $(FILTER_CP932) < $(DICT_BASE) > $@
++ $(ICONV_EUCJP_TO_CP932) < $(DICT_BASE) > $@
+ $(DICT_BASE): $(SKKDIC_FILE) ../tools/skk2migemo.pl ../tools/optimize-dict.pl
+ $(PERL) ../tools/skk2migemo.pl < $(SKKDIC_FILE) > dict.tmp
+ $(PERL) ../tools/optimize-dict.pl < dict.tmp > $@
+@@ -32,42 +32,42 @@
##############################################################################
# Dictionary in euc-jp
#
@@ -15,7 +24,21 @@
$(EUCJP_DIR):
$(MKDIR) $(EUCJP_DIR)
$(EUCJP_DIR)/migemo-dict: migemo-dict
-@@ -52,10 +52,10 @@
+- $(FILTER_EUCJP) < migemo-dict > $@
++ $(ICONV_CP932_TO_EUCJP) < migemo-dict > $@
+ $(EUCJP_DIR)/zen2han.dat: zen2han.dat
+- $(FILTER_EUCJP) < zen2han.dat > $@
++ $(ICONV_CP932_TO_EUCJP) < zen2han.dat > $@
+ $(EUCJP_DIR)/han2zen.dat: han2zen.dat
+- $(FILTER_EUCJP) < han2zen.dat > $@
++ $(ICONV_CP932_TO_EUCJP) < han2zen.dat > $@
+ $(EUCJP_DIR)/hira2kata.dat: hira2kata.dat
+- $(FILTER_EUCJP) < hira2kata.dat > $@
++ $(ICONV_CP932_TO_EUCJP) < hira2kata.dat > $@
+ $(EUCJP_DIR)/roma2hira.dat: roma2hira.dat
+- $(FILTER_EUCJP) < roma2hira.dat > $@
++ $(ICONV_CP932_TO_EUCJP) < roma2hira.dat > $@
+
##############################################################################
# Dictionary in utf-8
#
@@ -30,11 +53,28 @@
$(UTF8_DIR):
$(MKDIR) $(UTF8_DIR)
$(UTF8_DIR)/migemo-dict: migemo-dict
-@@ -87,7 +87,8 @@
+- $(FILTER_UTF8) < migemo-dict > $@
++ $(ICONV_CP932_TO_UTF8) < migemo-dict > $@
+ $(UTF8_DIR)/zen2han.dat: zen2han.dat
+- $(FILTER_UTF8) < zen2han.dat > $@
++ $(ICONV_CP932_TO_UTF8) < zen2han.dat > $@
+ $(UTF8_DIR)/han2zen.dat: han2zen.dat
+- $(FILTER_UTF8) < han2zen.dat > $@
++ $(ICONV_CP932_TO_UTF8) < han2zen.dat > $@
+ $(UTF8_DIR)/hira2kata.dat: hira2kata.dat
+- $(FILTER_UTF8) < hira2kata.dat > $@
++ $(ICONV_CP932_TO_UTF8) < hira2kata.dat > $@
+ $(UTF8_DIR)/roma2hira.dat: roma2hira.dat
+- $(FILTER_UTF8) < roma2hira.dat > $@
++ $(ICONV_CP932_TO_UTF8) < roma2hira.dat > $@
+
+ ##############################################################################
+ # for Microsoft Visual C
+@@ -92,7 +92,8 @@
##############################################################################
# for GNU/gcc(Linux¼)
#
--gcc: euc-jp
+-gcc: euc-jp utf-8
+gcc-dict: euc-jp-dict utf-8-dict
+gcc-dat: euc-jp-dat utf-8-dat
More information about the svn-ports-head
mailing list