Update skk to 14.2. pkg/44486 by Ryo ONODERA.

Random summary of changes:

14.2
- Support multiple dictionaries.
- Support "tooltip".
- Support UNICODE display.
- Support face colors.
- Support character input by code number.
- Improve JIX X 0213 support.

14.1
- Support CDB directly.
- Improve info.
- Improve dynamic completion.
- Display character code.
- Various conversion improvements.

3 files changed, 40 insertions, 31 deletions

diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index e784326e498..e1fa63316ba 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/07/31 08:45:09 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/02/03 14:42:53 uebayasi Exp $
 #
 
-DISTNAME=	ddskk-14.0.91
+DISTNAME=	ddskk-14.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/}
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
@@ -17,7 +17,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS=	ddskk-[0-9]*
 
 EMACS_MODULES+=	base leim
-EMACS_BUILDLINK=# defined
+EMACS_BUILDLINK=YES
+
+EMACS_VERSIONS_ACCEPTED=	emacs24 emacs23 emacs22 emacs22nox \
+				emacs21 emacs21nox
 
 MAKE_FLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_ENV=	prefix=${DESTDIR:Q}${PREFIX:Q} \
@@ -25,7 +28,7 @@ MAKE_ENV=	prefix=${DESTDIR:Q}${PREFIX:Q} \
 		EMACS_LISPPREFIX=${DESTDIR:Q}${EMACS_LISPPREFIX:Q}
 BUILD_TARGET=	elc
 
-INFO_FILES=	# PLIST
+INFO_FILES=	YES
 
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
@@ -35,14 +38,22 @@ SUBST_SED.fix-paths=		-e 's,@TUT@,${PREFIX}/share/skk/SKK.tut,g'
 
 # Substitute directory definitions during do-configure.
 post-extract:
