4 files changed, 23 insertions, 88 deletions

diff --git a/japanese/skk/Makefile b/japanese/skk/Makefile
index 3998cb9832c8..7c16bfba95a4 100644
--- a/japanese/skk/Makefile
+++ b/japanese/skk/Makefile
@@ -3,43 +3,32 @@
 # Date created:		04 Mar 1997
 # Whom:			Makoto Matsushita <matusita@jp.freebsd.org>
 #
-# $Id: Makefile,v 1.9 1997/09/14 21:36:00 max Exp $
+# $Id: Makefile,v 1.10 1998/11/15 12:21:55 kuriyama Exp $
 #
 
 DISTNAME=	skk9.6
 PKGNAME=	ja-skk-9.6
 CATEGORIES=	japanese elisp
-MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 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
+SKKJISYO_SIZE?=	L
+SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
+PORT_SKK_JISYO=	${.CURDIR}/../../japanese/skk-jisyo
+PORT_SKK_TOOLS=	${.CURDIR}/../../japanese/skk-tools
+PORT_SKK_ELISP=	${.CURDIR}/../../japanese/skk-elisp
+PORT_SKK_SERV=	${.CURDIR}/../../japanese/skkserv
 
-WRKSRC=		${WRKDIR}/skk-9.6
-GNU_CONFIGURE=	yes
+RUN_DEPENDS=	${PREFIX}/share/skk/${SKKJISYO}:${PORT_SKK_JISYO} \
+		${PREFIX}/bin/skkdic-count:${PORT_SKK_TOOLS} \
+		${PREFIX}/share/mule/site-lisp/skk/skk.el:${PORT_SKK_ELISP} \
+		${PREFIX}/sbin/skkserv:${PORT_SKK_SERV}
 
-MAKE_FLAGS+=	EMACS=mule
+EXTRACT_ONLY=	# empty
+NO_BUILD=	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}/libexec/skkserv ]; then" >> \
-			${STARTUP_SCRIPT}; \
-		echo "  echo -n ' skkserv'; ${PREFIX}/libexec/skkserv" >> \
-			${STARTUP_SCRIPT}; \
-		echo "fi" >> ${STARTUP_SCRIPT}; \
-		chmod 755 ${STARTUP_SCRIPT}; \
-	fi
-	if [ ! -f ${PREFIX}/info/dir ]; then \
-	  sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
-# Our makeinfo can't handle files with Japanese characters. :<
-	install-info --section="The Emacs editor and associated tools" --entry="* Skk: (skk.info).		Yet another Japanese Inputting Method. (Japanese)" ${PREFIX}/info/skk.info ${PREFIX}/info/dir
+do-install:	# empty
 
 .include <bsd.port.mk>
diff --git a/japanese/skk/pkg-comment b/japanese/skk/pkg-comment
index a7d8069adca3..12952b1b7d5a 100644
--- a/japanese/skk/pkg-comment
+++ b/japanese/skk/pkg-comment
@@ -1 +1 @@
-Simple Kana Kanji Converter: a Japanese-input software running on Nemacs or Mule.
+The "meta-port" for the SKK Japanese-input software.
diff --git a/japanese/skk/pkg-descr b/japanese/skk/pkg-descr
index 042a89133318..f0e59f36c26e 100644
--- a/japanese/skk/pkg-descr
+++ b/japanese/skk/pkg-descr
@@ -4,8 +4,8 @@ Mule (MULtilingual Emacs), and Demacs (DOS version of Emacs18/NEmacs).
 
 Check <URL:http://skk.kuis.kyoto-u.ac.jp/skk/> also, Home Page of SKK.
 
-When you select 'skkserv' as a conversion server, add
-
-	skkserv		1178/tcp
-
-to your /etc/services (or 'services' NIS database).
+This package does not contain anything by itself -- it is a "meta-port"
+that depends on other SKK packages (skkserv, skk-elisp, skk-jisyo,
+and skk-tools). Its sole purpose is to require dependencies so users can
+install this package only and have all the SKK stuff pulled in by the
+port/package dependency mechanism.
diff --git a/japanese/skk/pkg-plist b/japanese/skk/pkg-plist
index 268212e6446a..549a621fec0c 100644
--- a/japanese/skk/pkg-plist
+++ b/japanese/skk/pkg-plist
@@ -1,55 +1 @@
-bin/skkdic-expr
-bin/skkdic-count
-bin/skkdic-sort
-libexec/skkserv
-@unexec install-info --delete --section="The Emacs editor and associated tools" --entry="* Skk: (skk.info).		Yet another Japanese Inputting Method. (Japanese )" %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 [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info --section="The Emacs editor and associated tools" --entry="* Skk: (skk.info).		Yet another Japanese Inputting Method. (Japanese )" %D/info/skk.info %D/info/dir
-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
-etc/rc.d/skkserv.sh
-@dirrm share/skk
+@comment this plist intentionally left empty