From nobody Fri Apr 17 13:26:07 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fxwcv4mxGz6ZmDp for ; Fri, 17 Apr 2026 13:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxwcv1YB4z3Bly for ; Fri, 17 Apr 2026 13:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776432367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1U+8wdms6/jojwa9PbhhxRRPMJLz4hPCR4G+PXRhHY=; b=ZKezyKG6n5qeESDslVZ7PF3367KGHtN7kOdE4nI6Y2HVUysCU4i6Z2QivFvHCX2BJ2Xd1t 25/TimQifrW1Sx2x23mpCRNnn9Oc2xoSlri7rx14DMxM70NZPcL7kOn3UvxI6K83ULKYva uV3dyXzkFE5ndT0F8fRWv5lDqD0YE8v/YeZk+duPNCjrCyLNEqScRUYlrfD2LCb4m7IvIq mWmeqJKvB/Vm9QA01iFzmPsG2Y9wFpCqhUYWXjU/peVihy8Jwh5ZLxhCPuJPxMA8tse/Mh pzcz6vAsqSPDspSbp82jIh/crQf6MpRYvMs9U6gXv06KYFCNlbHnaE3IsiOaig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776432367; a=rsa-sha256; cv=none; b=aE87YpLpKGugopNcx2z3Nlm3JH2ah8xxpKrExFiegMxEn1TTI/4UZydYVRuXdERTizAEwt mXJW2vBcIfxsxHmQd4+Jd+/y3Jxm1J7akTiXTH/lppg2z8sLKY7asx0ZzOOI/02ffWl6jg 2rbmOmp0HsN+yW+2fa0NYxxTiD6axGppydYBAkUc1jiHbgrkzhRtUaPwffYXbcvBhj4Quo 35CqUmLg8hR+u7c3kP+ColrAxEja9gLvbgIjN69cgMTO8kLHzZtMHcR3VxxIH4FaADJxWQ BC0HND1q62OA+IeOta67QXWBSebNgSLdswG7PXyZipZy1F0MP8+xz+9cguL0Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776432367; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D1U+8wdms6/jojwa9PbhhxRRPMJLz4hPCR4G+PXRhHY=; b=O1/9/NGWcb16zdR4TiJH3qn/p/2jFMBfx9HckKHcLhX2YAlt1iLNQRH+iwu6cgdobL5FeA Yqj0DNyprzOGcAWM/HgDe2uys0vdoid23Xwg2YUmhmRyJl5QVRZG2RHF91iYfhFbBKJNOQ GiFNp4KPhJmqZa7pLs6H2b18jVmoLjZ4ffK7+5gpduafKMPU42eNC4PQb9TPZeAgpKhz/c hBI3KRJge29nKmnVuaEQs3Ca9F5Tab3+XOE53uxjID6twrTRKurQpISXVNr3PekH9ybUxm /il+oW/yNryLuwzWlv8mAqsoJbdokia2fh6JoQMb7vWxaxb3jB8syogbv6OGBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxwcv18WSzvWK for ; Fri, 17 Apr 2026 13:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43194 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 13:26:07 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kousuke Kannagi Subject: git: f66dd5691803 - main - japanese/canna-server: Refactor List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f66dd569180315e74ffc3de7b7e6823abe4c535a Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 13:26:07 +0000 Message-Id: <69e234ef.43194.7eb90c45@gitrepo.freebsd.org> The branch main has been updated by mce: URL: https://cgit.FreeBSD.org/ports/commit/?id=f66dd569180315e74ffc3de7b7e6823abe4c535a commit f66dd569180315e74ffc3de7b7e6823abe4c535a Author: Kousuke Kannagi AuthorDate: 2026-04-15 10:54:22 +0000 Commit: Kousuke Kannagi CommitDate: 2026-04-17 13:24:45 +0000 japanese/canna-server: Refactor Lint with portclippy. Regenerate patchfile. PR: 288911 Approved by: osa (mentor) --- japanese/canna-server/Makefile | 4 +++- japanese/canna-server/files/patch-Canna.conf | 8 ++++---- japanese/canna-server/files/patch-Imakefile | 6 +++--- japanese/canna-server/files/patch-cmd-catdic-Imakefile | 4 ++-- japanese/canna-server/files/patch-dic-phono-newjis.kpdef | 6 +++--- japanese/canna-server/files/patch-server-comm.c | 6 +++--- japanese/canna-server/pkg-descr | 2 +- japanese/canna-server/pkg-message | 2 +- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 1bb425eef3f3..2c631f268d06 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -16,9 +16,11 @@ LIB_DEPENDS= libcanna.so:japanese/canna-lib USES= imake tar:bzip2 USE_RC_SUBR= canna + +MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= instserver instclient + PORTDOCS= CHANGES.jp ChangeLog README.jp RKCCONF.jp -MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DOCS diff --git a/japanese/canna-server/files/patch-Canna.conf b/japanese/canna-server/files/patch-Canna.conf index c4a8003ddc04..3ea852b15053 100644 --- a/japanese/canna-server/files/patch-Canna.conf +++ b/japanese/canna-server/files/patch-Canna.conf @@ -1,4 +1,4 @@ ---- Canna.conf.orig 2004-05-19 15:48:47 UTC +--- Canna.conf.orig 2025-08-15 04:38:35 UTC +++ Canna.conf @@ -109,7 +109,8 @@ # define DefErrDir $(cannaPrefix)/log @@ -19,7 +19,7 @@ cannaIncDir = $(cannaPrefix)/include/canna libCannaDir = DefLibCannaDir -@@ -175,7 +176,7 @@ cannaOwnerGroup = +@@ -182,7 +183,7 @@ cannaOwnerGroup = #ifdef InstallAsUser cannaOwnerGroup = #else @@ -27,8 +27,8 @@ +cannaOwnerGroup = #endif - cannaDsoRev = 1.2 -@@ -199,9 +200,9 @@ CHMOD = : + cannaShLibMajor = 1 +@@ -206,9 +207,9 @@ CHMOD = : CHGRP = : CHMOD = : #else diff --git a/japanese/canna-server/files/patch-Imakefile b/japanese/canna-server/files/patch-Imakefile index c25e771ea5a5..142670636613 100644 --- a/japanese/canna-server/files/patch-Imakefile +++ b/japanese/canna-server/files/patch-Imakefile @@ -1,6 +1,6 @@ ---- Imakefile.orig 2004-05-20 00:39:22.000000000 +0900 -+++ Imakefile 2009-04-13 02:58:31.905200512 +0900 -@@ -121,9 +121,9 @@ +--- Imakefile.orig 2025-06-05 14:35:46 UTC ++++ Imakefile +@@ -121,9 +121,9 @@ CANNAROOT = . $(CANNAROOT)/confwrapper mkenv CFLAGS $(PURE_CFLAGS) >> $@ CANNAROOT = . diff --git a/japanese/canna-server/files/patch-cmd-catdic-Imakefile b/japanese/canna-server/files/patch-cmd-catdic-Imakefile index ef8460e240fb..e12e2f44ebea 100644 --- a/japanese/canna-server/files/patch-cmd-catdic-Imakefile +++ b/japanese/canna-server/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-server/files/patch-dic-phono-newjis.kpdef b/japanese/canna-server/files/patch-dic-phono-newjis.kpdef index 9a8e0df750fc..45a03cac20bb 100644 --- a/japanese/canna-server/files/patch-dic-phono-newjis.kpdef +++ b/japanese/canna-server/files/patch-dic-phono-newjis.kpdef @@ -1,6 +1,6 @@ ---- dic/phono/newjis.kpdef.orig 2014-05-25 12:27:08.000000000 +0900 -+++ dic/phono/newjis.kpdef 2014-05-25 12:27:27.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-server/files/patch-server-comm.c b/japanese/canna-server/files/patch-server-comm.c index 587efec36700..d6b5cd879212 100644 --- a/japanese/canna-server/files/patch-server-comm.c +++ b/japanese/canna-server/files/patch-server-comm.c @@ -1,6 +1,6 @@ ---- server/comm.c.orig 2004-04-27 06:48:37.000000000 +0900 -+++ server/comm.c 2008-11-08 17:38:21.000000000 +0900 -@@ -555,10 +555,11 @@ +--- server/comm.c.orig 2025-06-05 14:35:46 UTC ++++ server/comm.c +@@ -555,10 +555,11 @@ struct sockaddr_un *unaddr; unaddr->sun_family = AF_UNIX; oldUmask = umask (0); diff --git a/japanese/canna-server/pkg-descr b/japanese/canna-server/pkg-descr index 38ca5be96a37..a5978bf8a4d4 100644 --- a/japanese/canna-server/pkg-descr +++ b/japanese/canna-server/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. diff --git a/japanese/canna-server/pkg-message b/japanese/canna-server/pkg-message index 19de8b6f6294..d4011a22f992 100644 --- a/japanese/canna-server/pkg-message +++ b/japanese/canna-server/pkg-message @@ -1,7 +1,7 @@ [ { type: install message: <