-	@${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig
-	@${CP} ${FILESDIR}/SKK-CFG ${WRKSRC}
-	@${CHMOD} +w ${WRKSRC}/skk-dic.* ${WRKSRC}/doc/skk.texi
+	set -e; \
+	${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig; \
+	${CP} ${FILESDIR}/SKK-CFG ${WRKSRC}
 
 .include "options.mk"
 
 .include "../../editors/emacs/modules.mk"
 
-.include "../../devel/apel/buildlink3.mk"
+PLIST_VARS+=	jisx0213
+
+.if ${EMACS_VERSION_MAJOR} >= 23 || ${EMACS_VERSION_MAJOR} == 21
+PLIST.jisx0213=	yes
+.endif
+
+.if ${EMACS_VERSION_MAJOR} == 21
+.  include "../../devel/apel/buildlink3.mk"
+.endif
 .include "../../editors/mule-ucs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skk/PLIST b/inputmethod/skk/PLIST
index 5d1810561d9..b37d623c1d0 100644
--- a/inputmethod/skk/PLIST
+++ b/inputmethod/skk/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.15 2010/08/01 01:09:14 obache Exp $
-${EMACS_INFOPREFIX}/skk.info
-${FOR_emacs}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs}${EMACS_LISPPREFIX}/skk/ccc.elc
+@comment $NetBSD: PLIST,v 1.16 2011/02/03 14:42:53 uebayasi Exp $
+info/skk.info
+${EMACS_LISPPREFIX}/skk/ccc.el
+${EMACS_LISPPREFIX}/skk/ccc.elc
+${EMACS_LISPPREFIX}/skk/cdb.el
+${EMACS_LISPPREFIX}/skk/cdb.elc
 ${EMACS_LISPPREFIX}/skk/context-skk.el
 ${EMACS_LISPPREFIX}/skk/context-skk.elc
-${FOR_emacs}${EMACS_LISPPREFIX}/skk/leim-list.el
+${EMACS_LISPPREFIX}/skk/leim-list.el
 ${EMACS_LISPPREFIX}/skk/queue-m.el
 ${EMACS_LISPPREFIX}/skk/queue-m.elc
 ${EMACS_LISPPREFIX}/skk/skk-abbrev.el
@@ -19,6 +21,8 @@ ${EMACS_LISPPREFIX}/skk/skk-autoloads.el
 ${EMACS_LISPPREFIX}/skk/skk-autoloads.elc
 ${EMACS_LISPPREFIX}/skk/skk-azik.el
 ${EMACS_LISPPREFIX}/skk/skk-azik.elc
+${EMACS_LISPPREFIX}/skk/skk-cdb.el
+${EMACS_LISPPREFIX}/skk/skk-cdb.elc
 ${EMACS_LISPPREFIX}/skk/skk-comp.el
 ${EMACS_LISPPREFIX}/skk/skk-comp.elc
 ${EMACS_LISPPREFIX}/skk/skk-cursor.el
@@ -29,20 +33,20 @@ ${EMACS_LISPPREFIX}/skk/skk-dcomp.el
 ${EMACS_LISPPREFIX}/skk/skk-dcomp.elc
 ${EMACS_LISPPREFIX}/skk/skk-develop.el
 ${EMACS_LISPPREFIX}/skk/skk-develop.elc
-${EMACS_LISPPREFIX}/skk/skk-dic.el
-${EMACS_LISPPREFIX}/skk/skk-dic.elc
-${NOTFOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-e21.el
-${NOTFOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-e21.elc
+${EMACS_LISPPREFIX}/skk/skk-emacs.el
+${EMACS_LISPPREFIX}/skk/skk-emacs.elc
 ${EMACS_LISPPREFIX}/skk/skk-gadget.el
 ${EMACS_LISPPREFIX}/skk/skk-gadget.elc
 ${EMACS_LISPPREFIX}/skk/skk-hint.el
 ${EMACS_LISPPREFIX}/skk/skk-hint.elc
+${EMACS_LISPPREFIX}/skk/skk-inline.el
+${EMACS_LISPPREFIX}/skk/skk-inline.elc
 ${EMACS_LISPPREFIX}/skk/skk-isearch.el
 ${EMACS_LISPPREFIX}/skk/skk-isearch.elc
 ${EMACS_LISPPREFIX}/skk/skk-jisx0201.el
 ${EMACS_LISPPREFIX}/skk/skk-jisx0201.elc
-${NOTFOR_xemacs}${NOTFOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
-${NOTFOR_xemacs}${NOTFOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
+${PLIST.jisx0213}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
+${PLIST.jisx0213}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
 ${EMACS_LISPPREFIX}/skk/skk-jisyo-edit-mode.el
 ${EMACS_LISPPREFIX}/skk/skk-jisyo-edit-mode.elc
 ${EMACS_LISPPREFIX}/skk/skk-kakasi.el
@@ -53,18 +57,14 @@ ${EMACS_LISPPREFIX}/skk/skk-leim.el
 ${EMACS_LISPPREFIX}/skk/skk-leim.elc
 ${EMACS_LISPPREFIX}/skk/skk-look.el
 ${EMACS_LISPPREFIX}/skk/skk-look.elc
-${PLIST.lookup}${EMACS_LISPPREFIX}/skk/skk-lookup.el
-${PLIST.lookup}${EMACS_LISPPREFIX}/skk/skk-lookup.elc
 ${EMACS_LISPPREFIX}/skk/skk-macs.el
 ${EMACS_LISPPREFIX}/skk/skk-macs.elc
 ${EMACS_LISPPREFIX}/skk/skk-num.el
 ${EMACS_LISPPREFIX}/skk/skk-num.elc
-${EMACS_LISPPREFIX}/skk/skk-obsolete.el
-${EMACS_LISPPREFIX}/skk/skk-obsolete.elc
-${EMACS_LISPPREFIX}/skk/skk-server.el
-${EMACS_LISPPREFIX}/skk/skk-server.elc
 ${EMACS_LISPPREFIX}/skk/skk-server-completion.el
 ${EMACS_LISPPREFIX}/skk/skk-server-completion.elc
+${EMACS_LISPPREFIX}/skk/skk-server.el
+${EMACS_LISPPREFIX}/skk/skk-server.elc
 ${EMACS_LISPPREFIX}/skk/skk-setup.el
 ${EMACS_LISPPREFIX}/skk/skk-sticky.el
 ${EMACS_LISPPREFIX}/skk/skk-sticky.elc
@@ -80,8 +80,6 @@ ${EMACS_LISPPREFIX}/skk/skk-version.el
 ${EMACS_LISPPREFIX}/skk/skk-version.elc
 ${EMACS_LISPPREFIX}/skk/skk-viper.el
 ${EMACS_LISPPREFIX}/skk/skk-viper.elc
-${FOR_xemacs}${EMACS_LISPPREFIX}/skk/skk-xemacs.el
-${FOR_xemacs}${EMACS_LISPPREFIX}/skk/skk-xemacs.elc
 ${EMACS_LISPPREFIX}/skk/skk.el
 ${EMACS_LISPPREFIX}/skk/skk.elc
 share/skk/NICOLA-SKK.tut
diff --git a/inputmethod/skk/distinfo b/inputmethod/skk/distinfo
index 805958ecd2e..15ed23aeead 100644
--- a/inputmethod/skk/distinfo
+++ b/inputmethod/skk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2010/07/31 08:45:09 obache Exp $
+$NetBSD: distinfo,v 1.6 2011/02/03 14:42:53 uebayasi Exp $
 
-SHA1 (ddskk-14.0.91.tar.gz) = 4181ea6474a7040c05e590d7df36ff8e0c845df6
-RMD160 (ddskk-14.0.91.tar.gz) = 864f59642ed8bb79d94c9fd1616ea9f7b20d0eaa
-Size (ddskk-14.0.91.tar.gz) = 752470 bytes
+SHA1 (ddskk-14.2.tar.gz) = 31d7ca75cfb1c9eaaf949dfb6249ee6e3eeb405c
+RMD160 (ddskk-14.2.tar.gz) = bec43ce42bb4b53eccbe59856c8c818482ef159d
+Size (ddskk-14.2.tar.gz) = 794060 bytes