Update to 10.57.

3 files changed, 83 insertions, 15 deletions

diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index 5eab3f71348d..24f2afebc7ad 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	skk10-elisp-emacs20
-# Version required:	10.56
+# Version required:	10.57
 # Date created:		21 September 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
@@ -9,11 +9,11 @@
 DISTNAME=	skk${SKK10_VER}
 PKGNAME=	ja-skk-elisp-${EMACS_PORT_NAME}-${SKK10_VER}
 CATEGORIES=	japanese elisp
-MASTER_SITES=	http://www.asahi-net.or.jp/~gy2m-nkjm/skk/
+MASTER_SITES=	http://openlab.ring.gr.jp/skk/
 
 MAINTAINER?=	shige@FreeBSD.org
 
-SKK10_VER=	10.56
+SKK10_VER=	10.57
 
 # This port is a master port.
 PORT_CLASS?=	master
@@ -34,7 +34,7 @@ HAVE_COMMON_PORT=	NO
 .endif
 
 # dependency: skk-jisyo
-RUN_DEPENDS+=	${LOCALBASE}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
+RUN_DEPENDS+=	${LOCALBASE}/${SKKJISYODIR}/${SKKJISYO}:${SKK_MASTERDIR}
 # dependency: apel
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
 RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
@@ -49,14 +49,58 @@ RUN_DEPENDS+=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
 WRKSRC=		${WRKDIR}/skk-${SKK10_VER}
 ALL_TARGET?=	elc
 MAKE_ARGS=	EMACS=${EMACS_CMD}
-PLIST_SUB=	EMACS=${EMACS_CMD} EMACS_LIBDIR=${EMACS_LIBDIR}
+PLIST_SUB=	EMACS=${EMACS_CMD} EMACS_LIBDIR=${EMACS_LIBDIR} \
+		SKK_JISYODIR=${SKKJISYODIR} SKK_DOCDIR=${SKK_DOCDIR} \
+		SKK_STARTUPEL=${SKK_STARTUPEL}
 
 # information of skk-jisyo
+SKKJISYODIR=	share/skk
+SKK_DOCDIR=	share/doc/skk10
 SKKJISYO_SIZE?=	L
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
+SKK_STARTUPEL=	skk-startup.el
+
+EXPERIMENTAL_LISPS=	experimental/skk-abbrev.el \
+			experimental/dbm/skk-dbm.el \
+			experimental/skk-dcomp.el \
+			experimental/skk-hankaku-mode.el \
+			experimental/skk-jisx0201.el \
+			experimental/skk-lookup.el \
+			experimental/tut-code/skk-def.el \
+			experimental/tut-code/skk-tutcdef.el \
+			experimental/tut-code/skk-tutcode.el
+
+# install experimantal lisps [handy optional]
+#pre-build:
+#	@(cd ${WRKSRC} ; \
+#		${LN} experimental/skk-abbrev.el . ; \
+#		${LN} experimental/skk-dcomp.el . ; \
+#		${LN} experimental/skk-hankaku-mode.el . ; \
+#		${LN} experimental/skk-jisx0201.el . ; \
+#		${LN} experimental/skk-lookup.el . ; \
+#		${LN} experimental/skk-study.el . ; \
+#	)
 
 post-install:
+	@${MAKE} startup-install
+	@${MKDIR} ${PREFIX}/${SKK_DOCDIR}
+	@(cd ${WRKSRC} ;\
+		for i in ${EXPERIMENTAL_LISPS} ; do \
+			${INSTALL_DATA} $${i} ${PREFIX}/${SKK_DOCDIR} ;\
+		done ;\
+	)
 	@install-info ${PREFIX}/info/skk.info ${PREFIX}/info/dir
