Import of pkgsrc-2016Q3

inputmethod/canna-lib/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 14:25:10 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/10/25 12:17:36 tsutsui Exp $
 
-PKGREVISION=	3
+PKGREVISION=	1
 CANNA_MODULE=	lib
 
 .include "../../inputmethod/canna/Makefile.common"
@@ -15,7 +15,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
 

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

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