From f09764b6955e06b6ff9ded5da9e9c1402558c6e9 Mon Sep 17 00:00:00 2001
From: Koichiro Iwao
Date: Sun, 9 Jun 2024 22:38:03 +0900
Subject: [PATCH] japanese/skk-jigyo{,-cdb}: add JIS level 2,3,4 dict
and pass maintainership to submitter.
PR: 279582
---
japanese/skk-jisyo-cdb/Makefile | 1 -
japanese/skk-jisyo/Makefile | 23 ++++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/japanese/skk-jisyo-cdb/Makefile b/japanese/skk-jisyo-cdb/Makefile
index a1d57cce0e3b..34ee1a5705a0 100644
--- a/japanese/skk-jisyo-cdb/Makefile
+++ b/japanese/skk-jisyo-cdb/Makefile
@@ -1,4 +1,3 @@
-MAINTAINER= ports@FreeBSD.org
COMMENT= CDB jisyo (dictionary) files for the SKK Japanese-input software
WITH_SKKJISYO_CDB= yes
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 6f985c36fa3d..dae9cbdd46bb 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -1,14 +1,15 @@
PORTNAME= skk-jisyo
DISTVERSIONPREFIX= g
DISTVERSION= 20240130
+PORTREVISION= 1
CATEGORIES= japanese
.if defined(WITH_SKKJISYO_CDB)
PKGNAMESUFFIX= -cdb
.endif
-MAINTAINER?= ports@FreeBSD.org
+MAINTAINER= mew14930xvi@inbox.lv
COMMENT?= Jisyo (dictionary) files for the SKK Japanese-input software
-WWW= http://openlab.jp/skk/
+WWW= http://openlab.jp/skk/dic.html
LICENSE= GPLv2+
@@ -21,14 +22,6 @@ GH_ACCOUNT= skk-dev
GH_PROJECT= dict
GH_TAGNAME= b798a46
-SKKDIR?= share/skk
-SKK_JISYO_TYPE?=L M S
-
-PLIST_SUB+= SKKDIR=${SKKDIR}
-.for type in ${SKK_JISYO_TYPE}
-PLIST_FILES+= ${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
-.endfor
-
.if defined(WITH_SKKJISYO_CDB)
CDBSUFFIX= .cdb
.else
@@ -36,6 +29,14 @@ CDBSUFFIX= #empty
NO_BUILD= yes
.endif
+SKKDIR?= share/skk
+SKK_JISYO_TYPE?=L M S JIS2 JIS3_4
+
+.for type in ${SKK_JISYO_TYPE}
+PLIST_FILES+= ${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
+.endfor
+PLIST_SUB+= SKKDIR=${SKKDIR}
+
.if defined(WITH_SKKJISYO_DELCOMMENTS)
# Strip comments in transtation candidates list.
# Candidate list starts with '/', and each candidate is concatenated by
@@ -72,7 +73,7 @@ do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/${SKKDIR}
.for type in ${SKK_JISYO_TYPE}
${INSTALL_DATA} ${WRKSRC}/SKK-JISYO.${type}${CDBSUFFIX} \
- ${STAGEDIR}${PREFIX}/${SKKDIR}/SKK-JISYO.${type}${CDBSUFFIX}
+ ${STAGEDIR}${PREFIX}/${SKKDIR}/
.endfor
.include