Add back the skk and skkfep ports, which were erroneously removed: the

skk port is a meta-port and (presumably) does not require skk-elisp to
run.  I have removed the skk-elisp dependency from skk.  The skkfep port
did not depend on skk-elisp explicitly, only via the skk port.

13 files changed, 171 insertions, 0 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 4363315c7327..a1362203d308 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -328,10 +328,12 @@
     SUBDIR += seizedesktop
     SUBDIR += shinonome
     SUBDIR += sj3
+    SUBDIR += skk
     SUBDIR += skk-jisyo
     SUBDIR += skk-jisyo-cdb
     SUBDIR += skk-tools
     SUBDIR += skk10-elisp-emacs20
+    SUBDIR += skkfep
     SUBDIR += skkinput
     SUBDIR += skkinput3
     SUBDIR += skkserv
diff --git a/japanese/skk/Makefile b/japanese/skk/Makefile
new file mode 100644
index 000000000000..3ba12e5aa424
--- /dev/null
+++ b/japanese/skk/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	skk
+# Date created:		04 Mar 1997
+# Whom:			Makoto Matsushita <matusita@jp.freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	skk
+PORTVERSION=	9.6
+CATEGORIES=	japanese elisp
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	matusita@FreeBSD.org
+COMMENT=The "meta-port" for the SKK Japanese-input software
+
+RUN_DEPENDS=	${LOCALBASE}/share/skk/${SKKJISYO}:${PORT_SKK_JISYO} \
+		${LOCALBASE}/bin/skkdic-count:${PORT_SKK_TOOLS} \
+		${LOCALBASE}/sbin/skkserv:${PORT_SKK_SERV}
+
+NO_BUILD=	yes
+
+SKKJISYO_SIZE?=	L
+SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
+PORT_SKK_JISYO=	${.CURDIR}/../../japanese/skk-jisyo
+PORT_SKK_TOOLS=	${.CURDIR}/../../japanese/skk-tools
+PORT_SKK_SERV=	${.CURDIR}/../../japanese/skkserv
+
+do-install:	# empty
+
+.include <bsd.port.mk>
diff --git a/japanese/skk/pkg-descr b/japanese/skk/pkg-descr
new file mode 100644
index 000000000000..7eaaee600524
--- /dev/null
+++ b/japanese/skk/pkg-descr
@@ -0,0 +1,11 @@
+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).
+
+WWW: http://skk.kuis.kyoto-u.ac.jp/skk/
+
+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
new file mode 100644
index 000000000000..549a621fec0c
--- /dev/null
+++ b/japanese/skk/pkg-plist
@@ -0,0 +1 @@
+@comment this plist intentionally left empty
diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile
new file mode 100644
index 000000000000..64903c4cfa74
--- /dev/null
+++ b/japanese/skkfep/Makefile
@@ -0,0 +1,28 @@
+# New ports collection Makefile for:	skkfep
+# Date created:		22 Jul 1998
+# Whom:			Yusuke Nawano <azuki@azkey.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	skkfep
+PORTVERSION=	0.86c
+CATEGORIES=	japanese
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=	pool/main/s/skkfep
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	SKK-like Kana-to-Kanji FrontEnd Processor
+
+RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skk
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+MAN1=		skkfep.1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${MANPREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/japanese/skkfep/distinfo b/japanese/skkfep/distinfo
new file mode 100644
index 000000000000..d5558f2aadd2
--- /dev/null
+++ b/japanese/skkfep/distinfo
@@ -0,0 +1 @@
+MD5 (skkfep_0.86c.orig.tar.gz) = 0e06d473b70bd0233e25195e062bb663
diff --git a/japanese/skkfep/files/patch-aa b/japanese/skkfep/files/patch-aa
new file mode 100644
index 000000000000..5caf7ed9c12e
--- /dev/null
+++ b/japanese/skkfep/files/patch-aa
@@ -0,0 +1,32 @@
+--- config.h.orig	Tue Sep 22 01:45:27 1998
++++ config.h	Wed Aug  2 02:50:39 2000
+@@ -2,19 +2,19 @@
+  * Configuration for SKKFEP
+  */
+ 
+-#include "configs/solaris2.h"
++#include "configs/freebsd.h"
+ 
+ #if makefile_parameter
+-CC=gcc
++#CC=gcc
+ DEFINE=-DUSE_LOCALE
+-OPTIMIZE=-O
++#OPTIMIZE=-O
+ EXTRALIBS=
+ #endif
+ 
+ #define DEFAULT_KANAKEY "^j"
+ 
+ /* By Y. Kaneko */
+-/*#define KUTOUTEN        /* "."->maru, ","->ten */
++#define KUTOUTEN        /* "."->maru, ","->ten */
+ 
+ #define KANJIBS			/* do/don't shuft-out BS code in JIS mode */
+ #define KANJIBS_DEFAULT	0	/* 0 -> shift out / 1 -> don't shift out  */
+@@ -28,4 +28,4 @@
+ 
+ #define NATIVECODE	euc	/* EUC Kanji code */
+ 
+-#define SKK_SERVER_HOST	"ei5nazha"	/* SKK server host */
++#define SKK_SERVER_HOST	"localhost"	/* SKK server host */
diff --git a/japanese/skkfep/files/patch-ab b/japanese/skkfep/files/patch-ab
new file mode 100644
index 000000000000..da463e236085
--- /dev/null
+++ b/japanese/skkfep/files/patch-ab
@@ -0,0 +1,8 @@
+--- protoMakefile.orig	Tue Jul  7 00:31:15 1998
++++ protoMakefile	Wed Aug  2 02:56:16 2000
+@@ -1,4 +1,4 @@
+-CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
++CFLAGS+=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
+ LIBS  =$(SYSLIBS) $(EXTRALIBS) -ltermcap
+ 
+ OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
diff --git a/japanese/skkfep/files/patch-ad b/japanese/skkfep/files/patch-ad
new file mode 100644
index 000000000000..ece91c1f5aa9
--- /dev/null
+++ b/japanese/skkfep/files/patch-ad
@@ -0,0 +1,11 @@
+--- configs/freebsd.h.orig	Tue Jul  7 00:31:14 1998
++++ configs/freebsd.h	Fri Aug 23 02:40:05 2002
+@@ -7,6 +7,8 @@
+ 
+ #define HAVE_SETENV	/* My machine has setenv() */
+ 
++#define NO_MALLOC_H	/* no <malloc.h>  */
++			/* (has <sys/malloc.h> but not needed) */
+ #define HAVE_BSD_OPENPTY /* BSD type openpty() */
+ /*#include <libutil.h>	/* for openpty() */
+ 
diff --git a/japanese/skkfep/files/patch-ae b/japanese/skkfep/files/patch-ae
new file mode 100644
index 000000000000..32c45b5bccc0
--- /dev/null
+++ b/japanese/skkfep/files/patch-ae
@@ -0,0 +1,17 @@
+--- skkfep.1.old	Wed Jul 29 04:09:11 1998
++++ skkfep.1	Wed Jul 29 04:26:46 1998
+@@ -68,6 +68,14 @@
+ With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key.
+ This option is useful for vi-users.
+ .TP
++.B -viesc
++With this option, ESC + one of 'iaoIASR' key becomes `RETUEN-TO-SKK-MODE' key.
++This option is useful for vi-users.
++.TP
++.B -emacsesc
++With this option, ESC + any key becomes `RETUEN-TO-SKK-MODE' key.
++This option is useful for emacs-users.
++.TP
+ .B -rs
+ Reverse status line.
+ .TP 
diff --git a/japanese/skkfep/files/patch-af b/japanese/skkfep/files/patch-af
new file mode 100644
index 000000000000..5c1ce5c59c9c
--- /dev/null
+++ b/japanese/skkfep/files/patch-af
@@ -0,0 +1,23 @@
+--- Makefile.orig	Tue Jul  7 00:31:14 1998
++++ Makefile	Wed Aug  2 03:24:50 2000
+@@ -2,16 +2,16 @@
+ # Makefile for skkfep
+ #
+ all: genMakefile
+-	make -f genMakefile all
++	$(MAKE) -f genMakefile all
+ 
+ skkfep: genMakefile
+-	make -f genMakefile skkfep
++	$(MAKE) -f genMakefile skkfep
+ 
+ simpledic: genMakefile
+-	make -f genMakefile simpledic
++	$(MAKE) -f genMakefile simpledic
+ 
+ clean: genMakefile
+-	make -f genMakefile clean
++	$(MAKE) -f genMakefile clean
+ 	rm -f genMakefile
+ 
+ genMakefile: protoMakefile config.h
diff --git a/japanese/skkfep/pkg-descr b/japanese/skkfep/pkg-descr
new file mode 100644
index 000000000000..6004d4dfca99
--- /dev/null
+++ b/japanese/skkfep/pkg-descr
@@ -0,0 +1,4 @@
+skkfep is a tool to input Kana and Kanji from the terminal.
+This also include some patches for Word registration.
+
+-Yusuke NAWANO <azuki@azkey.org>
diff --git a/japanese/skkfep/pkg-plist b/japanese/skkfep/pkg-plist
new file mode 100644
index 000000000000..f4df7dab762e
--- /dev/null
+++ b/japanese/skkfep/pkg-plist
@@ -0,0 +1 @@
+bin/skkfep