Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 May 2026 16:17:37 +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: 77eeb5ae2b58 - main - japanese/canna-server: Update to 3.8
Message-ID:  <6a0b3ba1.47a97.e83a27d@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=77eeb5ae2b58498d2e6723924a9005d023e0ea06

commit 77eeb5ae2b58498d2e6723924a9005d023e0ea06
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-05-14 06:35:44 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-05-18 16:16:46 +0000

    japanese/canna-server: Update to 3.8
    
    Add the documents to be installed.
    Add post-install-DOCS-on.
    Update pkg-descr.
    
    https://raw.githubusercontent.com/canna-input/canna/refs/tags/release-3.8/ChangeLog
    
    PR:             295142
    Co-authored-by: AIDA Shinra <shinra@j10n.org>
    Approved by:    fluffy (mentor)
---
 japanese/canna-server/Makefile  | 15 ++++++++++-----
 japanese/canna-server/distinfo  |  6 +++---
 japanese/canna-server/pkg-descr | 11 +++++++++--
 japanese/canna-server/pkg-plist |  4 +++-
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 2c631f268d06..178f6fc6c0b1 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	canna
-PORTVERSION=	3.7p5
+PORTVERSION=	3.8
 CATEGORIES=	japanese
 MASTER_SITES=	https://github.com/canna-input/canna/releases/download/release-${PORTVERSION}/
 PKGNAMESUFFIX=	-server
@@ -14,22 +14,27 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 
-USES=		imake tar:bzip2
+USES=		imake tar:xz
 USE_RC_SUBR=	canna
 
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	instserver instclient
 
-PORTDOCS=	CHANGES.jp ChangeLog README.jp RKCCONF.jp
+DOCS_EN=	ChangeLog README WHATIS
+DOCS_JA=	CHANGES.jp README.jp RKCCONF.jp WHATIS.jp
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 	    ${MAKEFILE} ${MAKE_ARGS} install.man
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	@cd ${STAGEDIR}${PREFIX}/sbin && ${RM} cannakill && \
 		${RLN} ../bin/catdic cannakill
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ja
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS_EN} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS_JA} ${STAGEDIR}${DOCSDIR}/ja
+
 .include <bsd.port.mk>
diff --git a/japanese/canna-server/distinfo b/japanese/canna-server/distinfo
index 9157d736206c..2d65b3be36d0 100644
--- a/japanese/canna-server/distinfo
+++ b/japanese/canna-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1760649197
-SHA256 (Canna37p5.tar.bz2) = 892bc8adac9fac7972dbcc6554d70054a3a36270ed1cff66b34965db1a97941c
-SIZE (Canna37p5.tar.bz2) = 1294016
+TIMESTAMP = 1778340181
+SHA256 (Canna38.tar.xz) = a29e71735cb53405d4532b5878404d2e93fdddcbf507469bb8f4f898962cafe8
+SIZE (Canna38.tar.xz) = 2060780
diff --git a/japanese/canna-server/pkg-descr b/japanese/canna-server/pkg-descr
index a5978bf8a4d4..72298a4e13b6 100644
--- a/japanese/canna-server/pkg-descr
+++ b/japanese/canna-server/pkg-descr
@@ -1,2 +1,9 @@
-Canna is a Kana-Kanji conversion server. It supports
-Mule(Multi-lingual extention Emacs), kinput2 X11 input method, etc.
+Canna is a Japanese input system available in Free Software.
+Canna provides a unified user interface for inputing Japanese.
+
+Canna supports Emacs, kinput2 and others. All of these tools can be used
+by a single customization file, romaji-to-kana conversion rules and
+conversion dictionaries, and input Japanese in the same way.
+
+Canna converts kana to kanji based on a client-server model and supports
+automatic kana-to-kanji conversion.
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index ec2eece25ea9..1ab9019c2842 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -17,7 +17,6 @@ bin/dpbindic
 bin/dpromdic
 bin/dpxdic
 bin/forcpp
-bin/forsort
 bin/kpdic
 bin/lsdic
 bin/mergeword
@@ -39,6 +38,7 @@ sbin/cannakill
 @(bin,bin,) %%DATADIR%%/dic/canna/hojoswd.ctd
 @(bin,bin,) %%DATADIR%%/dic/canna/iroha.cbd
 @(bin,bin,) %%DATADIR%%/dic/canna/iroha.cld
+@(bin,bin,) %%DATADIR%%/dic/canna/jigyosyo.cld
 @(bin,bin,) %%DATADIR%%/dic/canna/kanasmpl.ctd
 @(bin,bin,) %%DATADIR%%/dic/canna/katakana.ctd
 @(bin,bin,) %%DATADIR%%/dic/canna/keishiki.ctd
@@ -46,6 +46,8 @@ sbin/cannakill
 @(bin,bin,) %%DATADIR%%/dic/canna/number.ctd
 @(bin,bin,) %%DATADIR%%/dic/canna/software.ctd
 @(bin,bin,) %%DATADIR%%/dic/canna/suffix.ctd
+@(bin,bin,) %%DATADIR%%/dic/canna/zipcode.cbd
+@(bin,bin,) %%DATADIR%%/dic/canna/zipcode.cld
 share/man/ja/man1/addwords.1.gz
 share/man/ja/man1/cannacheck.1.gz
 share/man/ja/man1/cannakill.1.gz


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a0b3ba1.47a97.e83a27d>