CVS commit: pkgsrc/inputmethod

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/inputmethod
From: "Izumi Tsutsui" <tsutsui%netbsd.org@localhost>
Date: Tue, 30 Jun 2026 14:17:52 +0000

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Jun 30 14:17:52 UTC 2026

Modified Files:
        pkgsrc/inputmethod/canna: Makefile.common distinfo
        pkgsrc/inputmethod/canna-lib: Makefile
        pkgsrc/inputmethod/canna-server: Makefile PLIST
        pkgsrc/inputmethod/canna/patches: patch-Canna.conf patch-Imakefile
            patch-canna_widedef.h patch-canuum_canna.c patch-canuum_termcap.c
            patch-canuum_termio.c patch-cmd_cmd.tmpl patch-dic_phono_Imakefile
            patch-lib_RKC_convert.c patch-lib_RK_dd.c patch-lib_canna_lisp.c
Removed Files:
        pkgsrc/inputmethod/canna/patches: patch-canuum_Imakefile
            patch-canuum_config.h.in patch-canuum_configure
            patch-canuum_configure.in patch-canuum_jhlp.c patch-canuum_printf.c
            patch-cmd_catdic_rutil.c patch-lib_RK_ncache.c
            patch-lib_canna_keydef.c

Log Message:
canna: update to 3.8

pkgsrc changes:
- update MASTER_SITES to use github
- remove patches for posix_openpt(3) now supported by upstream
- reduce diffs for canuum and add proper descrtiptions for each patch

Upstream changes:
 https://github.com/canna-input/canna/releases/tag/release-3.8
 https://github.com/canna-input/canna/releases/tag/release-3.7p5
 https://github.com/canna-input/canna/releases/tag/release-3.7p4

Canna 3.8 (2026-05-09)

 - New dictionary: zipcode and jigyosyo
 - Removed dictionary: yubin
 - "Canuum" no longer depends on the "libspt" library

Canna 3.7p5 (2025-08-15)

 Static libraries have not been built since 3.7p4. Fixed.

Canna 3.7p4 (2025-06-09)

 Fixed build problems on today's platforms.
 Also fixed some minor bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/inputmethod/canna/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/inputmethod/canna/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/inputmethod/canna-lib/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/inputmethod/canna-server/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/inputmethod/canna-server/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/canna/patches/patch-Canna.conf \
    pkgsrc/inputmethod/canna/patches/patch-Imakefile \
    pkgsrc/inputmethod/canna/patches/patch-canuum_canna.c \
    pkgsrc/inputmethod/canna/patches/patch-canuum_termcap.c \
    pkgsrc/inputmethod/canna/patches/patch-canuum_termio.c \
    pkgsrc/inputmethod/canna/patches/patch-cmd_cmd.tmpl \
    pkgsrc/inputmethod/canna/patches/patch-lib_RKC_convert.c \
    pkgsrc/inputmethod/canna/patches/patch-lib_RK_dd.c \
    pkgsrc/inputmethod/canna/patches/patch-lib_canna_lisp.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/inputmethod/canna/patches/patch-canna_widedef.h \
    pkgsrc/inputmethod/canna/patches/patch-dic_phono_Imakefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/inputmethod/canna/patches/patch-canuum_Imakefile \
    pkgsrc/inputmethod/canna/patches/patch-canuum_config.h.in \
    pkgsrc/inputmethod/canna/patches/patch-canuum_configure \
    pkgsrc/inputmethod/canna/patches/patch-canuum_configure.in \
    pkgsrc/inputmethod/canna/patches/patch-canuum_jhlp.c \
    pkgsrc/inputmethod/canna/patches/patch-canuum_printf.c \
    pkgsrc/inputmethod/canna/patches/patch-cmd_catdic_rutil.c \
    pkgsrc/inputmethod/canna/patches/patch-lib_canna_keydef.c
cvs rdiff -u -r1.2 -r0 pkgsrc/inputmethod/canna/patches/patch-lib_RK_ncache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/canna/Makefile.common
diff -u pkgsrc/inputmethod/canna/Makefile.common:1.26 pkgsrc/inputmethod/canna/Makefile.common:1.27
--- pkgsrc/inputmethod/canna/Makefile.common:1.26       Thu Nov 27 07:00:58 2025
+++ pkgsrc/inputmethod/canna/Makefile.common    Tue Jun 30 14:17:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2025/11/27 07:00:58 wiz Exp $
+# $NetBSD: Makefile.common,v 1.27 2026/06/30 14:17:51 tsutsui Exp $
 #
 # Canna common makefile.
 #
