Upgrade, 8.6 -> 9.6. Closes PR ports/2761.

Submitted by:	Makoto MATSUSHITA <matusita@ics.es.osaka-u.ac.jp>

4 files changed, 71 insertions, 64 deletions

diff --git a/japanese/skk/Makefile b/japanese/skk/Makefile
index 26d9c80eacf6..63bb5a1e13f4 100644
--- a/japanese/skk/Makefile
+++ b/japanese/skk/Makefile
@@ -1,38 +1,23 @@
 # New ports collection makefile for:	skk
-# Version required:	8.6
-# Date created:		10 Aug 1996
-# Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
+# Version required:	9.6
+# Date created:		13 Feb 1997
+# Whom:			Makoto Matsushita <matusita@jp.freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/09/19 04:38:46 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/11 10:12:51 max Exp $
 #
 
-DISTNAME=	skk8.6
-PKGNAME=	jp-skk-8.6
+DISTNAME=	skk9.6
+PKGNAME=	jp-skk-9.6
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.cs.keio.ac.jp/pub/misc/skk/ \
-		ftp://ftp.tohoku.ac.jp/mirror/skk/8.6/
+MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
 
-MAINTAINER=	hidekazu@cs.titech.ac.jp
+MAINTAINER=	matusita@jp.freebsd.org
 
-# Don't RUN_DEPENDS on mule because we don't know which version the
-# user would want.  We can't omit the BUILD_DEPENDS because it needs
-# to byte-compile .el files.
 BUILD_DEPENDS=	mule:${PORTSDIR}/editors/mule
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/skk-9.6
+GNU_CONFIGURE=	yes
 
-STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/skkserv.sh
-
-post-install:
-	@if [ ! -f ${STARTUP_SCRIPT} ]; then \
-		echo "Installing ${STARTUP_SCRIPT} file."; \
-		echo "#!/bin/sh" > ${STARTUP_SCRIPT}; \
-		echo "if [ -f ${PREFIX}/bin/SKK/skkserv ]; then" >> \
-			${STARTUP_SCRIPT}; \
-		echo "	echo -n ' skkserv'; ${PREFIX}/bin/SKK/skkserv" >> \
-			${STARTUP_SCRIPT}; \
-		echo "fi" >> ${STARTUP_SCRIPT}; \
-		chmod 755 ${STARTUP_SCRIPT}; \
-	fi
+MAKE_FLAGS+=	EMACS=mule
 
 .include <bsd.port.mk>
diff --git a/japanese/skk/pkg-comment b/japanese/skk/pkg-comment
index 88b0615dc23e..a7d8069adca3 100644
--- a/japanese/skk/pkg-comment
+++ b/japanese/skk/pkg-comment
@@ -1 +1 @@
-A emacs-lisp Japanese input method for mule.
+Simple Kana Kanji Converter: a Japanese-input software running on Nemacs or Mule.
diff --git a/japanese/skk/pkg-descr b/japanese/skk/pkg-descr
index d042f984558e..042a89133318 100644
--- a/japanese/skk/pkg-descr
+++ b/japanese/skk/pkg-descr
@@ -1,13 +1,11 @@
-This is Skk-8.6, a Japanese input method based emacs-lisp for mule.
-When you use this, you can choose to use skkserv or not.
-If you use skkserv, you must add a following entry into
-/etc/services file or NIS/YP services map.
+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).
 
-skkserv		1178/tcp
+Check <URL:http://skk.kuis.kyoto-u.ac.jp/skk/> also, Home Page of SKK.
 
-This also include some patches for FreeBSD or others.
-(Fix a bug of emacs-lisp and change make rule.)
-If there are any problem in this patches, please know me via E-mail.
+When you select 'skkserv' as a conversion server, add
 
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
+	skkserv		1178/tcp
+
+to your /etc/services (or 'services' NIS database).
diff --git a/japanese/skk/pkg-plist b/japanese/skk/pkg-plist
index 2c888f4edf77..aa800f51f77b 100644
--- a/japanese/skk/pkg-plist
+++ b/japanese/skk/pkg-plist
@@ -1,27 +1,51 @@
-bin/SKK/skkserv
-bin/SKK/skkjisyo-entries
-bin/SKK/skkjisyo-expr
-bin/SKK/skkjisyo-sort
-etc/rc.d/skkserv.sh
-info/skk
-lib/mule/site-lisp/skk-isearch.el
-lib/mule/site-lisp/skk-isearch.elc
-lib/mule/site-lisp/skk-tools.el
-lib/mule/site-lisp/skk-tools.elc
-lib/mule/site-lisp/skk-tut.el
-lib/mule/site-lisp/skk-tut.elc
-lib/mule/site-lisp/skk.el
-lib/mule/site-lisp/skk.elc
-lib/mule/19.28/i386--freebsd/emacs-sort
-lib/mule/19.28/etc/SKK.tut
-lib/mule/19.28/etc/SKK.tut.E
-lib/skk/SKK-JISYO.JIS2
-lib/skk/SKK-JISYO.L
-lib/skk/SKK-JISYO.M
-lib/skk/SKK-JISYO.S
-lib/skk/latexinfo.sty
-lib/skk/skk-romkan.tex
-lib/skk/skk.ps
-lib/skk/skk.tex
-lib/skk/tabular.sty
-lib/skk/dict/SKK-JISYO.L
+bin/skkdic-expr
+bin/skkdic-count
+bin/skkdic-sort
+libexec/skkserv
+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
+share/emacs/site-lisp/avltree.el
+share/emacs/site-lisp/avltree.elc
+share/emacs/site-lisp/elib-node.el
+share/emacs/site-lisp/elib-node.elc
+share/emacs/site-lisp/queue-m.el
+share/emacs/site-lisp/queue-m.elc
+share/emacs/site-lisp/skk-auto.el
+share/emacs/site-lisp/skk-auto.elc
+share/emacs/site-lisp/skk-comp.el
+share/emacs/site-lisp/skk-comp.elc
+share/emacs/site-lisp/skk-e19.el
+share/emacs/site-lisp/skk-e19.elc
+share/emacs/site-lisp/skk-gadget.el
+share/emacs/site-lisp/skk-gadget.elc
+share/emacs/site-lisp/skk-isearch.el
+share/emacs/site-lisp/skk-isearch.elc
+share/emacs/site-lisp/skk-kakasi.el
+share/emacs/site-lisp/skk-kakasi.elc
+share/emacs/site-lisp/skk-kcode.el
+share/emacs/site-lisp/skk-kcode.elc
+share/emacs/site-lisp/skk-num.el
+share/emacs/site-lisp/skk-num.elc
+share/emacs/site-lisp/skk-server.el
+share/emacs/site-lisp/skk-server.elc
+share/emacs/site-lisp/skk-tree.el
+share/emacs/site-lisp/skk-tree.elc
+share/emacs/site-lisp/skk-tut.el
+share/emacs/site-lisp/skk-tut.elc
+share/emacs/site-lisp/skk-vip.el
+share/emacs/site-lisp/skk-vip.elc
+share/emacs/site-lisp/skk.el
+share/emacs/site-lisp/skk.elc
+share/emacs/site-lisp/stack-m.el
+share/emacs/site-lisp/stack-m.elc
+share/emacs/site-lisp/string.el
+share/emacs/site-lisp/string.elc
+share/skk/SKK.tut
+share/skk/SKK.tut.E
+share/skk/SKK-JISYO.L
+@dirrm share/skk