From owner-freebsd-ports Fri Aug 4 17: 0:17 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 58E5C37BCEF for ; Fri, 4 Aug 2000 17:00:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id RAA44455; Fri, 4 Aug 2000 17:00:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id F3C1E37B952; Fri, 4 Aug 2000 16:51:20 -0700 (PDT) Message-Id: <20000804235120.F3C1E37B952@hub.freebsd.org> Date: Fri, 4 Aug 2000 16:51:20 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/20426: Update port: japanese/skkfep to 0.86c Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20426 >Category: ports >Synopsis: Update port: japanese/skkfep to 0.86c >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 04 17:00:02 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 0.86c New file: patches/patch-af Remove file: patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/skkfep/Makefile japanese/skkfep/Makefile --- /usr/ports/japanese/skkfep/Makefile Tue Jun 13 05:33:06 2000 +++ japanese/skkfep/Makefile Wed Aug 2 03:24:03 2000 @@ -6,25 +6,19 @@ # 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 - 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 diff -urN /usr/ports/japanese/skkfep/files/md5 japanese/skkfep/files/md5 --- /usr/ports/japanese/skkfep/files/md5 Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/files/md5 Wed Aug 2 02:37:02 2000 @@ -1,2 +1 @@ -MD5 (skkfep0.85.tar.gz) = 352fcc62f2d60d98b1d5e3b310ccfa77 -MD5 (skkfep111.diff.gz) = 4e044feb8df7bfad7dc6f1e267c66c5d +MD5 (skkfep0.86c.tar.gz) = 0e06d473b70bd0233e25195e062bb663 diff -urN /usr/ports/japanese/skkfep/patches/patch-aa japanese/skkfep/patches/patch-aa --- /usr/ports/japanese/skkfep/patches/patch-aa Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/patches/patch-aa Wed Aug 2 02:50:49 2000 @@ -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 -urN /usr/ports/japanese/skkfep/patches/patch-ab japanese/skkfep/patches/patch-ab --- /usr/ports/japanese/skkfep/patches/patch-ab Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/patches/patch-ab Wed Aug 2 02:56:25 2000 @@ -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 -urN /usr/ports/japanese/skkfep/patches/patch-ac japanese/skkfep/patches/patch-ac --- /usr/ports/japanese/skkfep/patches/patch-ac Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- skklib.h.orig Wed Jun 24 17:43:43 1998 -+++ skklib.h Wed Jun 24 17:44:32 1998 -@@ -8,7 +8,7 @@ - #define SKKLIB_H - - #ifndef NO_MALLOC_H --#include -+#include - #endif - - #ifdef SKK_SERVER_HOST diff -urN /usr/ports/japanese/skkfep/patches/patch-ad japanese/skkfep/patches/patch-ad --- /usr/ports/japanese/skkfep/patches/patch-ad Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/patches/patch-ad Wed Aug 2 02:53:17 2000 @@ -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 /* 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 */ ++ /* (has but not needed) */ + #define HAVE_BSD_OPENPTY /* BSD type openpty() */ + /*#include /* for openpty() */ #if makefile_parameter -SYSLIBS=-lutil diff -urN /usr/ports/japanese/skkfep/patches/patch-af japanese/skkfep/patches/patch-af --- /usr/ports/japanese/skkfep/patches/patch-af Thu Jan 1 09:00:00 1970 +++ japanese/skkfep/patches/patch-af Wed Aug 2 03:24:56 2000 @@ -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 -urN /usr/ports/japanese/skkfep/pkg/DESCR japanese/skkfep/pkg/DESCR --- /usr/ports/japanese/skkfep/pkg/DESCR Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/pkg/DESCR Wed Aug 2 02:23:51 2000 @@ -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 diff -urN /usr/ports/japanese/skkfep/pkg/PLIST japanese/skkfep/pkg/PLIST --- /usr/ports/japanese/skkfep/pkg/PLIST Wed Nov 11 00:47:20 1998 +++ japanese/skkfep/pkg/PLIST Wed Aug 2 03:11:54 2000 @@ -1,3 +1 @@ bin/skkfep -bin/escmode -bin/resetsize >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message