head 1.2; access; symbols pkgsrc-2026Q2:1.1.0.86 pkgsrc-2026Q2-base:1.1 pkgsrc-2026Q1:1.1.0.84 pkgsrc-2026Q1-base:1.1 pkgsrc-2025Q4:1.1.0.82 pkgsrc-2025Q4-base:1.1 pkgsrc-2025Q3:1.1.0.80 pkgsrc-2025Q3-base:1.1 pkgsrc-2025Q2:1.1.0.78 pkgsrc-2025Q2-base:1.1 pkgsrc-2025Q1:1.1.0.76 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.74 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.72 pkgsrc-2024Q3-base:1.1 pkgsrc-2024Q2:1.1.0.70 pkgsrc-2024Q2-base:1.1 pkgsrc-2024Q1:1.1.0.68 pkgsrc-2024Q1-base:1.1 pkgsrc-2023Q4:1.1.0.66 pkgsrc-2023Q4-base:1.1 pkgsrc-2023Q3:1.1.0.64 pkgsrc-2023Q3-base:1.1 pkgsrc-2023Q2:1.1.0.62 pkgsrc-2023Q2-base:1.1 pkgsrc-2023Q1:1.1.0.60 pkgsrc-2023Q1-base:1.1 pkgsrc-2022Q4:1.1.0.58 pkgsrc-2022Q4-base:1.1 pkgsrc-2022Q3:1.1.0.56 pkgsrc-2022Q3-base:1.1 pkgsrc-2022Q2:1.1.0.54 pkgsrc-2022Q2-base:1.1 pkgsrc-2022Q1:1.1.0.52 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.50 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.48 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.46 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.44 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.42 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.40 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.36 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.16 pkgsrc-2020Q1-base:1.1 pkgsrc-2019Q4:1.1.0.38 pkgsrc-2019Q4-base:1.1 pkgsrc-2019Q3:1.1.0.34 pkgsrc-2019Q3-base:1.1 pkgsrc-2019Q2:1.1.0.32 pkgsrc-2019Q2-base:1.1 pkgsrc-2019Q1:1.1.0.30 pkgsrc-2019Q1-base:1.1 pkgsrc-2018Q4:1.1.0.28 pkgsrc-2018Q4-base:1.1 pkgsrc-2018Q3:1.1.0.26 pkgsrc-2018Q3-base:1.1 pkgsrc-2018Q2:1.1.0.24 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.22 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.20 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.18 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.14 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.12 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.10 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.8 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.6 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.4 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.2 pkgsrc-2015Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2026.06.30.14.17.51; author tsutsui; state Exp; branches; next 1.1; commitid FNFif24POdoNuPLG; 1.1 date 2015.10.18.03.58.31; author tsutsui; state Exp; branches; next ; commitid oYpfg0VCy8eAGxFy; desc @@ 1.2 log @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. @ text @$NetBSD: patch-Canna.conf,v 1.1 2015/10/18 03:58:31 tsutsui Exp $ - Handle pkgsrc environments - Enable IPv6 support - Fix shlib options --- Canna.conf.orig 2026-05-09 14:08:44.000000000 +0000 +++ Canna.conf @@@@ -108,12 +108,12 @@@@ # define DefErrDir $(cannaPrefix)/log # define DefLibCannaDir $(cannaExecPrefix)/lib #else -# define DefCannaPrefix /usr/local/canna +# define DefCannaPrefix ${PREFIX} # ifdef ObsoleteInstallDir # define DefErrDir /usr/spool/canna # define DefLibCannaDir /usr/lib # else -# define DefErrDir /var/log +# define DefErrDir ${CANNA_SPOOL} # define DefLibCannaDir $(cannaExecPrefix)/lib # endif #endif @@@@ -147,7 +147,7 @@@@ XCOMM cannaLibDir = /var/lib/canna XCOMM cannaLibDir = /var/db/canna cannaLibDir = DefCannaLibDir XCOMM cannaManDir = $(cannaPrefix)/share/man -cannaManDir = $(cannaPrefix)/man +cannaManDir = $(cannaPrefix)/$(PKGMANDIR) cannaIncDir = $(cannaPrefix)/include/canna libCannaDir = DefLibCannaDir @@@@ -157,7 +157,7 @@@@ ErrDir = DefErrDir #define SupportOldWchar 1 /* IPv6を用いる場合は1と定義してください */ -#define UseInet6 0 /* requires newer IPv6 implementation */ +#define UseInet6 1 /* requires newer IPv6 implementation */ /* 3.2系から3.6系までの形式の辞書を作る場合はこれを定義してください */ /* #define DIC_3_6_COMPAT */ @@@@ -175,8 +175,8 @@@@ ErrDir = DefErrDir #endif -cannaOwner = bin -cannaGroup = bin +cannaOwner = ${CANNA_USER} +cannaGroup = ${CANNA_GROUP} #ifdef InstallAsUser cannaOwnerGroup = @@@@ -241,7 +241,7 @@@@ cannaLight = 1 * コマンド類をリンクする時は、次を YES にしてくだい。 */ /* #define UseInstalledLibCanna YES */ -#define UseInstalledLibCanna NO +#define UseInstalledLibCanna YES DicDir = $(cannaLibDir)/dic @@@@ -283,9 +283,9 @@@@ DicDir = $(cannaLibDir)/dic #if UseInstalledLibCanna DEPCANNALIB = $(libCannaDir)/CannaDepLibraryName(canna) -CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB) +CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB) DEPCANNALIB16 = $(libCannaDir)/CannaDepLibraryName(canna16) -CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB) +CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB) #else DEPCANNALIB = $(CANNASRC)/CannaDepLibraryName(canna) CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB) @@@@ -341,7 +341,7 @@@@ UILIB_DEFINES = $(cannaDsoRevDef) $(CANN SCRIPTS_DEFINES = $(CANNA_DEFINES) #ifdef JAPANESEMAN -JMNLOCALE = ja +JMNLOCALE = ja_JP.EUC #endif /* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */ @ 1.1 log @Update canna packages to 3.7pl3. pkgsrc changes: - reorganize patch filenames for maintainability - patch-ac is also merged into existing patch-dic_phono_Imakefile - fix a missed 64 bit time_t issue in libRK - add a hook in cmd.tmpl to disable installation of cmd/forcpp and cmd/kpdic in canna-lib - tweak SUBDIRS patches in Makefiles to avoid unnecessary builds for each packages - pull various updates to canuum from the original FreeWnn's uum, including posix_openpt(3) support, and disable the default but obsolete libspt support - reorganize curses(3) ops in canuum per curses(3) documents - fix misc compiler warnings - take maintainership Upstream changes: All changes are noted in ChangeLog and CHANGES.jp in distfile. I won't bother to quote ~1700 line ChangeLogs here, because this latest 3.7pl3 was released on 2004/05/20 and the previous 3.6pl4 was 2003/09/22. Highlight points are: - binary dictionary format is changed - shlib versions are bumped to 1.2 from 1.1 - new APIs for wchar - experimental 64 bit architecture support - IPv6 support Both server and clients (canuum and mule-1.1) are tested on NetBSD/i386 7.0, NetBSD/amd64 7.0, and NetBSD/luna68k 7.0. Also thanks to Nobuyoshi SATO, for his initial patch posted to tech-pkg-ja@@. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 --- Canna.conf.orig 2004-05-19 15:48:47.000000000 +0000 d9 1 a9 1 @@@@ -109,12 +109,12 @@@@ d24 1 a24 1 @@@@ -148,7 +148,7 @@@@ XCOMM cannaLibDir = /var/lib/canna d33 1 a33 1 @@@@ -158,7 +158,7 @@@@ ErrDir = DefErrDir d42 2 a43 2 @@@@ -169,8 +169,8 @@@@ ErrDir = DefErrDir #define ModernElfLink NO /* experimental */ d53 1 a53 1 @@@@ -235,7 +235,7 @@@@ cannaLight = 1 d62 1 a62 1 @@@@ -279,9 +279,9 @@@@ DicDir = $(cannaLibDir)/dic d74 1 a74 1 @@@@ -330,7 +330,7 @@@@ UILIB_DEFINES = $(cannaDsoRevDef) $(CANN @