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 @@ -1,33 +1,35 @@ PORTNAME= canna PORTVERSION= 3.7p5 CATEGORIES= japanese MASTER_SITES= https://github.com/canna-input/canna/releases/download/release-${PORTVERSION}/ PKGNAMESUFFIX= -server DISTNAME= Canna${PORTVERSION:S/.//g} MAINTAINER= mce@FreeBSD.org COMMENT= Kana-to-Kanji conversion system, binary part WWW= https://canna-input.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT 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 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 .include 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,43 +1,43 @@ ---- 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 # define DefLibCannaDir $(cannaExecPrefix)/lib #else -# define DefCannaPrefix /usr/local/canna +PREFIX?= /usr/local +# define DefCannaPrefix $(PREFIX) # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna # define DefLibCannaDir /usr/lib @@ -148,7 +149,7 @@ XCOMM cannaManDir = $(cannaPrefix)/share/man XCOMM cannaLibDir = /var/db/canna cannaLibDir = DefCannaLibDir XCOMM cannaManDir = $(cannaPrefix)/share/man -cannaManDir = $(cannaPrefix)/man +cannaManDir = $(cannaPrefix)/share/man cannaIncDir = $(cannaPrefix)/include/canna libCannaDir = DefLibCannaDir -@@ -175,7 +176,7 @@ cannaOwnerGroup = +@@ -182,7 +183,7 @@ cannaOwnerGroup = #ifdef InstallAsUser cannaOwnerGroup = #else -cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup) +cannaOwnerGroup = #endif - cannaDsoRev = 1.2 -@@ -199,9 +200,9 @@ CHMOD = : + cannaShLibMajor = 1 +@@ -206,9 +207,9 @@ CHMOD = : CHGRP = : CHMOD = : #else -CHOWN = chown -CHGRP = chgrp -CHMOD = chmod +CHOWN = : +CHGRP = : +CHMOD = : #endif /* 日本語マニュアルを使わないのであればコメントアウト */ 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,15 +1,15 @@ ---- 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 = . -SERVERDIR = server dic/phono dic/ideo -CLIENTDIR = cmd dic/phono misc -SGSDIR = canna lib +SERVERDIR = server dic/ideo +CLIENTDIR = cmd +SGSDIR = canna lib dic/phono misc MOSTDIR = lib canna server cmd dic/phono misc doc install:: mkbindir mklibdir mkdicdir mkerrdir 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,11 +1,11 @@ ---- 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" - DEFINES = $(SIGNAL_DEFINES) $(ENGINE_DEFS) + DEFINES = $(SIGNAL_DEFINES) $(ENGINE_DEFS) -DUSE_VARARGS INCLUDES = -I$(CANNAROOT)/include SRCS = can.c rutil.c RKdelline.c OBJS = can.o rutil.o RKdelline.o 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,11 +1,11 @@ ---- 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 + ゆ -#else/* ASCII */ +#else /* ASCII */ : ゆ #endif /* ASCII */ G よ 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,15 +1,15 @@ ---- 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); - if ( mkdir( IR_UNIX_DIR, 0777 ) == -1 && + if ( mkdir( IR_UNIX_DIR, 0755 ) == -1 && errno != EEXIST ) { ir_debug( Dmsg(5, "Can't open %s error No. %d\n",IR_UNIX_DIR, errno)); } + if (RkiStrlcpy(unaddr->sun_path, IR_UNIX_PATH, sockpathmax) >= sockpathmax) { ir_debug( Dmsg(5, "Path to socket is too long\n")); goto last; 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,12 +1,12 @@ [ { type: install message: <