+.if !defined(NOPORTDOCS)
+	@${INSTALL_DATA} ${WRKSRC}/READMEs/* ${PREFIX}/${SKK_DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/experimental/GUIDELINE \
+					${PREFIX}/${SKK_DOCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/experimental/dbm/README.dbm \
+					${PREFIX}/${SKK_DOCDIR}
+.endif
+
+startup-install:
+	@${INSTALL_DATA} ${FILESDIR}/${SKK_STARTUPEL} \
+		${PREFIX}/${EMACS_LIBDIR}/site-lisp/skk
 
 .include <bsd.port.mk>
diff --git a/japanese/skk10-elisp-emacs20/pkg-descr b/japanese/skk10-elisp-emacs20/pkg-descr
index 60b071bbf69a..bd3fd2280ebd 100644
--- a/japanese/skk10-elisp-emacs20/pkg-descr
+++ b/japanese/skk10-elisp-emacs20/pkg-descr
@@ -2,9 +2,15 @@ SKK (Simple Kana Kanji Convertor) is a very fast and efficient Japanese input
 method system, written in emacs-lisp. SKK runs on Emacsen with
 Mule features.
 SKK-10 is a development version of SKK.
+This package is Emacs-lisp frontend for the SKK.
 
-WWW information: http://www.asahi-net.or.jp/~gy2m-nkjm/skk/
+To use SKK, put in your $HOME/.emacs as follows:
 
-This package is Emacs-lisp frontend for the SKK.
+	(require 'skk-startup)
+
+This input-method toggle key-binding is C-x C-j.
+And tutorial mode key-binding is C-x t.
+
+WWW: http://openlab.ring.gr.jp/skk/
 
 --- Porting by shige <shige@FreeBSD.org>
diff --git a/japanese/skk10-elisp-emacs20/pkg-plist b/japanese/skk10-elisp-emacs20/pkg-plist
index ddd8aec46d50..d503a431aed3 100644
--- a/japanese/skk10-elisp-emacs20/pkg-plist
+++ b/japanese/skk10-elisp-emacs20/pkg-plist
@@ -1,13 +1,13 @@
 %%EMACS_LIBDIR%%/site-lisp/skk/queue-m.el
 %%EMACS_LIBDIR%%/site-lisp/skk/queue-m.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-abbrev.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-abbrev.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-auto.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-auto.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-autoloads.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-autoloads.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-comp.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-comp.elc
+%%EMACS_LIBDIR%%/site-lisp/skk/skk-cursor.el
+%%EMACS_LIBDIR%%/site-lisp/skk/skk-cursor.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-develop.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-develop.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-foreword.el
@@ -24,16 +24,12 @@
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-leim.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-look.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-look.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-lookup.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-num.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-num.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-obsolete.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-obsolete.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-server.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-server.elc
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-study.el
-%%EMACS_LIBDIR%%/site-lisp/skk/skk-study.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-tut.el
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-tut.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/skk-viper.el
@@ -42,6 +38,7 @@
 %%EMACS_LIBDIR%%/site-lisp/skk/skk.elc
 %%EMACS_LIBDIR%%/site-lisp/skk/stack-m.el
 %%EMACS_LIBDIR%%/site-lisp/skk/stack-m.elc
+%%EMACS_LIBDIR%%/site-lisp/skk/%%SKK_STARTUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/skk
 @unexec install-info --delete %D/info/skk.info %D/info/dir
 info/skk.info
@@ -50,5 +47,26 @@ info/skk.info-2
 info/skk.info-3
 info/skk.info-4
 @exec install-info %D/info/skk.info %D/info/dir
-share/skk/SKK.tut
-share/skk/SKK.tut.E
+%%SKK_JISYODIR%%/SKK.tut
+%%SKK_JISYODIR%%/SKK.tut.E
+%%SKK_DOCDIR%%/AUTHORS
+%%SKK_DOCDIR%%/COPYING
+%%SKK_DOCDIR%%/Contriutors
+%%SKK_DOCDIR%%/GUIDELINE
+%%SKK_DOCDIR%%/INSTALL
+%%SKK_DOCDIR%%/NEWS
+%%SKK_DOCDIR%%/PROPOSAL
+%%SKK_DOCDIR%%/README
+%%SKK_DOCDIR%%/README.VIP
+%%SKK_DOCDIR%%/README.dbm
+%%SKK_DOCDIR%%/README.win
+%%SKK_DOCDIR%%/skk-abbrev.el
+%%SKK_DOCDIR%%/skk-dbm.el
+%%SKK_DOCDIR%%/skk-dcomp.el
+%%SKK_DOCDIR%%/skk-def.el
+%%SKK_DOCDIR%%/skk-hankaku-mode.el
+%%SKK_DOCDIR%%/skk-jisx0201.el
+%%SKK_DOCDIR%%/skk-lookup.el
+%%SKK_DOCDIR%%/skk-tutcdef.el
+%%SKK_DOCDIR%%/skk-tutcode.el
+@dirrm %%SKK_DOCDIR%%