Update (dd)skk to 20071028. Changes unknown.

While here:

* Correct PKGNAME back to skk, not ddskk.

* Buildlink3'ify.

4 files changed, 47 insertions, 23 deletions

diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index e2f4da1fbf1..291769d62ca 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/04/08 19:29:52 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/10/29 13:25:26 uebayasi Exp $
 #
 
-DISTNAME=	ddskk-12.2.0
-PKGNAME=	${EMACS_PKGNAME_PREFIX}skk-12.2.0
-PKGREVISION=	4
+DISTNAME=	ddskk-20071028
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/^ddskk/skk/}
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/skk/index.html
@@ -14,18 +12,8 @@ COMMENT=	Japanese input methods for Emacs
 
 CONFLICTS=	ddskk-[0-9]*
 
-EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox xemacs214 emacs20 xemacs215
-
 EMACS_MODULES+=	base leim
 
-.include "../../mk/emacs.mk"
-.include "options.mk"
-
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
-.if ${EMACS_FLAVOR} == "emacs"
-BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
-.endif
-
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 BUILD_TARGET=	elc
 
@@ -43,5 +31,12 @@ SUBST_SED.cfg=		-e 's|@PREFIX@|${PREFIX}|g'			\
 post-extract:
 	@${MV} ${WRKSRC}/SKK-CFG ${WRKSRC}/SKK-CFG.orig
 	@${CP} ${FILESDIR}/SKK-CFG ${WRKSRC}
+	@${CHMOD} +w ${WRKSRC}/doc/skk.texi
+
+.include "options.mk"
+
+.include "../../mk/emacs.mk"
 
+.include "../../devel/apel/buildlink3.mk"
+.include "../../editors/mule-ucs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skk/PLIST b/inputmethod/skk/PLIST
index 48ce6276e84..bdb6c86d35a 100644
--- a/inputmethod/skk/PLIST
+++ b/inputmethod/skk/PLIST
@@ -1,21 +1,36 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/08 19:29:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/10/29 13:25:26 uebayasi Exp $
 ${EMACS_INFOPREFIX}/skk.info
 ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.el
-${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.el
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/ccc.el
+${FOR_emacs22}${EMACS_LISPPREFIX}/skk/ccc.el
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/ccc.el
+${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/ccc.elc
+${FOR_emacs22}${EMACS_LISPPREFIX}/skk/ccc.elc
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/ccc.elc
+${EMACS_LISPPREFIX}/skk/context-skk.el
+${EMACS_LISPPREFIX}/skk/context-skk.elc
 ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/leim-list.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/leim-list.el
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/leim-list.el
+${FOR_emacs22}${EMACS_LISPPREFIX}/skk/leim-list.el
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/leim-list.el
 ${EMACS_LISPPREFIX}/skk/queue-m.el
 ${EMACS_LISPPREFIX}/skk/queue-m.elc
 ${EMACS_LISPPREFIX}/skk/skk-abbrev.el
 ${EMACS_LISPPREFIX}/skk/skk-abbrev.elc
+${EMACS_LISPPREFIX}/skk/skk-act.el
+${EMACS_LISPPREFIX}/skk/skk-act.elc
 ${EMACS_LISPPREFIX}/skk/skk-annotation.el
 ${EMACS_LISPPREFIX}/skk/skk-annotation.elc
 ${EMACS_LISPPREFIX}/skk/skk-auto.el
 ${EMACS_LISPPREFIX}/skk/skk-auto.elc
 ${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-comp.el
 ${EMACS_LISPPREFIX}/skk/skk-comp.elc
 ${EMACS_LISPPREFIX}/skk/skk-cursor.el
@@ -29,9 +44,17 @@ ${EMACS_LISPPREFIX}/skk/skk-develop.elc
 ${EMACS_LISPPREFIX}/skk/skk-dic.el
 ${EMACS_LISPPREFIX}/skk/skk-dic.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-e21.el
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-e21.el
+${FOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-e21.el
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/skk-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-e21.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-e21.elc
+${FOR_emacs22}${EMACS_LISPPREFIX}/skk/skk-e21.elc
+${FOR_emacs22nox}${EMACS_LISPPREFIX}/skk/skk-e21.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-isearch.el
 ${EMACS_LISPPREFIX}/skk/skk-isearch.elc
 ${EMACS_LISPPREFIX}/skk/skk-jisx0201.el
@@ -40,6 +63,8 @@ ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/skk-jisx0213.elc
+${FOR_emacs21nox}${EMACS_LISPPREFIX}/skk/skk-jisx0213.el
+${FOR_emacs21nox}${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
@@ -60,9 +85,13 @@ ${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-setup.el
 ${EMACS_LISPPREFIX}/skk/skk-study.el
 ${EMACS_LISPPREFIX}/skk/skk-study.elc
+${EMACS_LISPPREFIX}/skk/skk-tankan.el
+${EMACS_LISPPREFIX}/skk/skk-tankan.elc
 ${EMACS_LISPPREFIX}/skk/skk-tut.el
 ${EMACS_LISPPREFIX}/skk/skk-tut.elc
 ${EMACS_LISPPREFIX}/skk/skk-vars.el
diff --git a/inputmethod/skk/distinfo b/inputmethod/skk/distinfo
index 375e8fce30a..042edd55bab 100644
--- a/inputmethod/skk/distinfo
+++ b/inputmethod/skk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 21:00:35 agc Exp $
+$NetBSD: distinfo,v 1.3 2007/10/29 13:25:26 uebayasi Exp $
 
-SHA1 (ddskk-12.2.0.tar.bz2) = a2f11883911e815ea37e7af1715c6e7763663c1b
-RMD160 (ddskk-12.2.0.tar.bz2) = e04baa986fb6627a0c30e049bea72d1acfada6a0
-Size (ddskk-12.2.0.tar.bz2) = 528129 bytes
+SHA1 (ddskk-20071028.tar.gz) = 978cd46aadaa7fab553b1b135208557bebd009e5
+RMD160 (ddskk-20071028.tar.gz) = c236098c0a2bd96dc2d9a3c89baad91b63674eef
+Size (ddskk-20071028.tar.gz) = 733658 bytes
diff --git a/inputmethod/skk/options.mk b/inputmethod/skk/options.mk
index 19698b21429..eadadd4b028 100644
--- a/inputmethod/skk/options.mk
+++ b/inputmethod/skk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/03/20 05:30:33 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2007/10/29 13:25:26 uebayasi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.skk
 PKG_SUPPORTED_OPTIONS=	lookup
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	lookup
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mlookup)
-BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup
+.include "../../misc/lookup/buildlink3.mk"
 PLIST_SUBST+=	FOR_LOOKUP=""
 .else
 PLIST_SUBST+=	FOR_LOOKUP="@comment "