@@ -8,13 +8,15 @@
 # used by inputmethod/canna-server/Makefile
 
 # "Pkgsrc" version.
-CANNA_VERSION= 3.7pl3
+CANNA_VERSION= 3.8
 
 DISTNAME=      Canna${CANNA_VERSION:S|.||:S|pl|p|}
 PKGNAME=       Canna-${CANNA_MODULE}-${CANNA_VERSION}
 CATEGORIES=    japanese inputmethod
-MASTER_SITES=  ${MASTER_SITE_OSDN:=canna/9565/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=canna-input/}
+GITHUB_PROJECT=        canna
+GITHUB_RELEASE=        release-${CANNA_VERSION}
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    tsutsui%NetBSD.org@localhost
 HOMEPAGE=      https://canna-input.github.io/

Index: pkgsrc/inputmethod/canna/distinfo
diff -u pkgsrc/inputmethod/canna/distinfo:1.20 pkgsrc/inputmethod/canna/distinfo:1.21
--- pkgsrc/inputmethod/canna/distinfo:1.20      Tue Oct 26 10:49:30 2021
+++ pkgsrc/inputmethod/canna/distinfo   Tue Jun 30 14:17:51 2026
@@ -1,25 +1,16 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 10:49:30 nia Exp $
+$NetBSD: distinfo,v 1.21 2026/06/30 14:17:51 tsutsui Exp $
 
-BLAKE2s (Canna37p3.tar.bz2) = e36a9f8479d9a201a030b5350bef41203879d291f4ca2c6367af59c1d4cf8050
-SHA512 (Canna37p3.tar.bz2) = 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
-Size (Canna37p3.tar.bz2) = 1263065 bytes
-SHA1 (patch-Canna.conf) = 81b46285a2b91c07b8497dc6669eb26552391a6c
-SHA1 (patch-Imakefile) = a70dee63ce9ce392b29b76df70479fee45e1a2b9
-SHA1 (patch-canna_widedef.h) = 711bc129ca58265fb7555b99f9fe7fa72bebd7fc
-SHA1 (patch-canuum_Imakefile) = 5f4e7970a92d514ec538e4591eaa4f46843654a3
-SHA1 (patch-canuum_canna.c) = a543a720fba9e2f770d6397d6b05352cfa58f300
-SHA1 (patch-canuum_config.h.in) = 98547954e459bd85e5b03fc86f34fb5d1e3eed4b
-SHA1 (patch-canuum_configure) = c08efb73bb7d93d8c539873c1337be54ed864902
-SHA1 (patch-canuum_configure.in) = a1a6a821b9e9f9baef450ad340cb57a6f20a6989
-SHA1 (patch-canuum_jhlp.c) = 1d15186608f116cc4fb3e6a9691bb1b701d8b0ec
-SHA1 (patch-canuum_printf.c) = c05ef114fae689855989d5d5eded2f734c62e12e
-SHA1 (patch-canuum_termcap.c) = 958015b3bf4e9f89703e198c1ed28d51ae3f8c4e
-SHA1 (patch-canuum_termio.c) = df9e68c8fb564ee4c4367acf6b042c253d17e525
-SHA1 (patch-cmd_catdic_rutil.c) = f9b3d866c089cc6a49d8f90c216fb27cbbc55e19
-SHA1 (patch-cmd_cmd.tmpl) = f6ec97c273aa84eb84bdd24cbe16aaf7e696e041
-SHA1 (patch-dic_phono_Imakefile) = 4e1210517317b57796cad5b350de41e1f0d8157d
-SHA1 (patch-lib_RKC_convert.c) = f196cfa3db3ef163c1869ca6bfd3f22170997aef
-SHA1 (patch-lib_RK_dd.c) = 8055a2a3902e7d4d0cc1d782295c2879311750ec
-SHA1 (patch-lib_RK_ncache.c) = e792592500e7db85a6b2370c4ea9eb533d97bda0
-SHA1 (patch-lib_canna_keydef.c) = af14140f58bf8a6214a7fb9d5d73347c1b3cdd85
-SHA1 (patch-lib_canna_lisp.c) = 0ed74a04406ab21fb88ef94b182cff2ff3c793ef
+BLAKE2s (Canna38.tar.xz) = 0055232ceb6395d99f1e7fe27933e8f10efb9b973d69ca41b375b5e9999d4f57
+SHA512 (Canna38.tar.xz) = 50f44904fe95f5893f6d18f55ec29ae55b6d35ffec9f07c44898907bfbfef1c88b47ce269767395409a4ae6a22aa2f2be7ec44fc376eb83d2feb2453233f18f0
+Size (Canna38.tar.xz) = 2060780 bytes
+SHA1 (patch-Canna.conf) = 01a5e1b323d3cf1d49498119c83db28dff93d2d5
+SHA1 (patch-Imakefile) = 71c6d9fb2b60d386c37eb5f1f3df879cb8462929
+SHA1 (patch-canna_widedef.h) = a28dfd4c546dbc91e68589721c389426098d19ef
+SHA1 (patch-canuum_canna.c) = b52a0cdce5bd3e45ad9a9adbfab5c4f6d7c6ccf1
+SHA1 (patch-canuum_termcap.c) = 38fb86a2e0385d2fe13165987c1c6842f558165d
+SHA1 (patch-canuum_termio.c) = 9b1284c3672a4fbceb85388ba544d17a17863e49
+SHA1 (patch-cmd_cmd.tmpl) = 642e3e15057fba2142ed48e0493464be978e07b2
+SHA1 (patch-dic_phono_Imakefile) = e81f1a1629751d28436e6b73266d89caba48ee15
+SHA1 (patch-lib_RKC_convert.c) = 80933aad8d831fbcda295b56eb3de965b46e8894
+SHA1 (patch-lib_RK_dd.c) = 3b050411704788fbb4908a4e0bb982955c64bf4d
+SHA1 (patch-lib_canna_lisp.c) = f944eec48d6f9c7ed797bcd41c0b9f26235446c0

