Date: Fri, 17 Apr 2026 13:26:05 +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: 5e433936960c - main - japanese/canna-lib: Refactor Message-ID: <69e234ed.4214a.230a2358@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=5e433936960cf272e2bcf61b7f75795c2ed833af commit 5e433936960cf272e2bcf61b7f75795c2ed833af Author: Kousuke Kannagi <mce@FreeBSD.org> AuthorDate: 2026-04-15 10:46:14 +0000 Commit: Kousuke Kannagi <mce@FreeBSD.org> CommitDate: 2026-04-17 13:24:27 +0000 japanese/canna-lib: Refactor Lint with portclippy. Regenerate patchfile. PR: 288911 Approved by: osa (mentor) --- japanese/canna-lib/Makefile | 3 ++- japanese/canna-lib/files/patch-Canna.conf | 10 +++++----- japanese/canna-lib/files/patch-Imakefile | 8 ++++---- japanese/canna-lib/files/patch-cmd-catdic-Imakefile | 4 ++-- japanese/canna-lib/files/patch-dic-phono-Imakefile | 6 +++--- japanese/canna-lib/files/patch-dic-phono-newjis.kpdef | 6 +++--- japanese/canna-lib/pkg-descr | 2 +- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 7df6c9c5786f..ab8ec3fbe729 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -14,9 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT USES= imake:notall,noman tar:bzip2 USE_LDCONFIG= yes + +MAKE_JOBS_UNSAFE= yes ALL_TARGET= canna INSTALL_TARGET= instsgs -MAKE_JOBS_UNSAFE= yes post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.1 diff --git a/japanese/canna-lib/files/patch-Canna.conf b/japanese/canna-lib/files/patch-Canna.conf index 26772c9b19fc..b580cda44673 100644 --- a/japanese/canna-lib/files/patch-Canna.conf +++ b/japanese/canna-lib/files/patch-Canna.conf @@ -1,5 +1,5 @@ ---- Canna.conf.orig 2004-05-20 00:48:47.000000000 +0900 -+++ Canna.conf 2014-04-06 04:16:39.000000000 +0900 +--- Canna.conf.orig 2025-08-15 04:38:35 UTC ++++ Canna.conf @@ -109,7 +109,8 @@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib @@ -10,7 +10,7 @@ # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna # define DefLibCannaDir /usr/lib -@@ -175,7 +176,7 @@ +@@ -182,7 +183,7 @@ cannaOwnerGroup = #ifdef InstallAsUser cannaOwnerGroup = #else @@ -18,8 +18,8 @@ +cannaOwnerGroup = #endif - cannaDsoRev = 1.2 -@@ -199,9 +200,9 @@ + cannaShLibMajor = 1 +@@ -206,9 +207,9 @@ CHMOD = : CHGRP = : CHMOD = : #else diff --git a/japanese/canna-lib/files/patch-Imakefile b/japanese/canna-lib/files/patch-Imakefile index e5209ca481d2..d467ed53b6ba 100644 --- a/japanese/canna-lib/files/patch-Imakefile +++ b/japanese/canna-lib/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig 2004-05-20 00:39:22.000000000 +0900 -+++ Imakefile 2009-04-13 02:34:56.483862702 +0900 -@@ -122,14 +122,14 @@ +--- Imakefile.orig 2025-06-05 14:35:46 UTC ++++ Imakefile +@@ -122,14 +122,14 @@ SERVERDIR = server dic/phono dic/ideo CANNAROOT = . SERVERDIR = server dic/phono dic/ideo @@ -18,7 +18,7 @@ instmost:: mkbindir mklibdir mkdicdir mkerrdir MakeDirectories(mkbindir, $(cannaBinDir)) -@@ -184,6 +184,7 @@ +@@ -184,6 +184,7 @@ instsgs:: (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \ $(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \ done diff --git a/japanese/canna-lib/files/patch-cmd-catdic-Imakefile b/japanese/canna-lib/files/patch-cmd-catdic-Imakefile index ef8460e240fb..e12e2f44ebea 100644 --- a/japanese/canna-lib/files/patch-cmd-catdic-Imakefile +++ b/japanese/canna-lib/files/patch-cmd-catdic-Imakefile @@ -1,5 +1,5 @@ ---- cmd/catdic/Imakefile.orig 2003-10-02 16:40:30.000000000 +0900 -+++ cmd/catdic/Imakefile 2008-09-15 23:40:07.819285237 +0900 +--- cmd/catdic/Imakefile.orig 2025-05-09 16:04:53 UTC ++++ cmd/catdic/Imakefile @@ -2,7 +2,7 @@ #include "../../Canna.conf" #include "../cmd.tmpl" diff --git a/japanese/canna-lib/files/patch-dic-phono-Imakefile b/japanese/canna-lib/files/patch-dic-phono-Imakefile index f067dc006e78..811c54bc798b 100644 --- a/japanese/canna-lib/files/patch-dic-phono-Imakefile +++ b/japanese/canna-lib/files/patch-dic-phono-Imakefile @@ -1,6 +1,6 @@ ---- dic/phono/Imakefile.orig 2002-10-19 17:27:40.000000000 +0900 -+++ dic/phono/Imakefile 2010-04-11 21:03:35.000000000 +0900 -@@ -103,6 +103,11 @@ +--- dic/phono/Imakefile.orig 2008-04-05 17:25:46 UTC ++++ dic/phono/Imakefile +@@ -97,6 +97,11 @@ InstallNamedNonExec(wx2+.kpdef,wx2+.ctd,$(SAMPLESRCDIR InstallNamedNonExec(wx2+.kpdef,wx2+.ctd,$(SAMPLESRCDIR)) #endif diff --git a/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef b/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef index ca25a6258a86..45a03cac20bb 100644 --- a/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef +++ b/japanese/canna-lib/files/patch-dic-phono-newjis.kpdef @@ -1,6 +1,6 @@ ---- dic/phono/newjis.kpdef.orig 2014-04-06 04:09:21.000000000 +0900 -+++ dic/phono/newjis.kpdef 2014-04-06 04:09:30.000000000 +0900 -@@ -70,7 +70,7 @@ +--- dic/phono/newjis.kpdef.orig 2025-05-09 16:04:53 UTC ++++ dic/phono/newjis.kpdef +@@ -70,7 +70,7 @@ + ¤æ O ¤ä #ifndef ASCII + ¤æ diff --git a/japanese/canna-lib/pkg-descr b/japanese/canna-lib/pkg-descr index 38ca5be96a37..a5978bf8a4d4 100644 --- a/japanese/canna-lib/pkg-descr +++ b/japanese/canna-lib/pkg-descr @@ -1,2 +1,2 @@ -Canna is a Kana-Kanji conversion server. It supports +Canna is a Kana-Kanji conversion server. It supports Mule(Multi-lingual extention Emacs), kinput2 X11 input method, etc.home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e234ed.4214a.230a2358>