(canna-*,libspt) Apply Tsutsui fix http://www.jp.netbsd.org/ja/JP/ml/ tech-pkg-ja/201510/msg00000.html.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: (canna-*,libspt) Apply Tsutsui fix http://www.jp.netbsd.org/ja/JP/ml/ tech-pkg-ja/201510/msg00000.html.
From: Makoto Fujiwara <makoto%ki.nu@localhost>
Date: Sun, 11 Oct 2015 10:43:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sun Oct 11 19:43:13 2015 +0900
Changeset:	b59f1324060a90eca146d8fb7dbb38a09fa6b484

Modified Files:
	canna-canuum/MESSAGE
	canna-canuum/Makefile
	canna-canuum/PLIST
	canna-dict/Makefile
	canna-lib/Makefile
	canna-lib/PLIST
	canna-lib/buildlink3.mk
	canna-server/INSTALL
	canna-server/MESSAGE
	canna-server/Makefile
	canna-server/PLIST
	canna/Makefile
	canna/Makefile.common
	canna/distinfo
	canna/files/canna.sh
	canna/patches/patch-canuum_termio.c
	libspt/Makefile
	libspt/distinfo
Added Files:
	canna/files/dic-phono-filter.awk
	canna/patches/patch-Canna.conf
	canna/patches/patch-Imakefile
	canna/patches/patch-canna_widedef.h
	canna/patches/patch-canuum_canna.c
	canna/patches/patch-canuum_printf.c
	canna/patches/patch-cmd_cmd.tmpl
	canna/patches/patch-dic_phono_Imakefile
	canna/patches/patch-lib_RKC_convert.c
	canna/patches/patch-lib_RK_dd.c
	canna/patches/patch-lib_RK_ncache.c
	libspt/patches/patch-Makefile.in
	libspt/patches/patch-config.h.in
	libspt/patches/patch-configure
	libspt/patches/patch-configure.ac
	libspt/patches/patch-libspt.c

Log Message:
(canna-*,libspt) Apply Tsutsui fix http://www.jp.netbsd.org/ja/JP/ml/tech-pkg-ja/201510/msg00000.html.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b59f1324060a90eca146d8fb7dbb38a09fa6b484

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

diffstat:
 canna-canuum/MESSAGE                    |  2 +-
 canna-canuum/Makefile                   | 17 +++----
 canna-canuum/PLIST                      |  2 +-
 canna-dict/Makefile                     | 13 ++----
 canna-lib/Makefile                      | 13 +++---
 canna-lib/PLIST                         |  2 +-
 canna-lib/buildlink3.mk                 |  4 +-
 canna-server/INSTALL                    |  2 +-
 canna-server/MESSAGE                    |  2 +-
 canna-server/Makefile                   |  4 +-
 canna-server/PLIST                      |  3 +-
 canna/Makefile                          |  2 +-
 canna/Makefile.common                   | 10 ++--
 canna/distinfo                          | 21 +++++----
 canna/files/canna.sh                    |  2 +-
 canna/files/dic-phono-filter.awk        | 13 ++++++
 canna/patches/patch-Canna.conf          | 82 +++++++++++++++++++++++++++++++++
 canna/patches/patch-Imakefile           | 24 ++++++++++
 canna/patches/patch-canna_widedef.h     | 18 ++++++++
 canna/patches/patch-canuum_canna.c      | 38 +++++++++++++++
 canna/patches/patch-canuum_printf.c     | 25 ++++++++++
 canna/patches/patch-canuum_termio.c     | 23 +++++++--
 canna/patches/patch-cmd_cmd.tmpl        | 16 +++++++
 canna/patches/patch-dic_phono_Imakefile | 41 +++++++++++++++++
 canna/patches/patch-lib_RKC_convert.c   | 15 ++++++
 canna/patches/patch-lib_RK_dd.c         | 28 +++++++++++
 canna/patches/patch-lib_RK_ncache.c     | 15 ++++++
 libspt/Makefile                         |  3 ++
 libspt/distinfo                         |  7 ++-
 libspt/patches/patch-Makefile.in        | 14 ++++++
 libspt/patches/patch-config.h.in        | 16 +++++++
 libspt/patches/patch-configure          | 15 ++++++
 libspt/patches/patch-configure.ac       | 15 ++++++
 libspt/patches/patch-libspt.c           | 30 ++++++++++++
 34 files changed, 479 insertions(+), 58 deletions(-)