Index: pkgsrc/inputmethod/canna-lib/Makefile
diff -u pkgsrc/inputmethod/canna-lib/Makefile:1.17 pkgsrc/inputmethod/canna-lib/Makefile:1.18
--- pkgsrc/inputmethod/canna-lib/Makefile:1.17  Thu Apr 20 13:25:07 2017
+++ pkgsrc/inputmethod/canna-lib/Makefile       Tue Jun 30 14:17:51 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.17 2017/04/20 13:25:07 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2026/06/30 14:17:51 tsutsui Exp $
 
-PKGREVISION=   1
 CANNA_MODULE=  lib
 
 .include "../../inputmethod/canna/Makefile.common"

Index: pkgsrc/inputmethod/canna-server/Makefile
diff -u pkgsrc/inputmethod/canna-server/Makefile:1.25 pkgsrc/inputmethod/canna-server/Makefile:1.26
--- pkgsrc/inputmethod/canna-server/Makefile:1.25       Fri Mar 23 04:43:36 2018
+++ pkgsrc/inputmethod/canna-server/Makefile    Tue Jun 30 14:17:51 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.25 2018/03/23 04:43:36 rin Exp $
+# $NetBSD: Makefile,v 1.26 2026/06/30 14:17:51 tsutsui Exp $
 
-PKGREVISION=   1
 CANNA_MODULE=  server
 
 .include "../../inputmethod/canna/Makefile.common"

Index: pkgsrc/inputmethod/canna-server/PLIST
diff -u pkgsrc/inputmethod/canna-server/PLIST:1.9 pkgsrc/inputmethod/canna-server/PLIST:1.10
--- pkgsrc/inputmethod/canna-server/PLIST:1.9   Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna-server/PLIST       Tue Jun 30 14:17:51 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2015/10/18 03:58:31 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.10 2026/06/30 14:17:51 tsutsui Exp $
 bin/addwords
 bin/canlisp
 bin/cannacheck
@@ -18,7 +18,6 @@ bin/dpbindic
 bin/dpromdic
 bin/dpxdic
 bin/forcpp
-bin/forsort
 bin/kpdic
 bin/lsdic
 bin/mergeword

