6 files changed, 208 insertions, 73 deletions

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 4f13cd10526b..b6ec3611c433 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -5,38 +5,48 @@
 # $FreeBSD$
 #
 
-PORTNAME=	skk-elisp
-PORTVERSION=	9.6
+PORTNAME=	ddskk
+PORTVERSION=	11.6.0
 CATEGORIES=	japanese elisp
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
-DISTNAME=	skk${PORTVERSION}
+MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	matusita@jp.FreeBSD.org
+MAINTAINER=	yoichi@FreeBSD.org
 
-BUILD_DEPENDS=	mule:${.CURDIR}/../../editors/mule \
-		${NONEXISTENT}:${SKK_MASTERDIR}:configure
-RUN_DEPENDS=	${PREFIX}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
+BUILD_DEPENDS=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
 
-SKKJISYO_SIZE?=	L
-SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
-SKK_MASTERDIR=	${.CURDIR}/../../japanese/skk-jisyo
-WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-${PORTVERSION}
+EMACS_PORT_NAME?=	emacs21
+.if (${EMACS_PORT_NAME} == emacs21)
+DEPPORT_SUFFIX=	""
+.else
+DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
+PLIST=	${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.endif
+AMBIGUOUS_ELCS=	skk-jisx0213 skk-lookup
 
-# we cannot use skk-9.6 on emacs20
-EMACS=		mule
-ELISPSUBDIR=	share/${EMACS}/site-lisp/skk
+USE_BZIP2=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+ALL_TARGET=	elc info
 
-MAKE_ARGS=	SUBDIRS='lisp' EMACS=${EMACS} ELISPDIR=${PREFIX}/${ELISPSUBDIR}
-PLIST_SUB=	EMACS=${EMACS} ELISPSUBDIR=${ELISPSUBDIR}
-
-# Our makeinfo can't handle files with Japanese characters. :<
-#pre-build:
-#	(cd ${WRKSRC}/doc; \
-#	  /usr/bin/makeinfo --no-split skk.texi)
+SKK_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/skk
+SKK_DOCS=	AUTHORS Codename Contributors FAQ.txt NEWS README
+SKK_EXAMPLES=	etc/Emacs.ad etc/dot.emacs etc/dot.skk
 
 post-install:
-	(cd ${WRKSRC}; make SUBDIRS='doc' install)
-	(cd ${WRKSRC}; make SUBDIRS='etc' install)
-	install-info ${PREFIX}/info/skk.info ${PREFIX}/info/dir
+.for i in ${AMBIGUOUS_ELCS}
+	${RM} -f ${PREFIX}/${SKK_LISPDIR}/${i}.elc
+	${INSTALL_DATA} ${WRKSRC}/${i}.el ${PREFIX}/${SKK_LISPDIR}
+.endfor
+	${MKDIR} ${EXAMPLESDIR}
+.for i in ${SKK_EXAMPLES}
+	${INSTALL_DATA}	${WRKSRC}/${i} ${EXAMPLESDIR}
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${SKK_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/READMEs/${i} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/ddskk/distinfo b/japanese/ddskk/distinfo
index 080b25bc47d8..c690a4f6f8ce 100644
--- a/japanese/ddskk/distinfo
+++ b/japanese/ddskk/distinfo
@@ -1 +1 @@
-MD5 (skk9.6.tar.gz) = 26bd151234f69caa2e1591aaf551fb1d
+MD5 (ddskk11.6.0.tar.bz2) = 4b1c53becfc42a74ade43657a1f4f5fc
diff --git a/japanese/ddskk/pkg-comment b/japanese/ddskk/pkg-comment
index 69697c6f3a10..eb4088e8a365 100644
--- a/japanese/ddskk/pkg-comment
+++ b/japanese/ddskk/pkg-comment
@@ -1 +1 @@
-Emacs-lisp frontend for the SKK Japanese-input software
+Simple Kana to Kanji conversion program on Emacsen
diff --git a/japanese/ddskk/pkg-descr b/japanese/ddskk/pkg-descr
index 5dbbf6001e77..1704732f5725 100644
--- a/japanese/ddskk/pkg-descr
+++ b/japanese/ddskk/pkg-descr
@@ -1,7 +1,8 @@
-SKK (Simple Kana Kanji Convertor) is a very fast and efficient Japanese input
-method system, written in emacs-lisp. SKK runs on NEmacs (Japanized Emacs18),
-Mule (MULtilingual Emacs), and Demacs (DOS version of Emacs18/NEmacs).
+SKK (Simple Kana to Kanji conversion program) is a very fast
+and efficient Japanese input method system, written in emacs-lisp.
+SKK runs on Emacsen with Mule features.
 
-WWW: http://skk.kuis.kyoto-u.ac.jp/skk/
+This input-method toggle key-binding is C-x C-j.
+And tutorial mode key-binding is C-x t.
 
-This package is Emacs-lisp frontend for the SKK.
+WWW: http://openlab.ring.gr.jp/skk/
diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index 09e91810fb03..df7299b74fc7 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -1,48 +1,87 @@
-%%ELISPSUBDIR%%/avltree.el
-%%ELISPSUBDIR%%/avltree.elc
-%%ELISPSUBDIR%%/elib-node.el
-%%ELISPSUBDIR%%/elib-node.elc
-%%ELISPSUBDIR%%/queue-m.el
-%%ELISPSUBDIR%%/queue-m.elc
-%%ELISPSUBDIR%%/skk-auto.el
-%%ELISPSUBDIR%%/skk-auto.elc
-%%ELISPSUBDIR%%/skk-comp.el
-%%ELISPSUBDIR%%/skk-comp.elc
-%%ELISPSUBDIR%%/skk-e19.el
-%%ELISPSUBDIR%%/skk-e19.elc
-%%ELISPSUBDIR%%/skk-gadget.el
-%%ELISPSUBDIR%%/skk-gadget.elc
-%%ELISPSUBDIR%%/skk-isearch.el
-%%ELISPSUBDIR%%/skk-isearch.elc
-%%ELISPSUBDIR%%/skk-kakasi.el
-%%ELISPSUBDIR%%/skk-kakasi.elc
-%%ELISPSUBDIR%%/skk-kcode.el
-%%ELISPSUBDIR%%/skk-kcode.elc
-%%ELISPSUBDIR%%/skk-num.el
-%%ELISPSUBDIR%%/skk-num.elc
-%%ELISPSUBDIR%%/skk-server.el
-%%ELISPSUBDIR%%/skk-server.elc
-%%ELISPSUBDIR%%/skk-tree.el
-%%ELISPSUBDIR%%/skk-tree.elc
-%%ELISPSUBDIR%%/skk-tut.el
-%%ELISPSUBDIR%%/skk-tut.elc
-%%ELISPSUBDIR%%/skk-vip.el
-%%ELISPSUBDIR%%/skk-vip.elc
-%%ELISPSUBDIR%%/skk.el
-%%ELISPSUBDIR%%/skk.elc
-%%ELISPSUBDIR%%/stack-m.el
-%%ELISPSUBDIR%%/stack-m.elc
-%%ELISPSUBDIR%%/string.el
-%%ELISPSUBDIR%%/string.elc
-@dirrm %%ELISPSUBDIR%%
-share/skk/SKK.tut
-share/skk/SKK.tut.E
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/leim-list.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
 @unexec install-info --delete %D/info/skk.info %D/info/dir
 info/skk.info
 info/skk.info-1
 info/skk.info-2
 info/skk.info-3
 info/skk.info-4
-info/skk.info-5
-info/skk.info-6
 @exec install-info %D/info/skk.info %D/info/dir
+share/skk/NICOLA-SKK.tut
+share/skk/SKK.tut
+share/skk/SKK.tut.E
+@dirrm share/skk
+share/examples/ddskk/Emacs.ad
+share/examples/ddskk/dot.emacs
+share/examples/ddskk/dot.skk
+@dirrm share/examples/ddskk
+%%PORTDOCS%%share/doc/ddskk/AUTHORS
+%%PORTDOCS%%share/doc/ddskk/Codename
+%%PORTDOCS%%share/doc/ddskk/Contributors
+%%PORTDOCS%%share/doc/ddskk/FAQ.txt
+%%PORTDOCS%%share/doc/ddskk/NEWS
+%%PORTDOCS%%share/doc/ddskk/README
+%%PORTDOCS%%@dirrm share/doc/ddskk
diff --git a/japanese/ddskk/pkg-plist.emacs20 b/japanese/ddskk/pkg-plist.emacs20
new file mode 100644
index 000000000000..8fae5872bd2e
--- /dev/null
+++ b/japanese/ddskk/pkg-plist.emacs20
@@ -0,0 +1,85 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/leim-list.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
+@unexec install-info --delete %D/info/skk.info %D/info/dir
+info/skk.info
+info/skk.info-1
+info/skk.info-2
+info/skk.info-3
+info/skk.info-4
+@exec install-info %D/info/skk.info %D/info/dir
+share/skk/NICOLA-SKK.tut
+share/skk/SKK.tut
+share/skk/SKK.tut.E
+@dirrm share/skk
+share/examples/ddskk/Emacs.ad
+share/examples/ddskk/dot.emacs
+share/examples/ddskk/dot.skk
+@dirrm share/examples/ddskk
+%%PORTDOCS%%share/doc/ddskk/AUTHORS
+%%PORTDOCS%%share/doc/ddskk/Codename
+%%PORTDOCS%%share/doc/ddskk/Contributors
+%%PORTDOCS%%share/doc/ddskk/FAQ.txt
+%%PORTDOCS%%share/doc/ddskk/NEWS
+%%PORTDOCS%%share/doc/ddskk/README
+%%PORTDOCS%%@dirrm share/doc/ddskk