diffs:
diff --git a/canna-canuum/MESSAGE b/canna-canuum/MESSAGE
index f92776d..e2b9b56 100644
--- a/canna-canuum/MESSAGE
+++ b/canna-canuum/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+$NetBSD: MESSAGE,v 1.2 2006/07/05 04:48:28 jlam Exp $
 
 You at least should set up key functions in ~/.canna, e.g.:
 
diff --git a/canna-canuum/Makefile b/canna-canuum/Makefile
index 96373e1..598b87f 100644
--- a/canna-canuum/Makefile
+++ b/canna-canuum/Makefile
@@ -8,20 +8,20 @@ MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
 
 INSTALLATION_DIRS=	${PKGMANDIR}/ja_JP.EUC/man1
 
-CONFIGURE_DIRS=	. canuum
-BUILD_DIRS=	canuum
+CONFIGURE_DIRS=		${WRKSRC}/canuum
 
 INSTALL_MAKE_FLAGS+=	INSTUGIDFLAGS=
 
 SPECIAL_PERMS+=	bin/canuum ${SETUID_ROOT_PERMS}
 
 .include "../../mk/curses.buildlink3.mk"
-SUBST_CLASSES+=                fix_curs
-SUBST_STAGE.fix_curs=  post-patch
-SUBST_MESSAGE.fix_curs=        Fixing curses
-SUBST_FILES.fix_curs+= canuum/Imakefile
-SUBST_SED.fix_curs+=   -e 's/TERMCAP_LIB = .*/TERMCAP_LIB = -l'${BUILDLINK_LIBNAME.curses}'/g'
+SUBST_CLASSES+=		fix_curs
+SUBST_STAGE.fix_curs=	post-patch
+SUBST_MESSAGE.fix_curs=	Fixing curses
+SUBST_FILES.fix_curs+=	canuum/Imakefile
+SUBST_SED.fix_curs+=	-e 's/TERMCAP_LIB = .*/TERMCAP_LIB = -l'${BUILDLINK_LIBNAME.curses}'/g'
 
+.include "../../wip/libspt/buildlink3.mk"
 .include "../../wip/canna-lib/buildlink3.mk"
 
 pre-configure:
@@ -30,7 +30,4 @@ pre-configure:
 	${LN} -fs ${WRKSRC}/cannaconf.h ${WRKSRC}/canuum
 	${LN} -fs ${WRKSRC}/canna/ccompat.h ${WRKSRC}/canuum
 
-.include "../../wip/canna-lib/buildlink3.mk"
-.include "../../wip/libspt/buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/canna-canuum/PLIST b/canna-canuum/PLIST
index 1efc9f9..f15c4f6 100644
--- a/canna-canuum/PLIST
+++ b/canna-canuum/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/02/20 10:34:04 obache Exp $
 bin/canuum
 man/ja_JP.EUC/man1/canuum.1
 man/man1/canuum.1
diff --git a/canna-dict/Makefile b/canna-dict/Makefile
index fd842ee..e1a208f 100644
--- a/canna-dict/Makefile
+++ b/canna-dict/Makefile
@@ -14,7 +14,6 @@ CANNA_CMD_SED_SCRIPT+=	\
 	-e 's|\(${cmd} = \).*/\(.*\)|\1${CANNASERVERBINDIR}/bin/\2|'
 .endfor
 
-CONFIGURE_DIRS=		${DICT_WRKSRC}
 DICT_WRKSRC=		${WRKSRC}/dic/ideo
 CANNA_DICTDIR=		${PREFIX}/libdata/canna
 
@@ -22,6 +21,9 @@ PKG_GROUPS=	${CANNA_GROUP}
 PKG_USERS=	${CANNA_USER}:${CANNA_GROUP}
 
 post-patch:
