Date: Sun, 05 Apr 2026 14:54:48 +0000 From: Kousuke Kannagi <mce@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f9203ceaaf48 - main - japanese/skk-jawiki: Update to 2026.04.01.141931 Message-ID: <69d277b8.3dabf.37808b50@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mce: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9203ceaaf48a1f3071fcd6ef7dec6d46bd11b35 commit f9203ceaaf48a1f3071fcd6ef7dec6d46bd11b35 Author: Kousuke Kannagi <mce@FreeBSD.org> AuthorDate: 2026-04-04 01:06:05 +0000 Commit: Kousuke Kannagi <mce@FreeBSD.org> CommitDate: 2026-04-05 14:53:56 +0000 japanese/skk-jawiki: Update to 2026.04.01.141931 The generated dictionaries are now provided separately from the source code. japanese/mecab-jawiki has been separated from skk-jawiki, so remove the related code. Switch from USE_GITHUB to MASTER_SITES and DISTFILES. PR: 294239 Approved by: osa (mentor) --- japanese/skk-jawiki/Makefile | 58 +++++----------------- japanese/skk-jawiki/distinfo | 6 +-- .../skk-jawiki/files/extra-patch-mecab-userdic.csv | 10 ---- 3 files changed, 15 insertions(+), 59 deletions(-) diff --git a/japanese/skk-jawiki/Makefile b/japanese/skk-jawiki/Makefile index fdfb0ad1e51a..5c335eb501db 100644 --- a/japanese/skk-jawiki/Makefile +++ b/japanese/skk-jawiki/Makefile @@ -1,56 +1,21 @@ -PORTNAME= jawiki -DISTVERSION= g20260117 +PORTNAME= skk-jawiki +DISTVERSION= 2026.04.01.141931 CATEGORIES= japanese -PKGNAMEPREFIX?= ja-skk- +MASTER_SITES= https://github.com/tokuhirom/jawiki-kana-kanji-dict/releases/download/v${DISTVERSION}/ +DISTFILES= SKK-JISYO.jawiki -MAINTAINER= mew14930xvi@inbox.lv -COMMENT?= SKK dictionary from Wikipedia (Japanese edition) +MAINTAINER= mce@FreeBSD.org +COMMENT= SKK dictionary from Wikipedia (Japanese edition) WWW= https://github.com/tokuhirom/jawiki-kana-kanji-dict LICENSE= MIT -USE_GITHUB= yes -GH_ACCOUNT= tokuhirom -GH_PROJECT= jawiki-kana-kanji-dict -GH_TAGNAME= 3dcaae2 NO_ARCH= yes -.if defined(MECAB) # japanese/mecab-jawiki -BUILD_DEPENDS= ${LOCALBASE}/libexec/mecab/mecab-dict-index:japanese/mecab - -MECABDIR= lib/mecab/dic/ipadic -MECABDIC= ${PORTNAME}.dic - -PLIST_FILES= ${MECABDIR}/${MECABDIC} - -OPTIONS_DEFAULT= UTF8 -OPTIONS_SINGLE= CHARSET -OPTIONS_SINGLE_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 - -EUCJP_BUILD_DEPENDS= ja-mecab-ipadic-eucjp>0:japanese/mecab-ipadic-eucjp -SHIFTJIS_BUILD_DEPENDS= ja-mecab-ipadic-sjis>0:japanese/mecab-ipadic-sjis -UTF8_BUILD_DEPENDS= ja-mecab-ipadic-utf8>0:japanese/mecab-ipadic-utf8 - -EUCJP_VARS= CSET=euc-jp -SHIFTJIS_VARS= CSET=shiftjis -UTF8_VARS= CSET=utf-8 - -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-mecab-userdic.csv - -do-build: - ${LOCALBASE}/libexec/mecab/mecab-dict-index \ - -d ${LOCALBASE}/${MECABDIR} -u ${WRKSRC}/${MECABDIC} \ - -f utf-8 -t ${CSET} ${WRKSRC}/mecab-userdic.csv - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${MECABDIR} - ${INSTALL_DATA} ${WRKSRC}/${MECABDIC} ${STAGEDIR}${PREFIX}/${MECABDIR} -.else SKKDIR= share/skk -SKKDIC= SKK-JISYO.${PORTNAME} +SKKDIC= SKK-JISYO.jawiki + +PLIST_FILES= ${DICS:S|^|${SKKDIR}/|} OPTIONS_DEFAULT= EUCCDB OPTIONS_MULTI= DICTIONARY @@ -70,7 +35,9 @@ EUCCDB_VARS= DICS+=${SKKDIC}.cdb UTF8_VARS= DICS+=${SKKDIC}.utf8 UTF8CDB_VARS= DICS+=${SKKDIC}.utf8.cdb -PLIST_FILES= ${DICS:S|^|${SKKDIR}/|} +do-extract: + @${MKDIR} ${WRKSRC} + ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/ .include <bsd.port.options.mk> @@ -100,6 +67,5 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${SKKDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DICS} ${STAGEDIR}${PREFIX}/${SKKDIR} -.endif .include <bsd.port.mk> diff --git a/japanese/skk-jawiki/distinfo b/japanese/skk-jawiki/distinfo index 1ca201aa7fb8..2ff0004f3eb9 100644 --- a/japanese/skk-jawiki/distinfo +++ b/japanese/skk-jawiki/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1768707341 -SHA256 (tokuhirom-jawiki-kana-kanji-dict-g20260117-3dcaae2_GH0.tar.gz) = ef51d1180921969617550ca33bdd93d94e6e6559dee3be3f23374366ee3c02ea -SIZE (tokuhirom-jawiki-kana-kanji-dict-g20260117-3dcaae2_GH0.tar.gz) = 21260241 +TIMESTAMP = 1775058068 +SHA256 (SKK-JISYO.jawiki) = 0edd7313119547b3195588c36830ea2989f682ad44cc90f1d301b9ad7c98b53c +SIZE (SKK-JISYO.jawiki) = 28586417 diff --git a/japanese/skk-jawiki/files/extra-patch-mecab-userdic.csv b/japanese/skk-jawiki/files/extra-patch-mecab-userdic.csv deleted file mode 100644 index afa5273fe622..000000000000 --- a/japanese/skk-jawiki/files/extra-patch-mecab-userdic.csv +++ /dev/null @@ -1,10 +0,0 @@ ---- mecab-userdic.csv.orig 2026-01-17 09:38:34 UTC -+++ mecab-userdic.csv -@@ -198893,7 +198893,6 @@ Gwen,1288,1288,4569,名詞,固有名詞,一般,*,*,*,G - グスコーブドリの伝記,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グスコーブドリの伝記,ぐすこーぶどりのでんき,ぐすこーぶどりのでんき - グスタフ朝時代,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グスタフ朝時代,ぐすたふちょうじだい,ぐすたふちょうじだい - グスタフ列車砲,1288,1288,4569,名詞,固有名詞,一般,*,*,*,グスタフ列車砲,ぐすたふれっしゃほう,ぐすたふれっしゃほう --"gusto,1288,1288,4569,名詞,固有名詞,一般,*,*,*,"gusto,ぐすと,ぐすと - ぐず焼き祭り,1288,1288,4569,名詞,固有名詞,一般,*,*,*,ぐず焼き祭り,ぐずやきまつり,ぐずやきまつり - 虞世基,1288,1288,4569,名詞,固有名詞,一般,*,*,*,虞世基,ぐせいき,ぐせいき - 弘誓寺,1288,1288,4569,名詞,固有名詞,一般,*,*,*,弘誓寺,ぐせいじ,ぐせいじhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d277b8.3dabf.37808b50>