Index: pkgsrc/inputmethod/canna/patches/patch-Canna.conf
diff -u pkgsrc/inputmethod/canna/patches/patch-Canna.conf:1.1 pkgsrc/inputmethod/canna/patches/patch-Canna.conf:1.2
--- pkgsrc/inputmethod/canna/patches/patch-Canna.conf:1.1       Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-Canna.conf   Tue Jun 30 14:17:51 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-Canna.conf,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-Canna.conf,v 1.2 2026/06/30 14:17:51 tsutsui Exp $
 
 - Handle pkgsrc environments
 - Enable IPv6 support
 - Fix shlib options
 
---- Canna.conf.orig    2004-05-19 15:48:47.000000000 +0000
+--- Canna.conf.orig    2026-05-09 14:08:44.000000000 +0000
 +++ Canna.conf
-@@ -109,12 +109,12 @@
+@@ -108,12 +108,12 @@
  # define DefErrDir $(cannaPrefix)/log
  # define DefLibCannaDir $(cannaExecPrefix)/lib
  #else 
@@ -21,7 +21,7 @@ $NetBSD: patch-Canna.conf,v 1.1 2015/10/
  #  define DefLibCannaDir $(cannaExecPrefix)/lib
  # endif
  #endif
-@@ -148,7 +148,7 @@ XCOMM cannaLibDir = /var/lib/canna
+@@ -147,7 +147,7 @@ XCOMM cannaLibDir = /var/lib/canna
  XCOMM cannaLibDir = /var/db/canna
  cannaLibDir = DefCannaLibDir
  XCOMM cannaManDir = $(cannaPrefix)/share/man
@@ -30,7 +30,7 @@ $NetBSD: patch-Canna.conf,v 1.1 2015/10/
  cannaIncDir = $(cannaPrefix)/include/canna
  
  libCannaDir = DefLibCannaDir
-@@ -158,7 +158,7 @@ ErrDir  = DefErrDir
+@@ -157,7 +157,7 @@ ErrDir  = DefErrDir
  #define SupportOldWchar 1
  
  /* IPv6���Ѥ������1����������� */
@@ -39,8 +39,8 @@ $NetBSD: patch-Canna.conf,v 1.1 2015/10/
  
  /* 3.2���3.6�ϤޤǤη����������Ϥ������������� */
  /* #define DIC_3_6_COMPAT */
-@@ -169,8 +169,8 @@ ErrDir  = DefErrDir
- #define ModernElfLink NO /* experimental */
+@@ -175,8 +175,8 @@ ErrDir  = DefErrDir
+ #endif
  
  
 -cannaOwner = bin
@@ -50,7 +50,7 @@ $NetBSD: patch-Canna.conf,v 1.1 2015/10/
  
  #ifdef InstallAsUser
  cannaOwnerGroup =
-@@ -235,7 +235,7 @@ cannaLight = 1
+@@ -241,7 +241,7 @@ cannaLight = 1
   * ���ޥ������󥯤����ϡ����� YES ������
   */
  /* #define UseInstalledLibCanna YES */
@@ -59,7 +59,7 @@ $NetBSD: patch-Canna.conf,v 1.1 2015/10/
  
  DicDir   = $(cannaLibDir)/dic
  
-@@ -279,9 +279,9 @@ DicDir   = $(cannaLibDir)/dic
+@@ -283,9 +283,9 @@ DicDir   = $(cannaLibDir)/dic
  
  #if UseInstalledLibCanna
  DEPCANNALIB = $(libCannaDir)/CannaDepLibraryName(canna)
@@ -71,7 +71,7 @@ $NetBSD: patch-Canna.conf,v 1.1 2015/10/
  #else
  DEPCANNALIB = $(CANNASRC)/CannaDepLibraryName(canna)
  CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