+	${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
+	${SED} -e 's|\(SUBDIRS = \).*|\1 canna lib/RKindep dic/ideo|' \
+		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 	@${MV} ${WRKSRC}/Canna.conf ${WRKSRC}/Canna.conf.orig
 	@${SED} -e 's|\(DicDir.*=\).*|\1${IMDICTDIR}/canna|'		\
 		${WRKSRC}/Canna.conf.orig > ${WRKSRC}/Canna.conf
@@ -30,14 +32,6 @@ post-patch:
 		${SED} ${CANNA_CMD_SED_SCRIPT} $$file.orig > $$file;	\
 	done
 
-# cannaconf.h is not automatically generated so specify explicitly.
-do-build:
-	(cd ${WRKSRC};\
-	${XMKMF};\
-	${MAKE} Makefile; \
-	${MAKE} cannaconf.h; \
-	${MAKE} canna )
-
 INSTALLATION_DIRS+=	${CANNA_DICTDIR}
 
 do-install:
@@ -79,4 +73,5 @@ REQD_DIRS_PERMS+=	${CANNA_DICTDIR} ${CANNA_USER} ${CANNA_GROUP} 0775
 SPECIAL_PERMS+=	${CANNA_DICTDIR}/${d} ${CANNA_USER} ${CANNA_GROUP} 0664
 .endfor
 
+.include "../../wip/canna-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/canna-lib/Makefile b/canna-lib/Makefile
index bcbdbc5..5e1a19f 100644
--- a/canna-lib/Makefile
+++ b/canna-lib/Makefile
@@ -14,17 +14,16 @@ post-patch:
 		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 .for f in forcpp kpdic
 	@${MV} ${WRKSRC}/cmd/${f}/Imakefile ${WRKSRC}/cmd/${f}/Imakefile.orig
-	@${SED} -e '/InstallProgram/d' ${WRKSRC}/cmd/${f}/Imakefile.orig \
+	@${SED} -e '/^#define TargetName/a\${.newline}#define DontInstallProgram' ${WRKSRC}/cmd/${f}/Imakefile.orig \
 		> ${WRKSRC}/cmd/${f}/Imakefile
 .endfor
 
+MAKE_ENV+=	AWK=${AWK:Q}
+
+post-extract:
+	${CP} ${FILESDIR}/dic-phono-filter.awk ${WRKSRC}/dic/phono/
+
 post-configure:
 	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
-# forcpp and kpdic needed for build, but not to install
-post-install:
-.for f in forcpp kpdic
-	${RM} ${DESTDIR}${PREFIX}/bin/${f}
-.endfor
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/canna-lib/PLIST b/canna-lib/PLIST
index de1ba3c..ad193a2 100644
--- a/canna-lib/PLIST
+++ b/canna-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/08/12 07:43:21 makoto Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:01:29 joerg Exp $
 include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
diff --git a/canna-lib/buildlink3.mk b/canna-lib/buildlink3.mk
index c1d57f9..2ce7eab 100644
--- a/canna-lib/buildlink3.mk
+++ b/canna-lib/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	Canna-lib
 .if !defined(CANNA_LIB_BUILDLINK3_MK)
 CANNA_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.7p3
-BUILDLINK_PKGSRCDIR.Canna-lib?=	../../wip/canna-lib
+BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.7pl3
+BUILDLINK_PKGSRCDIR.Canna-lib?=	../../inputmethod/canna-lib
 .endif # CANNA_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-Canna-lib
diff --git a/canna-server/INSTALL b/canna-server/INSTALL
old mode 100644
new mode 100755
index c794434..d80cfee
--- a/canna-server/INSTALL
+++ b/canna-server/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+# $NetBSD: INSTALL,v 1.3 2003/09/23 15:14:54 uebayasi Exp $
 
 case ${STAGE} in
 POST-INSTALL)
diff --git a/canna-server/MESSAGE b/canna-server/MESSAGE
index 2e6a6d9..f93d725 100644
--- a/canna-server/MESSAGE
+++ b/canna-server/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+$NetBSD: MESSAGE,v 1.5 2005/12/05 20:50:23 rillig Exp $
 
 If you want Canna server to boot automatically,
 
diff --git a/canna-server/Makefile b/canna-server/Makefile
index 8591ab8..e2a0b7f 100644
--- a/canna-server/Makefile
+++ b/canna-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/12 10:44:55 jperkin Exp $
 
 CANNA_MODULE=	server
 
