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@.

3 files changed, 11 insertions, 10 deletions

diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index a1c60a6a953..a50d41c7389 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 14:25:10 asau Exp $
+# $NetBSD: Makefile,v 1.15 2015/10/18 03:58:31 tsutsui Exp $
 
-PKGREVISION=	3
 CANNA_MODULE=	lib
 
 .include "../../inputmethod/canna/Makefile.common"
@@ -15,7 +14,7 @@ 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
 
diff --git a/inputmethod/canna-lib/PLIST b/inputmethod/canna-lib/PLIST
index 44715e01f3d..e336530ee11 100644
--- a/inputmethod/canna-lib/PLIST
+++ b/inputmethod/canna-lib/PLIST
@@ -1,24 +1,26 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:01:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/10/18 03:58:31 tsutsui Exp $
 include/canna/RK.h
 include/canna/jrkanji.h
 include/canna/keydef.h
 include/canna/mfdef.h
+include/canna/pubconf.h
+include/canna/sysdep.h
 lib/libRKC.a
 lib/libRKC.so
 lib/libRKC.so.1
-lib/libRKC.so.1.1
+lib/libRKC.so.1.2
 lib/libRKC16.a
 lib/libRKC16.so
 lib/libRKC16.so.1
-lib/libRKC16.so.1.1
+lib/libRKC16.so.1.2
 lib/libcanna.a
 lib/libcanna.so
 lib/libcanna.so.1
-lib/libcanna.so.1.1
+lib/libcanna.so.1.2
 lib/libcanna16.a
 lib/libcanna16.so
 lib/libcanna16.so.1
-lib/libcanna16.so.1.1
+lib/libcanna16.so.1.2
 man/ja_JP.EUC/man3/RkBgnBun.3
 man/ja_JP.EUC/man3/RkCloseRoma.3
 man/ja_JP.EUC/man3/RkCvtEuc.3
diff --git a/inputmethod/canna-lib/buildlink3.mk b/inputmethod/canna-lib/buildlink3.mk
index b840c1510e5..b0a51e6ed87 100644
--- a/inputmethod/canna-lib/buildlink3.mk
+++ b/inputmethod/canna-lib/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:46 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/10/18 03:58:31 tsutsui Exp $
 
 BUILDLINK_TREE+=	Canna-lib
 
 .if !defined(CANNA_LIB_BUILDLINK3_MK)
 CANNA_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.6pl4
+BUILDLINK_API_DEPENDS.Canna-lib+=	Canna-lib>=3.7pl3
 BUILDLINK_PKGSRCDIR.Canna-lib?=	../../inputmethod/canna-lib
 .endif # CANNA_LIB_BUILDLINK3_MK