8 files changed, 60 insertions, 63 deletions

diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile
index 639f0c21e3a8..f82b69e8c660 100644
--- a/japanese/skkfep/Makefile
+++ b/japanese/skkfep/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	skkfep
-PORTVERSION=	0.85
+PORTVERSION=	0.86c
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.azkey.org/pub/misc/skkfep/
+MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/skkfep/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-PATCH_SITES=	ftp://ftp.azkey.org/pub/misc/skkfep/
-PATCHFILES=	skkfep111.diff.gz
-PATCH_DIST_STRIP=	-p1
+MAINTAINER=	freebsd-ports@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skk
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN1=		skkfep.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/escmode ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/resetsize ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/japanese/skkfep/distinfo b/japanese/skkfep/distinfo
index 2e4319f7eb10..b4eed9e3e027 100644
--- a/japanese/skkfep/distinfo
+++ b/japanese/skkfep/distinfo
@@ -1,2 +1 @@
-MD5 (skkfep0.85.tar.gz) = 352fcc62f2d60d98b1d5e3b310ccfa77
-MD5 (skkfep111.diff.gz) = 4e044feb8df7bfad7dc6f1e267c66c5d
+MD5 (skkfep0.86c.tar.gz) = 0e06d473b70bd0233e25195e062bb663
diff --git a/japanese/skkfep/files/patch-aa b/japanese/skkfep/files/patch-aa
index 057754682fe4..5caf7ed9c12e 100644
--- a/japanese/skkfep/files/patch-aa
+++ b/japanese/skkfep/files/patch-aa
@@ -1,20 +1,20 @@
---- config.h.orig	Sun Jul 26 21:14:43 1998
-+++ config.h	Sun Jul 26 21:16:05 1998
-@@ -2,7 +2,7 @@
+--- 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/sun.h"
+-#include "configs/solaris2.h"
 +#include "configs/freebsd.h"
  
  #if makefile_parameter
- CC=gcc
-@@ -15,12 +15,12 @@
- #define REGMODE		/* enable register mode feature */
- #define USE_SKKSRCH	/* use skksrch.c instead of skkserv */
- #define USE_TRIANGLE	/* use triangle mark like SKK */
--#define SKKFEP_LIB	/* use skkfep as library for SKK interface on jvim */
-+#undef SKKFEP_LIB	/* use skkfep as library for SKK interface on jvim */
+-CC=gcc
++#CC=gcc
+ DEFINE=-DUSE_LOCALE
+-OPTIMIZE=-O
++#OPTIMIZE=-O
+ EXTRALIBS=
+ #endif
  
  #define DEFAULT_KANAKEY "^j"
  
@@ -22,18 +22,11 @@
 -/*#define KUTOUTEN        /* "."->maru, ","->ten */
 +#define KUTOUTEN        /* "."->maru, ","->ten */
  
- #ifndef SKKFEP_LIB
  #define KANJIBS			/* do/don't shuft-out BS code in JIS mode */
-@@ -43,10 +43,10 @@
+ #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 */
- 
- #ifdef USE_SKKSRCH
--# define SKKSRCH_DIC		"/usr/local/skk/lib/SKK-JISYO.L"
-+# define SKKSRCH_DIC		"/usr/local/share/skkfep/SKK-JISYO.Li"
- # define BINARY_SEARCH			/* do binary search in skksrch.c */
- # define USE_SERVER
- # define openSKKserv		openSKKsrch
diff --git a/japanese/skkfep/files/patch-ab b/japanese/skkfep/files/patch-ab
index 76573347d31d..da463e236085 100644
--- a/japanese/skkfep/files/patch-ab
+++ b/japanese/skkfep/files/patch-ab
@@ -1,28 +1,8 @@
---- protoMakefile.orig	Mon Jul 27 18:59:01 1998
-+++ protoMakefile	Mon Jul 27 18:59:17 1998
-@@ -4,19 +4,19 @@
- SRCS=fep.c connsh.c readwrite.c terms.c stty.c keybind.c romkan.c etc.c\
- 	kkconv.c keymap.c version.c
- FEPLIBSRCS=keybind.c romkan.c kkconv.c keymap.c
--#SKKSRCS=skklib.c connserv.c
--SKKSRCS=skklib.c skksrch.c
-+SKKSRCS=skklib.c connserv.c
-+#SKKSRCS=skklib.c skksrch.c
- OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
- 	kkconv.o keymap.o version.o
- FEPLIBOBJS=keybind.o romkan.o kkconv.o keymap.o
--#SKKOBJS=skklib.o connserv.o
--SKKOBJS=skklib.o skksrch.o
-+SKKOBJS=skklib.o connserv.o
-+#SKKOBJS=skklib.o skksrch.o
- SDICOBJS=simpledic.o
- SKKFEP=skkfep
- SKKFEPLIB=libskkfep.a
- 
--all: jc $(SKKFEPLIB)
--#all: jc $(SKKFEP)
-+#all: jc $(SKKFEPLIB)
-+all: jc $(SKKFEP)
+--- 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
  
- romkan.c: romkan-org.c jc
- 	./jc -`./jc -c romkan-org.c`P romkan-org.c > romkan.c
+ 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
index 0b0134aa6022..43586b1c7a80 100644
--- a/japanese/skkfep/files/patch-ad
+++ b/japanese/skkfep/files/patch-ad
@@ -1,7 +1,13 @@
---- configs/freebsd.h.orig	Wed Jul 29 05:07:27 1998
-+++ configs/freebsd.h	Wed Jul 29 05:07:47 1998
-@@ -12,5 +12,5 @@
- #include <libutil.h>	/* for openpty() */
+--- configs/freebsd.h.orig	Tue Jul  7 00:31:14 1998
++++ configs/freebsd.h	Wed Aug  2 02:53:06 2000
+@@ -7,9 +7,11 @@
+ 
+ #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() */
  
  #if makefile_parameter
 -SYSLIBS=-lutil
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
index 6004d4dfca99..65172c3572c3 100644
--- a/japanese/skkfep/pkg-descr
+++ b/japanese/skkfep/pkg-descr
@@ -1,4 +1,6 @@
 skkfep is a tool to input Kana and Kanji from the terminal.
 This also include some patches for Word registration.
 
+WWW: http://ei5nazha.yz.yamagata-u.ac.jp/~aito/aito-soft.html
+
 -Yusuke NAWANO <azuki@azkey.org>
diff --git a/japanese/skkfep/pkg-plist b/japanese/skkfep/pkg-plist
index 49a20867303e..f4df7dab762e 100644
--- a/japanese/skkfep/pkg-plist
+++ b/japanese/skkfep/pkg-plist
@@ -1,3 +1 @@
 bin/skkfep
-bin/escmode
-bin/resetsize