-@@ -330,7 +330,7 @@ UILIB_DEFINES = $(cannaDsoRevDef) $(CANN
+@@ -341,7 +341,7 @@ UILIB_DEFINES = $(cannaDsoRevDef) $(CANN
  SCRIPTS_DEFINES = $(CANNA_DEFINES)
  
  #ifdef JAPANESEMAN
Index: pkgsrc/inputmethod/canna/patches/patch-Imakefile
diff -u pkgsrc/inputmethod/canna/patches/patch-Imakefile:1.1 pkgsrc/inputmethod/canna/patches/patch-Imakefile:1.2
--- pkgsrc/inputmethod/canna/patches/patch-Imakefile:1.1        Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-Imakefile    Tue Jun 30 14:17:51 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-Imakefile,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-Imakefile,v 1.2 2026/06/30 14:17:51 tsutsui Exp $
 
 Explicitly install man pages.
 
 --- Imakefile.orig     2004-05-19 15:39:22.000000000 +0000
 +++ Imakefile
-@@ -166,7 +166,7 @@ instserver::
+@@ -165,7 +165,7 @@ instserver::
        for i in $(SERVERDIR) ;\
        do \
                (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
@@ -13,7 +13,7 @@ Explicitly install man pages.
        done
  
  instclient::
-@@ -174,7 +174,7 @@ instclient::
+@@ -173,7 +173,7 @@ instclient::
        for i in $(CLIENTDIR) ;\
        do \
                (cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
Index: pkgsrc/inputmethod/canna/patches/patch-canuum_canna.c
diff -u pkgsrc/inputmethod/canna/patches/patch-canuum_canna.c:1.1 pkgsrc/inputmethod/canna/patches/patch-canuum_canna.c:1.2
--- pkgsrc/inputmethod/canna/patches/patch-canuum_canna.c:1.1   Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-canuum_canna.c       Tue Jun 30 14:17:52 2026
@@ -1,47 +1,27 @@
-$NetBSD: patch-canuum_canna.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-canuum_canna.c,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
-- Appease prototype warnings.
 - Remove unnecessary ops.
+- Remove non-standard and unnecessary resetterm()
 
---- canuum/canna.c.orig        2003-09-17 08:50:52.000000000 +0000
+--- canuum/canna.c.orig        2026-05-09 14:08:44.000000000 +0000
 +++ canuum/canna.c
-@@ -52,4 +52,16 @@ static char rcsid[] = "$Id: canna.c,v 1.
+@@ -1248,10 +1248,8 @@ int flag;
  #endif
  
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#if STDC_HEADERS
-+#  include <string.h>
-+#else
-+#  if HAVE_STRINGS_H
-+#    include <strings.h>
-+#  endif
-+#endif /* STDC_HEADERS */
-+
- #include "commonhd.h"
- #include "sdefine.h"
-@@ -95,6 +107,4 @@ static char rcsid[] = "$Id: canna.c,v 1.
- #define NOREDRAW      0
- 
--extern        int     errno;
--
- static int maxmodelen;
- static int maxwidth = 0;
-@@ -1239,8 +1249,6 @@ int flag;
- 
  #ifdef TERMINFO
 -  int fd, res;
  
 -  fd = open("/dev/null", O_WRONLY, &res);
 -  setupterm(term, fd, (int *)0);
-+  setupterm(term, 0, NULL);
++  setupterm(term, STDOUT_FILENO, NULL);
  
    cannakeyentry(key_f1,    CANNA_KEY_F1);
-@@ -1271,5 +1279,4 @@ int flag;
+   cannakeyentry(key_f2,    CANNA_KEY_F2);
+@@ -1280,7 +1278,6 @@ int flag;
+   cannakeyentry(key_end,   CANNA_KEY_End);
  #endif
  
 -  resetterm();
  #endif
  
+   if (terminalname = malloc(strlen(term) + 1)) {
Index: pkgsrc/inputmethod/canna/patches/patch-canuum_termcap.c
diff -u pkgsrc/inputmethod/canna/patches/patch-canuum_termcap.c:1.1 pkgsrc/inputmethod/canna/patches/patch-canuum_termcap.c:1.2
--- pkgsrc/inputmethod/canna/patches/patch-canuum_termcap.c:1.1 Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-canuum_termcap.c     Tue Jun 30 14:17:52 2026
@@ -1,21 +1,24 @@
-$NetBSD: patch-canuum_termcap.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-canuum_termcap.c,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
-Appease warnings.
+- Use const pointers for cached terminfo capability strings initialized
+  by setupterm(3) since the strings are not modified and NetBSD exposes
+  them as const
 
---- canuum/termcap.c.orig      2004-04-26 21:48:37.000000000 +0000
+--- canuum/termcap.c.orig      2026-06-29 03:58:12.628641986 +0000
 +++ canuum/termcap.c
-@@ -64,21 +64,21 @@ int Term_RowWidth;
+@@ -63,24 +63,24 @@ int Term_RowWidth;
  /*
  char    *Term_Bell;
  */
 -char *Term_ClrScreen;
 -char *Term_ClrEofLine;
-+const char *Term_ClrScreen;
-+const char *Term_ClrEofLine;
- char *Term_CleEndScreen;
+-char *Term_CleEndScreen;
 -char *Term_ThrowCursor;
 -char *Term_StandOutStart;       /* These variables has value even if terminfo is used. see termio.c. */
 -char *Term_StandOutEnd;
++const char *Term_ClrScreen;
++const char *Term_ClrEofLine;
++const char *Term_CleEndScreen;
 +const char *Term_ThrowCursor;
 +const char *Term_StandOutStart;       /* These variables has value even if terminfo is used. see termio.c. */
 +const char *Term_StandOutEnd;
@@ -33,5 +36,10 @@ Appease warnings.
 +const char *Term_UnderScoreStart;
 +const char *Term_UnderScoreEnd;
  
- char *Term_KeyPadOn;
- char *Term_KeyPadOff;
+-char *Term_KeyPadOn;
+-char *Term_KeyPadOff;
++const char *Term_KeyPadOn;
++const char *Term_KeyPadOff;
+ #ifdef TERMCAP
+ char *Term_CursorNormal;
+ char *Term_CursorInvisible;
Index: pkgsrc/inputmethod/canna/patches/patch-canuum_termio.c
diff -u pkgsrc/inputmethod/canna/patches/patch-canuum_termio.c:1.1 pkgsrc/inputmethod/canna/patches/patch-canuum_termio.c:1.2
--- pkgsrc/inputmethod/canna/patches/patch-canuum_termio.c:1.1  Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-canuum_termio.c      Tue Jun 30 14:17:52 2026
@@ -1,23 +1,13 @@
-$NetBSD: patch-canuum_termio.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-canuum_termio.c,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
-- Appease prototype warnings.
-- Reorganize curses ops.
+- Use const pointers for cached terminfo capability strings initialized
+  by setupterm(3) since the strings are not modified and NetBSD exposes
+  them as const
+- Remove non-standard and unnecessary resetterm()
 
 --- canuum/termio.c.orig       2003-12-27 17:15:21.000000000 +0000
 +++ canuum/termio.c
-@@ -36,6 +36,11 @@
- #include <stdio.h>
- #if STDC_HEADERS
- #  include <stdlib.h>
-+#  include <string.h>
-+#else
-+#  if HAVE_STRINGS_H
-+#    include <strings.h>
-+#  endif
- #endif /* STDC_HEADERS */
- 
- #include "commonhd.h"
-@@ -51,15 +56,15 @@
+@@ -51,15 +51,15 @@
  extern int putchar ();
  
  extern char Term_Name[];
@@ -42,40 +32,6 @@ $NetBSD: patch-canuum_termio.c,v 1.1 201
  static int bold_mode_fun = 0;
  
  int
-@@ -73,7 +78,7 @@ openTermData ()
-   char errprefix[1024] = "error";
- 
-   /* for convert_key --- added by Nide 10/3 */
--  if (NULL == (cp = get_kbd_env ()) || 0 != convert_getterm (cp, (0 != verbose_option)))
-+  if (NULL == initscr() || NULL == (cp = get_kbd_env ()) || 0 != convert_getterm (cp, (0 != verbose_option)))
-     {
-       fprintf (stderr, "Cannot get keyboard information.\n");
-       return (-1);
-@@ -96,13 +101,8 @@ openTermData ()
-       return (-1);
-     }
- #endif /* CANNA */
--  setupterm (0, 1, &status);
--  /* This seems needless and causes hangs on Solaris8 + ncurses */
--  /* reset_shell_mode (); */
--  if (status != 1)
--    {
--      return (-1);
--    }
-+  reset_shell_mode();
-+
- #if defined(uniosu)
-   if (jterm < 2)
-     {                           /* kanji terminal */
-@@ -110,7 +110,7 @@ openTermData ()
-       return (-1);
-     }
- #endif /* defined(uniosu) */
--  if (save_cursor == (char *) NULL || *save_cursor == NULL || restore_cursor == (char *) NULL || *restore_cursor == NULL || change_scroll_region == (char *) NULL || *change_scroll_region == NULL)
-+  if (save_cursor == (char *) NULL || *save_cursor == 0 || restore_cursor == (char *) NULL || *restore_cursor == 0 || change_scroll_region == (char *) NULL || *change_scroll_region == 0)
-     {
-       fprintf (stderr, "Your terminal is not strong enough. Goodbye !\n");
-       return (-1);
 @@ -175,7 +175,6 @@ openTermData ()
  void
  closeTermData ()
Index: pkgsrc/inputmethod/canna/patches/patch-cmd_cmd.tmpl
diff -u pkgsrc/inputmethod/canna/patches/patch-cmd_cmd.tmpl:1.1 pkgsrc/inputmethod/canna/patches/patch-cmd_cmd.tmpl:1.2
--- pkgsrc/inputmethod/canna/patches/patch-cmd_cmd.tmpl:1.1     Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-cmd_cmd.tmpl Tue Jun 30 14:17:52 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmd_cmd.tmpl,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-cmd_cmd.tmpl,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
 Add a hook to disable installation of unnecessary commands in canna-lib
 
 --- cmd/cmd.tmpl.orig  2003-09-25 06:30:21.000000000 +0000
 +++ cmd/cmd.tmpl
-@@ -33,7 +33,9 @@ NormalProgramTarget($(TARGET),$(OBJS),$(
+@@ -32,7 +32,9 @@ NormalProgramTarget($(TARGET),$(OBJS),$(
  # else
  NormalProgramTarget($(TARGET),$(OBJS),$(DEPRKINDEPLIB),$(RKINDEPLIB),)
  # endif
Index: pkgsrc/inputmethod/canna/patches/patch-lib_RKC_convert.c
diff -u pkgsrc/inputmethod/canna/patches/patch-lib_RKC_convert.c:1.1 pkgsrc/inputmethod/canna/patches/patch-lib_RKC_convert.c:1.2
--- pkgsrc/inputmethod/canna/patches/patch-lib_RKC_convert.c:1.1        Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-lib_RKC_convert.c    Tue Jun 30 14:17:52 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_RKC_convert.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-lib_RKC_convert.c,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
 Tweak include path to build without configure in unnecessary dirs
 
 --- lib/RKC/convert.c.orig     2004-04-26 21:48:37.000000000 +0000
 +++ lib/RKC/convert.c
-@@ -30,7 +30,7 @@ static char rcs_id[] = "$Id: convert.c,v
+@@ -27,7 +27,7 @@
  #include "rkcw.h"
  #include "canna/RK.h"
  #include "rkc.h"
Index: pkgsrc/inputmethod/canna/patches/patch-lib_RK_dd.c
diff -u pkgsrc/inputmethod/canna/patches/patch-lib_RK_dd.c:1.1 pkgsrc/inputmethod/canna/patches/patch-lib_RK_dd.c:1.2
--- pkgsrc/inputmethod/canna/patches/patch-lib_RK_dd.c:1.1      Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-lib_RK_dd.c  Tue Jun 30 14:17:52 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_RK_dd.c,v 1.1 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-lib_RK_dd.c,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
 Fix "64 bit time_t on 32 bit architecture" problem.
 
 --- lib/RK/dd.c.orig   2003-09-17 08:50:52.000000000 +0000
 +++ lib/RK/dd.c
-@@ -42,6 +42,12 @@ static char rcsid[]="$Id: dd.c,v 1.5 200
+@@ -39,6 +39,12 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  
@@ -17,7 +17,7 @@ Fix "64 bit time_t on 32 bit architectur
  #define       Calloc          calloc
  #define cx_gwt                cx_extdata.ptr
  #define       STRCMP(d, s)    strcmp((char *)(d), (char *)(s))
-@@ -742,7 +748,7 @@ _RkRealizeDD(dd)
+@@ -739,7 +745,7 @@ _RkRealizeDD(dd)
    int ret = -1;
    int tmpres;
    int                 fdes;
Index: pkgsrc/inputmethod/canna/patches/patch-lib_canna_lisp.c
diff -u pkgsrc/inputmethod/canna/patches/patch-lib_canna_lisp.c:1.1 pkgsrc/inputmethod/canna/patches/patch-lib_canna_lisp.c:1.2
--- pkgsrc/inputmethod/canna/patches/patch-lib_canna_lisp.c:1.1 Sat Jul 22 17:44:40 2017
+++ pkgsrc/inputmethod/canna/patches/patch-lib_canna_lisp.c     Tue Jun 30 14:17:52 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_canna_lisp.c,v 1.1 2017/07/22 17:44:40 maya Exp $
+$NetBSD: patch-lib_canna_lisp.c,v 1.2 2026/06/30 14:17:52 tsutsui Exp $
 
 Don't provide a declaration of gets and fgets
 we're including stdio.h
 
 --- lib/canna/lisp.c.orig      2004-04-26 22:49:21.000000000 +0000
 +++ lib/canna/lisp.c
-@@ -1355,8 +1355,6 @@ int c;
+@@ -1358,8 +1358,6 @@ int c;
  static int
  tyi()
  {

Index: pkgsrc/inputmethod/canna/patches/patch-canna_widedef.h
diff -u pkgsrc/inputmethod/canna/patches/patch-canna_widedef.h:1.2 pkgsrc/inputmethod/canna/patches/patch-canna_widedef.h:1.3
--- pkgsrc/inputmethod/canna/patches/patch-canna_widedef.h:1.2  Sat Jul 22 17:53:16 2017
+++ pkgsrc/inputmethod/canna/patches/patch-canna_widedef.h      Tue Jun 30 14:17:51 2026
@@ -1,30 +1,24 @@
-$NetBSD: patch-canna_widedef.h,v 1.2 2017/07/22 17:53:16 maya Exp $
+$NetBSD: patch-canna_widedef.h,v 1.3 2026/06/30 14:17:51 tsutsui Exp $
 
-DragonFly wchar_t support.
-apple and freebsd no longer have machine/ansi.h
-freebsd probably needs sys/_types.h as it does on gcc which is the
-source of this file.
+- DragonFly wchar_t support.
+- machine/ansi.h is not necessary
 
---- canna/widedef.h.orig       2003-12-27 17:15:20.000000000 +0000
+--- canna/widedef.h.orig       2026-05-09 14:08:44.000000000 +0000
 +++ canna/widedef.h
-@@ -29,14 +29,17 @@
- 
- #ifdef __FreeBSD__
+@@ -30,12 +30,10 @@
  # include <osreldate.h>
-+# include <sys/_types.h>
  #endif
  
 -#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
--    || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
- # include <machine/ansi.h>
- #endif
- 
+-    || defined(__NetBSD__) || defined(__OpenBSD__)
+-# include <machine/ansi.h>
+-#endif
+-
 -#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
 +#if defined(__DragonFly__)
 +# include <wchar.h>
 +# define _WCHAR_T
 +#elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) \
-     || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+     || defined(__NetBSD__) || defined(__OpenBSD__)
  # ifdef _BSD_WCHAR_T_
  #  undef _BSD_WCHAR_T_
Index: pkgsrc/inputmethod/canna/patches/patch-dic_phono_Imakefile
diff -u pkgsrc/inputmethod/canna/patches/patch-dic_phono_Imakefile:1.2 pkgsrc/inputmethod/canna/patches/patch-dic_phono_Imakefile:1.3
--- pkgsrc/inputmethod/canna/patches/patch-dic_phono_Imakefile:1.2      Sun Oct 18 03:58:31 2015
+++ pkgsrc/inputmethod/canna/patches/patch-dic_phono_Imakefile  Tue Jun 30 14:17:52 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-dic_phono_Imakefile,v 1.2 2015/10/18 03:58:31 tsutsui Exp $
+$NetBSD: patch-dic_phono_Imakefile,v 1.3 2026/06/30 14:17:52 tsutsui Exp $
 
 - Tweak canna-dict dirs
 - avoid use of ${CPP} as generic preprocessor
 
 --- dic/phono/Imakefile.orig   2015-10-03 19:39:32.000000000 +0000
 +++ dic/phono/Imakefile
-@@ -27,9 +27,9 @@
+@@ -20,9 +20,9 @@
  
         ROMAJI_DIC_DEF = -DSHIFT
  
@@ -18,7 +18,7 @@ $NetBSD: patch-dic_phono_Imakefile,v 1.2
  
      KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
              lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
-@@ -54,16 +54,16 @@ AllTarget($(ROMKANA_TABLES))
+@@ -47,16 +47,16 @@ AllTarget($(ROMKANA_TABLES))
  
  #ifdef __EMX__
  .kpdef.kp:

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index