e069d8e6c6
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@.
82 lines
2.5 KiB
Text
82 lines
2.5 KiB
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 2004-05-19 15:48:47.000000000 +0000
|
|
+++ Canna.conf
|
|
@@ -109,12 +109,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
|
|
@@ -148,7 +148,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
|
|
@@ -158,7 +158,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 */
|
|
@@ -169,8 +169,8 @@ ErrDir = DefErrDir
|
|
#define ModernElfLink NO /* experimental */
|
|
|
|
|
|
-cannaOwner = bin
|
|
-cannaGroup = bin
|
|
+cannaOwner = ${CANNA_USER}
|
|
+cannaGroup = ${CANNA_GROUP}
|
|
|
|
#ifdef InstallAsUser
|
|
cannaOwnerGroup =
|
|
@@ -235,7 +235,7 @@ cannaLight = 1
|
|
* コマンド類をリンクする時は、次を YES にしてくだい。
|
|
*/
|
|
/* #define UseInstalledLibCanna YES */
|
|
-#define UseInstalledLibCanna NO
|
|
+#define UseInstalledLibCanna YES
|
|
|
|
DicDir = $(cannaLibDir)/dic
|
|
|
|
@@ -279,9 +279,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)
|
|
@@ -330,7 +330,7 @@ UILIB_DEFINES = $(cannaDsoRevDef) $(CANN
|
|
SCRIPTS_DEFINES = $(CANNA_DEFINES)
|
|
|
|
#ifdef JAPANESEMAN
|
|
-JMNLOCALE = ja
|
|
+JMNLOCALE = ja_JP.EUC
|
|
#endif
|
|
|
|
/* USE_OBSOLETE_STYLE_FILENAME を定義するための定義 */
|