@@ -26,7 +26,7 @@ RCD_SCRIPTS=	canna
 
 post-patch:
 	${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
-	${SED} -e 's|\(SUBDIRS = \).*|\1 canna lib server cmd doc|' \
+	${SED} -e 's|\(SUBDIRS = \).*|\1 canna lib/RK lib/RKindep server cmd doc|' \
 		-e 's|\(SERVERDIR = \).*|\1 server cmd doc|' \
 		${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
 	${MV} ${WRKSRC}/Canna.conf ${WRKSRC}/Canna.conf.orig
diff --git a/canna-server/PLIST b/canna-server/PLIST
index 319f6ee..fa738cd 100644
--- a/canna-server/PLIST
+++ b/canna-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:02 jperkin Exp $
 bin/addwords
 bin/canlisp
 bin/cannacheck
@@ -76,4 +76,3 @@ man/man1/splitword.1
 man/man1/wtoc.1
 sbin/cannakill
 sbin/cannaserver
-share/examples/rc.d/canna
diff --git a/canna/Makefile b/canna/Makefile
index 4affbae..99f8273 100644
--- a/canna/Makefile
+++ b/canna/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/20 10:39:01 obache Exp $
 
 META_PACKAGE=	yes
 
diff --git a/canna/Makefile.common b/canna/Makefile.common
index 4e40302..659e62d 100644
--- a/canna/Makefile.common
+++ b/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+# $NetBSD: Makefile.common,v 1.22 2015/06/29 11:06:47 ryoon Exp $
 #
 # Canna common makefile.
 #
@@ -8,16 +8,16 @@
 # used by wip/canna-server/Makefile
 
 # "Pkgsrc" version.
-CANNA_VERSION=	3.7p3
+CANNA_VERSION=	3.7pl3
 
 DISTNAME=	Canna${CANNA_VERSION:S|.||:S|pl|p|}
 PKGNAME=	Canna-${CANNA_MODULE}-${CANNA_VERSION}
-CATEGORIES=	inputmethod
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=canna/9565/}
+CATEGORIES=	japanese inputmethod
+MASTER_SITES=	${MASTER_SITE_OSDN:=canna/9565/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg-ja%jp.NetBSD.org@localhost
-HOMEPAGE=	http://canna.sourceforge.jp/
+HOMEPAGE=	http://canna.osdn.jp/
 COMMENT=	Kana-Kanji conversion system (${CANNA_MODULE})
 
 FILESDIR=	${.CURDIR}/../../wip/canna/files
diff --git a/canna/distinfo b/canna/distinfo
index 1866f7a..fbe9f20 100644
--- a/canna/distinfo
+++ b/canna/distinfo
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.2 2012/08/12 12:47:24 makoto Exp $
+$NetBSD: distinfo,v 1.11 2012/07/03 17:44:39 joerg Exp $
 
 SHA1 (Canna37p3.tar.bz2) = e39eece7c70c669dd46dd74b26121a60a2496fde
 RMD160 (Canna37p3.tar.bz2) = 33e5eb9e2dc144835db838612897e652acbc60ed
 Size (Canna37p3.tar.bz2) = 1263065 bytes
-SHA1 (patch-aa) = bfcbc667b1b93da39cebe31ebba86d45739c4aad
-SHA1 (patch-ab) = b203ad0cb1285ffed0037e0eced3ae298bec5eb9
-SHA1 (patch-ac) = a81a07db87d3b501dedd423e148a8e7e1d1804c4
-SHA1 (patch-ae) = 0bb5c06e6523952e6cec2188787707d69223fb16
-SHA1 (patch-af) = a3ea53da7ce38c71708031dd9c66aafad3d1bf65
-SHA1 (patch-an) = c074e4b20f8b3dae6e81e16492b90bd68e8a73ae
-SHA1 (patch-ao) = c577319f50df6624333726cd62b48d869989d881
-SHA1 (patch-canuum_termio.c) = 30e6e715872c555f6cff34729d1dddfa3ab3486e
+SHA1 (patch-Canna.conf) = 81b46285a2b91c07b8497dc6669eb26552391a6c
+SHA1 (patch-Imakefile) = a70dee63ce9ce392b29b76df70479fee45e1a2b9
+SHA1 (patch-canna_widedef.h) = c52cbbe5b55fc4fca6a501eef50fbf5bb878e514
+SHA1 (patch-canuum_canna.c) = 603f76c453258d5a0274ff02eab6ff2e42011e5a
+SHA1 (patch-canuum_printf.c) = c05ef114fae689855989d5d5eded2f734c62e12e
+SHA1 (patch-canuum_termio.c) = b361721a3805a94a820c8499c6db5a3a380293e0
+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) = f322d8b0c23e3b00b6d605ec2a044ac637a3cbfe
diff --git a/canna/files/canna.sh b/canna/files/canna.sh
index 1eaef48..346bcca 100644
--- a/canna/files/canna.sh
+++ b/canna/files/canna.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: canna.sh,v 1.1.1.1 2011/01/02 08:49:59 makoto Exp $
+# $NetBSD: canna.sh,v 1.2 2006/07/05 04:48:28 jlam Exp $
 #
 # PROVIDE: canna
 # REQUIRE: DAEMON
diff --git a/canna/files/dic-phono-filter.awk b/canna/files/dic-phono-filter.awk
new file mode 100644
index 0000000..1590c18
--- /dev/null
+++ b/canna/files/dic-phono-filter.awk
@@ -0,0 +1,13 @@
+BEGIN {
+	skip = 0
+}
+
+/^#ifdef SHIFT/ { skip = 0 }
+/^#ifdef ASCII/ { skip = 1 }
+/^#ifndef SHIFT/ { skip = 1 }
+/^#ifndef ASCII/ { skip = 0 }
+/^#else/ { skip = !skip }
+/^#endif/ { skip = 0 }
+/^#/ { next; }
+
+{ if (!skip) print }
diff --git a/canna/patches/patch-Canna.conf b/canna/patches/patch-Canna.conf
new file mode 100644
index 0000000..ff95237
--- /dev/null
+++ b/canna/patches/patch-Canna.conf
@@ -0,0 +1,82 @@
+$NetBSD$
+
+- 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�Ϥ���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
+  * ���ޥ�����������ϡ�����S �ˤ��Ƥ������
+  */
+ /* #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 �����뤿�����*/
diff --git a/canna/patches/patch-Imakefile b/canna/patches/patch-Imakefile
new file mode 100644
index 0000000..2bb2591
--- /dev/null
+++ b/canna/patches/patch-Imakefile
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Explicitly install man pages.
+
+--- Imakefile.orig	2004-05-19 15:39:22.000000000 +0000
++++ Imakefile
+@@ -166,7 +166,7 @@ instserver::
+ 	for i in $(SERVERDIR) ;\
+ 	do \
+ 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+-		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ 	done
+ 
+ instclient::
+@@ -174,7 +174,7 @@ instclient::
+ 	for i in $(CLIENTDIR) ;\
+ 	do \
+ 		(cd $$i ; echo "installing" "in $(CURRENT_DIR)/$$i..."; \
+-		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install); \
++		$(MAKE) $(MFLAGS) DESTDIR='$(DESTDIR)' install install.man); \
+ 	done
+ 
+ instsgs::
diff --git a/canna/patches/patch-canna_widedef.h b/canna/patches/patch-canna_widedef.h
new file mode 100644
index 0000000..ee4d6e1
--- /dev/null
+++ b/canna/patches/patch-canna_widedef.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2005/12/29 15:29:12 joerg Exp $
+
+DragonFly wchar_t support.
+
+--- canna/widedef.h.orig	2003-12-27 17:15:20.000000000 +0000
++++ canna/widedef.h
+@@ -36,7 +36,10 @@
+ # 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__)
+ # ifdef _BSD_WCHAR_T_
+ #  undef _BSD_WCHAR_T_
diff --git a/canna/patches/patch-canuum_canna.c b/canna/patches/patch-canuum_canna.c
new file mode 100644
index 0000000..a007574
--- /dev/null
+++ b/canna/patches/patch-canuum_canna.c
@@ -0,0 +1,38 @@
+$NetBSD: patch-an,v 1.2 2011/12/07 16:05:59 roy Exp $
+
+- Appease prototype warnings.
+- Remove unnecessary ops.
+
+--- canuum/canna.c.orig	2003-09-17 08:50:52.000000000 +0000
++++ canuum/canna.c
+@@ -52,4 +52,16 @@ static char rcsid[] = "$Id: canna.c,v 1.
+ #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;
+@@ -1271,5 +1281,5 @@ int flag;
+ #endif
+ 
+-  resetterm();
++  reset_shell_mode();
+ #endif
+ 
diff --git a/canna/patches/patch-canuum_printf.c b/canna/patches/patch-canuum_printf.c
new file mode 100644
index 0000000..54baaf1
--- /dev/null
+++ b/canna/patches/patch-canuum_printf.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Appease prototype warnings.
+
+--- canuum/printf.c.orig	2003-01-04 07:31:02.000000000 +0000
++++ canuum/printf.c
+@@ -29,8 +29,18 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
+ 
+ #include <stdio.h>
++#if STDC_HEADERS
++#  include <string.h>
++#else
++#  if HAVE_STRINGS_H
++#    include <strings.h>
++#  endif
++#endif /* STDC_HEADERS */
+ #include "commonhd.h"
+ #include "sdefine.h"
+ #include "sheader.h"
diff --git a/canna/patches/patch-canuum_termio.c b/canna/patches/patch-canuum_termio.c
index 3da80b5..672493d 100644
--- a/canna/patches/patch-canuum_termio.c
+++ b/canna/patches/patch-canuum_termio.c
@@ -1,6 +1,23 @@
---- canuum/termio.c.orig	2003-12-28 02:15:21.000000000 +0900
-+++ canuum/termio.c	2012-08-12 17:49:02.000000000 +0900
-@@ -175,7 +175,6 @@
+$NetBSD: patch-ap,v 1.1 2011/12/07 16:05:59 roy Exp $
+
+- Appease prototype warnings.
+- Remove unnecessary ops.
+
+--- 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"
+@@ -175,7 +180,6 @@ openTermData ()
  void
  closeTermData ()
  {
diff --git a/canna/patches/patch-cmd_cmd.tmpl b/canna/patches/patch-cmd_cmd.tmpl
new file mode 100644
index 0000000..4379c66
--- /dev/null
+++ b/canna/patches/patch-cmd_cmd.tmpl
@@ -0,0 +1,16 @@
+$NetBSD$
+
+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),$(
+ # else
+ NormalProgramTarget($(TARGET),$(OBJS),$(DEPRKINDEPLIB),$(RKINDEPLIB),)
+ # endif
++# ifndef DontInstallProgram
+ InstallProgram($(TARGET),$(cannaBinDir))
++# endif
+ # ifdef ManSrcName
+ InstallManPageLong(ManSrcName,$(cannaManDir),$(TARGET))
+ # endif
diff --git a/canna/patches/patch-dic_phono_Imakefile b/canna/patches/patch-dic_phono_Imakefile
new file mode 100644
index 0000000..0e41f9a
--- /dev/null
+++ b/canna/patches/patch-dic_phono_Imakefile
@@ -0,0 +1,41 @@
+$NetBSD: patch-dic_phono_Imakefile,v 1.1 2012/07/03 17:44:39 joerg 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 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++            SAMPLEDIR = $(DicDir)/sample
++         SAMPLESRCDIR = $(DicDir)/sample/src
+ 
+     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))
+ 
+ #ifdef __EMX__
+ .kpdef.kp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > $@
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk | tee ${.TARGET}.after |$(FORCPP) -8 | $(KPDIC) > $@
+ 
+ .kpdef.cbp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > $@
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > $@
+ #else
+ .kpdef.kp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.kp
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.kp
+ 
+ .kpdef.cbp:
+-	$(FORCPP) -7 < $< | $(CPP) $(ROMAJI_DIC_DEF) | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.cbp
++	$(FORCPP) -7 < $< | tee ${.TARGET}.before | ${AWK} -f dic-phono-filter.awk  | tee ${.TARGET}.after | $(FORCPP) -8 | $(KPDIC) > `basename $< '.kpdef'`.cbp
+ #endif
+ 
+ MakeDirectories(install,$(DICDIR))
diff --git a/canna/patches/patch-lib_RKC_convert.c b/canna/patches/patch-lib_RKC_convert.c
new file mode 100644
index 0000000..56a667b
--- /dev/null
+++ b/canna/patches/patch-lib_RKC_convert.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2003/05/31 07:24:42 uebayasi 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
+ #include "rkcw.h"
+ #include "canna/RK.h"
+ #include "rkc.h"
+-#include "IRproto.h"
++#include "../server/IRproto.h"
+ #include "RKindep/file.h"
+ 
+ #include <sys/types.h>
diff --git a/canna/patches/patch-lib_RK_dd.c b/canna/patches/patch-lib_RK_dd.c
new file mode 100644
index 0000000..2a6f087
--- /dev/null
+++ b/canna/patches/patch-lib_RK_dd.c
@@ -0,0 +1,28 @@
+$NetBSD$
+
+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
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#ifdef HAVE_TIME_T
++#define TIME_T time_t
++#else
++#define TIME_T long
++#endif
++
+ #define	Calloc		calloc
+ #define cx_gwt		cx_extdata.ptr
+ #define	STRCMP(d, s)	strcmp((char *)(d), (char *)(s))
+@@ -742,7 +748,7 @@ _RkRealizeDD(dd)
+   int ret = -1;
+   int tmpres;
+   int			fdes;
+-  long		tloc;
++  TIME_T		tloc;
+ #ifdef __EMX__
+   struct stat		statbuf;
+ #endif
diff --git a/canna/patches/patch-lib_RK_ncache.c b/canna/patches/patch-lib_RK_ncache.c
new file mode 100644
index 0000000..ddb7947
--- /dev/null
+++ b/canna/patches/patch-lib_RK_ncache.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2008/09/18 12:33:44 taca Exp $
+
+Fix crash problem of cannaserver.
+
+--- lib/RK/ncache.c.orig	2003-09-17 08:50:52.000000000 +0000
++++ lib/RK/ncache.c
+@@ -27,7 +27,7 @@ static char rcsid[]="$Id: ncache.c,v 1.2
+ #include	"RKintern.h"
+ 
+ #define	NCHASH		101
+-#define	hash(x)		((int)((x)%NCHASH))
++#define	hash(x)		((int)(((unsigned long)(x))%NCHASH))
+ 
+ static struct ncache	Nchash[NCHASH];
+ static struct ncache	Ncfree;
diff --git a/libspt/Makefile b/libspt/Makefile
index f02791f..c130439 100644
--- a/libspt/Makefile
+++ b/libspt/Makefile
@@ -10,10 +10,13 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	tech-pkg-ja%jp.NetBSD.org@localhost
 HOMEPAGE=	http://www.j10n.org/libspt/
 COMMENT=	Provide unpriviliged secure pty
+LICENSE=	2-clause-bsd
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=  yes
 
+MAKE_ENV+=	SHELL=${SH}
+
 SPECIAL_PERMS=	libexec/sptagent root wheel 4755
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libspt/distinfo b/libspt/distinfo
index e978f81..4eb3ba9 100644
--- a/libspt/distinfo
+++ b/libspt/distinfo
@@ -3,5 +3,8 @@ $NetBSD: distinfo,v 1.1.1.1 2010/12/31 16:21:21 makoto Exp $
 SHA1 (libspt-1.1.tar.bz2) = bbeeea6ce87e2d51871194106bb181ab6397e487
 RMD160 (libspt-1.1.tar.bz2) = e2a57706fffcd2cda327f24ea0007ae89de749bc
 Size (libspt-1.1.tar.bz2) = 165168 bytes
-SHA1 (patch-aa) = 5df72121fa55cc2fb9ce89ab5b245a8b6ebd1281
-SHA1 (patch-ab) = 90cefabcb05b5d7f89756636fec327b54b66737f
+SHA1 (patch-Makefile.in) = 90cefabcb05b5d7f89756636fec327b54b66737f
+SHA1 (patch-config.h.in) = c8c84edb9fd253c2fc6b5f894c991965ee31ae6f
+SHA1 (patch-configure) = adf30954e0f03f01dccaab83d7725863a581d086
+SHA1 (patch-configure.ac) = 1c897e57d0b9b960763d17865233e32be321714d
+SHA1 (patch-libspt.c) = 3d6c0887ec010ff3ae23838cdc531024aca2efe6
diff --git a/libspt/patches/patch-Makefile.in b/libspt/patches/patch-Makefile.in
new file mode 100644
index 0000000..bfb268d
--- /dev/null
+++ b/libspt/patches/patch-Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/12/31 16:21:21 makoto Exp $
+To convert user-destdir support, put in SPECIAL_PERMS instead
+
+--- Makefile.in~	2003-12-07 15:42:15.000000000 +0900
++++ Makefile.in	2011-01-01 00:10:50.000000000 +0900
+@@ -48,7 +48,7 @@
+ AGENTOBJS = sptagent.o sptconn.$lo cfuncs.$lo
+ LIBOBJS = libspt.$lo sptconn.$lo cfuncs.$lo error.$lo utilapi.$lo termios.$lo
+ OBJS = test.o $(LIBOBJS)
+-AGENT_MODE = -m 4755 -o root -g wheel
++AGENT_MODE =
+ 
+ .SUFFIXES: .c .o .cc .lo
+ .c.lo:
diff --git a/libspt/patches/patch-config.h.in b/libspt/patches/patch-config.h.in
new file mode 100644
index 0000000..84913ff
--- /dev/null
+++ b/libspt/patches/patch-config.h.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Explicitly check isastream(3) for SVR4 in libspt.c.
+
+--- config.h.in.orig	2003-12-12 09:09:00.000000000 +0000
++++ config.h.in
+@@ -45,6 +45,9 @@
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
++/* Define to 1 if you have the `isastream' function. */
++#undef HAVE_ISASTREAM
++
+ /* Define to 1 if you have the <lastlog.h> header file. */
+ #undef HAVE_LASTLOG_H
+ 
diff --git a/libspt/patches/patch-configure b/libspt/patches/patch-configure
new file mode 100644
index 0000000..cdfbc7a
--- /dev/null
+++ b/libspt/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Explicitly check isastream(3) for SVR4 in libspt.c.
+
+--- configure.orig	2003-12-12 09:09:41.000000000 +0000
++++ configure
+@@ -9035,7 +9035,7 @@ fi
+ 
+ 
+ 
+-for ac_func in dup2 ftruncate gettimeofday select strcspn strstr strchr memcpy bzero setutent setutxent updwtmp updwtmpx _openpty revoke getsid setsid setpgrp snprintf sigaction cfmakeraw
++for ac_func in dup2 ftruncate gettimeofday select strcspn strstr strchr memcpy bzero setutent setutxent updwtmp updwtmpx _openpty revoke getsid setsid setpgrp snprintf sigaction cfmakeraw isastream
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/libspt/patches/patch-configure.ac b/libspt/patches/patch-configure.ac
new file mode 100644
index 0000000..4f953a8
--- /dev/null
+++ b/libspt/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Explicitly check isastream(3) for SVR4 in libspt.c.
+
+--- configure.ac.orig	2003-12-12 07:09:40.000000000 +0000
++++ configure.ac
+@@ -54,7 +54,7 @@ fi
+ AC_FUNC_STAT
+ AC_CHECK_FUNCS([dup2 ftruncate gettimeofday select strcspn strstr]dnl
+ [ strchr memcpy bzero setutent setutxent updwtmp updwtmpx _openpty revoke getsid]dnl
+-[ setsid setpgrp snprintf sigaction cfmakeraw])
++[ setsid setpgrp snprintf sigaction cfmakeraw isastream])
+ AC_SEARCH_LIBS([xdr_free],[nsl rpclib])
+ AC_SEARCH_LIBS([socket],[socket])
+ AC_SEARCH_LIBS([nanosleep],[posix4])
diff --git a/libspt/patches/patch-libspt.c b/libspt/patches/patch-libspt.c
new file mode 100644
index 0000000..2ee998f
--- /dev/null
+++ b/libspt/patches/patch-libspt.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/12/31 16:21:21 makoto Exp $
+
+- Explicitly check isastream(3) for SVR4 and enable it.
+- Fix typo.
+
+--- libspt.c.orig	2003-12-12 07:36:35.000000000 +0000
++++ libspt.c
+@@ -7,8 +7,8 @@
+ #include <time.h>
+ #include <stdio.h>  /* for perror() */
+ #include <signal.h>
+-#ifdef HAVE_PTY_SVR4
+-#include <sys/stropts.h>
++#if defined(HAVE_PTY_SVR4) && defined(HAVE_ISASTREAM)
++#include <stropts.h>
+ #endif
+ 
+ struct spt_handle_tag {
+@@ -467,10 +467,8 @@ spt_init_slavefd(const spt_handle *phand
+ {
+     /* XXX: screen requires !linux, !sgi, !__osf__ and !M_UNIX */
+ #if defined(HAVE_PTY_SVR4) && defined(I_PUSH)
+-#if 0	/* only rxvt and mlterm do this */
+ #ifdef HAVE_ISASTREAM
+-    if (isastram(slavefd))
+-#endif
++    if (isastream(slavefd))
+ #endif
+     {
+ 	/*
Prev by Date: (canna-lib/buildlink3.mk) correction inputmethod/ to wip/
Next by Date: mozart: Import wip/mozart as mozart-1.4.0
Previous by Thread: (canna-lib/buildlink3.mk) correction inputmethod/ to wip/
Next by Thread: mozart: Import wip/mozart as mozart-1.4.0
Indexes:
Home | Main Index | Thread Index | Old Index