Date: Wed, 1 Jan 2025 12:36:01 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 06603b78689d - main - japanese/onew: Remove expired port Message-ID: <202501011236.501Ca1ET009427@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=06603b78689de85111df2007102e07d17a3c8646 commit 06603b78689de85111df2007102e07d17a3c8646 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2025-01-01 12:35:47 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2025-01-01 12:35:47 +0000 japanese/onew: Remove expired port 2024-05-31 japanese/onew: Unfetchabled and listed BROKEN for over year --- MOVED | 1 + japanese/Makefile | 1 - japanese/onew/Makefile | 68 --------- japanese/onew/distinfo | 2 - japanese/onew/files/ONEW_CONF-for-canna+freewnn.in | 11 -- japanese/onew/files/ONEW_CONF-for-canna+wnn6.in | 13 -- japanese/onew/files/ONEW_CONF-for-canna+wnn7.in | 13 -- japanese/onew/files/ONEW_CONF-for-canna.in | 8 - japanese/onew/files/ONEW_CONF-for-freewnn.in | 6 - japanese/onew/files/ONEW_CONF-for-wnn.in | 14 -- japanese/onew/files/ONEW_CONF-for-wnn6.in | 8 - japanese/onew/files/ONEW_CONF-for-wnn7.in | 8 - japanese/onew/files/patch-ONEW_CONF.default | 17 --- japanese/onew/files/patch-conf.c | 28 ---- japanese/onew/files/patch-dialogue-jisyo.c | 51 ------- japanese/onew/files/patch-dialogue-keisen.c | 21 --- japanese/onew/files/patch-dialogue-onewdic.c | 133 ---------------- japanese/onew/files/patch-engine-Canna.c | 27 ---- japanese/onew/files/patch-interface-oui.c | 169 --------------------- japanese/onew/files/patch-interface-ouimessage.c | 116 -------------- japanese/onew/files/patch-onew.c | 11 -- japanese/onew/files/patch-onew.h | 41 ----- japanese/onew/files/patch-onewclient.c | 11 -- japanese/onew/files/patch-onewlib.c | 32 ---- japanese/onew/files/patch-onewmisc.c | 35 ----- japanese/onew/files/patch-sys_regex.c | 12 -- japanese/onew/files/patch-sys_sys.h | 35 ----- japanese/onew/pkg-descr | 2 - 28 files changed, 1 insertion(+), 893 deletions(-) diff --git a/MOVED b/MOVED index 22bef990b400..58da6995e868 100644 --- a/MOVED +++ b/MOVED @@ -3851,3 +3851,4 @@ databases/pgpool-II-41||2025-01-01|Has expired: Upstream EOL reaches on 2024-10- devel/electron29||2025-01-01|Has expired: EOLed upstream, switch to newer version devel/electron30||2025-01-01|Has expired: EOLed upstream, switch to newer version comms/libconcord||2025-01-01|Has expired: Logitech Harmony were officially discontinued in 2021, last major product in 2019 +japanese/onew||2025-01-01|Has expired: Unfetchabled and listed BROKEN for over year diff --git a/japanese/Makefile b/japanese/Makefile index cabc6dd25385..b42810a9b540 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -198,7 +198,6 @@ SUBDIR += ng-devel SUBDIR += ngraph-fonts SUBDIR += nkf - SUBDIR += onew SUBDIR += p5-2chproxy SUBDIR += p5-Date-Japanese-Era SUBDIR += p5-Date-Japanese-Holiday diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile deleted file mode 100644 index 99480fa76a68..000000000000 --- a/japanese/onew/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -PORTNAME= onew -PORTVERSION= 2.2.10 -PORTREVISION= 2 -CATEGORIES= japanese -MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \ - ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/ -DISTNAME= jvim2.0r+${PORTNAME}${PORTVERSION} - -MAINTAINER= hrs@FreeBSD.org -COMMENT= Library for Japanese Input Methods - -BROKEN= Doesn't fetch (NXDOMAIN) -DEPRECATED= Unfetchabled and listed BROKEN for over year -EXPIRATION_DATE=2024-05-31 - -WRKSRC= ${WRKDIR}/${PORTNAME} -ALL_TARGET= -CFLAGS+= -I${WRKSRC} -PORTDOCS= README.ONEW - -OPTIONS_DEFINE= CANNA CANNA_FREEWNN CANNA_WNN6 CANNA_WNN7 FREEWNN WNN6 WNN7 DOCS -OPTIONS_DEFAULT=CANNA CANNA_FREEWNN CANNA_WNN6 CANNA_WNN7 FREEWNN WNN6 WNN7 -CANNA_DESC= Build Canna-backend library -CANNA_FREEWNN_DESC= Build Canna+FreeWnn-backend library -CANNA_WNN6_DESC= Build Canna+Wnn6-backend library -CANNA_WNN7_DESC= Build Canna+Wnn7-backend library -FREEWNN_DESC= Build FreeWnn-backend library -WNN6_DESC= Build Wnn6-backend library -WNN7_DESC= Build Wnn7-backend library -CANNA_LIB_DEPENDS= libcanna.so:japanese/canna-lib -CANNA_FREEWNN_BUILD_DEPENDS= ${FREEWNN_BUILD_DEPENDS} -CANNA_WNN6_BUILD_DEPENDS= ${WNN6_BUILD_DEPENDS} -CANNA_WNN7_BUILD_DEPENDS= ${WNN7_BUILD_DEPENDS} -RK_DIR.CANNA_WNN6= ${RKDIR.WNN6} -RK_DIR.CANNA_WNN7= ${RKDIR.WNN7} -FREEWNN_BUILD_DEPENDS= ${LOCALBASE}/lib/libjd.a:japanese/FreeWnn-lib -WNN6_BUILD_DEPENDS= ${FREEWNN_BUILD_DEPENDS} -RK_DIR.WNN6= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 -WNN7_BUILD_DEPENDS= ${FREEWNN_BUILD_DEPENDS} -RK_DIR.WNN7= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 - -.include <bsd.port.options.mk> - -.for I in ${OPTIONS_DEFINE:NDOCS} -.if ${PORT_OPTIONS:M${I}} -INPUT_METHOD+= ${I:S/_/+/g:tl} -SUB_FILES+= ONEW_CONF-for-${I:S/_/+/g:tl} -PLIST_FILES+= lib/libonew-${I:S/_/+/g:tl}.a -RK_DIR+= ${RK_DIR.${I}} -.endif -.endfor - -do-build: -.for I in ${INPUT_METHOD} - ${INSTALL_DATA} ${WRKDIR}/ONEW_CONF-for-${I} ${WRKSRC}/ONEW_CONF - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} - ${INSTALL_DATA} ${WRKSRC}/libonew.a ${WRKDIR}/libonew-${I}.a -.endfor - -do-install: -.for I in ${INPUT_METHOD} - ${INSTALL_DATA} ${WRKDIR}/libonew-${I}.a \ - ${STAGEDIR}${PREFIX}/lib/libonew-${I}.a -.endfor - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/japanese/onew/distinfo b/japanese/onew/distinfo deleted file mode 100644 index 80e97dd83fe5..000000000000 --- a/japanese/onew/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (jvim2.0r+onew2.2.10.tar.gz) = 8cddd0bd98fa39ef6bda38d5fd5c00f791a42e4d11f75ef2db5fd6b5bd34a9f6 -SIZE (jvim2.0r+onew2.2.10.tar.gz) = 569300 diff --git a/japanese/onew/files/ONEW_CONF-for-canna+freewnn.in b/japanese/onew/files/ONEW_CONF-for-canna+freewnn.in deleted file mode 100644 index 96b7a2282a64..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-canna+freewnn.in +++ /dev/null @@ -1,11 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -CANNAINC = -I%%LOCALBASE%%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%%LOCALBASE%%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(CANNALIB) $(WNNLIB) -RKKOBJS = $(CANNAOBJ) $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn6.in b/japanese/onew/files/ONEW_CONF-for-canna+wnn6.in deleted file mode 100644 index 69bf566a03d4..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-canna+wnn6.in +++ /dev/null @@ -1,13 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn6:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' -CANNAINC = -I%%LOCALBASE%%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%%LOCALBASE%%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(WNNLIB) $(CANNALIB) -RKKOBJS = $(WNNOBJ) $(CANNAOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn7.in b/japanese/onew/files/ONEW_CONF-for-canna+wnn7.in deleted file mode 100644 index 96a5fd94a4cd..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-canna+wnn7.in +++ /dev/null @@ -1,13 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn7:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"system/%s.dic;usr/$$USER/%s.h"' -CANNAINC = -I%%LOCALBASE%%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%%LOCALBASE%%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(WNNLIB) $(CANNALIB) -RKKOBJS = $(WNNOBJ) $(CANNAOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-canna.in b/japanese/onew/files/ONEW_CONF-for-canna.in deleted file mode 100644 index 4b53cd211fed..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-canna.in +++ /dev/null @@ -1,8 +0,0 @@ -CANNAINC = -I%%LOCALBASE%%/include -CANNAOBJ = Canna.o CannaRk.o -CANNALIB = -L%%LOCALBASE%%/lib -lcanna -CANNA_RKPATH = '".:$$HOME:%%LOCALBASE%%/lib/canna/dic:/tmp/onew_rktabs/canna"' -CANNA_RKTAB = '"default.cbp"' -RKKLIBS = $(CANNALIB) -RKKOBJS = $(CANNAOBJ) -ONEW_ENGINE = '"canna/canna"' diff --git a/japanese/onew/files/ONEW_CONF-for-freewnn.in b/japanese/onew/files/ONEW_CONF-for-freewnn.in deleted file mode 100644 index c9e706222656..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-freewnn.in +++ /dev/null @@ -1,6 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn.in b/japanese/onew/files/ONEW_CONF-for-wnn.in deleted file mode 100644 index 8d5b5c70d144..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-wnn.in +++ /dev/null @@ -1,14 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn7:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn6:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = ' \ - "iwanami/%s.dic;usr/$$USER/%s.h",\ - "system/%s.dic;usr/$$USER/%s.h",\ - "pubdic/%s.dic;usr/$$USER/%s.h",\ - "gerodic/%s.dic;usr/$$USER/%s.h",\ - "wnncons/%s.doc;usr/$$USER/%s.h" \ - ' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn6.in b/japanese/onew/files/ONEW_CONF-for-wnn6.in deleted file mode 100644 index 8bbb9fa29816..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-wnn6.in +++ /dev/null @@ -1,8 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn6:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn7.in b/japanese/onew/files/ONEW_CONF-for-wnn7.in deleted file mode 100644 index 45fd9650024f..000000000000 --- a/japanese/onew/files/ONEW_CONF-for-wnn7.in +++ /dev/null @@ -1,8 +0,0 @@ -WNNINC = -I%%LOCALBASE%%/include/wnn -WNNLIB = -L%%LOCALBASE%%/lib -ljd -WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%%LOCALBASE%%/lib/wnn/ja_JP/rk.wnn7:%%LOCALBASE%%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' -WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' -WNN_DICDIRS = '"system/%s.dic;usr/$$USER/%s.h"' -RKKLIBS = $(WNNLIB) -RKKOBJS = $(WNNOBJ) -MISCLIB = -lcrypt diff --git a/japanese/onew/files/patch-ONEW_CONF.default b/japanese/onew/files/patch-ONEW_CONF.default deleted file mode 100644 index 066b0d1915d7..000000000000 --- a/japanese/onew/files/patch-ONEW_CONF.default +++ /dev/null @@ -1,17 +0,0 @@ ---- ONEW_CONF.default.orig 2013-11-03 22:07:32.000000000 +0900 -+++ ONEW_CONF.default 2013-11-03 22:08:20.000000000 +0900 -@@ -136,12 +136,12 @@ - ##SYSDEPEND = $(SYSTYPE) $(SELECT) - - #$@!z(J compiler $@%3%s%Q%$%i$NA*Br(J --CC = cc -+CC ?= cc - #CC = gcc - #CC = /usr/ucb/cc - #CC = /usr/5bin/cc - --CFLAGS = -O -+CFLAGS ?= -O - - #$@!z(J ranlib $@$,I,MW$J>l9g$KDj5A$7$F$M(J - RANLIB = ranlib diff --git a/japanese/onew/files/patch-conf.c b/japanese/onew/files/patch-conf.c deleted file mode 100644 index c69c84d78a3e..000000000000 --- a/japanese/onew/files/patch-conf.c +++ /dev/null @@ -1,28 +0,0 @@ ---- conf.c.orig 1994-06-23 11:42:33.000000000 +0900 -+++ conf.c 2014-05-25 11:51:12.000000000 +0900 -@@ -119,6 +119,7 @@ - } - return name; - } -+void - switch_rkserv(){ - char help[128]; - char *romkan; -@@ -137,6 +138,7 @@ - Onew_putmsg_retain(1,"%s %s",Onew_RK_smode(),help); - } - } -+void - switch_kkserv(){ - char mode[64],help[128],*kanakan; - -@@ -220,7 +222,8 @@ - #define IR(func) (romkan_select() ? func : 0) - #define ONEWromkan_ready(rkpath) IR((*RP->rk_ready)(rkpath)) - #define ONEWromkan_modesw(mode) IR((*RP->rk_modesw)(mode)) --#define ONEWromkan_clear() IR((*RP->rk_gotch)()) -+/*#define ONEWromkan_clear() IR((*RP->rk_gotch)())*/ -+#define ONEWromkan_clear() IR((*RP->rk_clear)()) - #define ONEWromkan_getc() IR((*RP->rk_getc)()) - #define ONEWromkan_next() IR((*RP->rk_next)()) - #define ONEWromkan_dispmode() IR((*RP->rk_dispmode)()) diff --git a/japanese/onew/files/patch-dialogue-jisyo.c b/japanese/onew/files/patch-dialogue-jisyo.c deleted file mode 100644 index 566246f78b06..000000000000 --- a/japanese/onew/files/patch-dialogue-jisyo.c +++ /dev/null @@ -1,51 +0,0 @@ ---- dialogue/jisyo.c.orig 2013-11-03 22:38:25.000000000 +0900 -+++ dialogue/jisyo.c 2013-11-03 22:43:05.000000000 +0900 -@@ -1,3 +1,4 @@ -+#include <string.h> - #include "onew.h" - - int OM_JisyoMode; -@@ -6,8 +7,10 @@ - int OM_JisyoGetKanjiFlush; - int OM_JisyoMassyou; - --extern Uchar ONEW_DicYomi[]; -+extern char ONEW_DicYomi[]; -+void odmJisyo_massyou(void); - -+int - odmStart_touroku(yomi) - char *yomi; - { -@@ -20,6 +23,7 @@ - return 1; - } - -+int - odmAbort_touroku(){ - if( OM_JisyoGetYomi || OM_JisyoGetTsuduri || OM_JisyoGetKanjiFlush ){ - Onew_putmsg(1,ONEW_msg_tourokuABORT); -@@ -32,6 +36,7 @@ - return 0; - } - -+int - odmJisyo_sousa(){ - int com; - -@@ -50,6 +55,7 @@ - return 0; - } - -+void - odmJisyo_massyou() - { - OM_JisyoMassyou = 1; -@@ -59,6 +65,7 @@ - OM_JisyoMassyou = 0; - } - -+void - odmJisyo_touroku() - { int i,max; - int com; diff --git a/japanese/onew/files/patch-dialogue-keisen.c b/japanese/onew/files/patch-dialogue-keisen.c deleted file mode 100644 index df49736a173c..000000000000 --- a/japanese/onew/files/patch-dialogue-keisen.c +++ /dev/null @@ -1,21 +0,0 @@ ---- dialogue/keisen.c.orig 2014-05-25 11:41:08.000000000 +0900 -+++ dialogue/keisen.c 2014-05-25 11:45:53.000000000 +0900 -@@ -6,7 +6,7 @@ - int KEISEN_TOGGLE_A = Cntl('N'); - int KEISEN_TOGGLE_B = Cntl('B'); - --static -+static int - keisen_toggle(type) - int type; - { -@@ -39,7 +39,8 @@ - } - return 0; - } --keisen_init(){ -+void -+keisen_init(void){ - ONEW_KEISEN_ON = getenv("ONEW_KEISENMODE"); - if( ONEW_KEISEN_ON == 0 ) - return; diff --git a/japanese/onew/files/patch-dialogue-onewdic.c b/japanese/onew/files/patch-dialogue-onewdic.c deleted file mode 100644 index 472452c2ca8e..000000000000 --- a/japanese/onew/files/patch-dialogue-onewdic.c +++ /dev/null @@ -1,133 +0,0 @@ ---- dialogue/onewdic.c.orig 2014-05-25 11:35:24.000000000 +0900 -+++ dialogue/onewdic.c 2014-05-25 11:39:56.000000000 +0900 -@@ -18,6 +18,8 @@ - History: - 940127 created - ///////////////////////////////////////////////////////////////////////*/ -+#include <stdlib.h> -+#include <string.h> - #include "onew.h" - int ONEW_MAXWORDS = 32; - -@@ -32,6 +34,7 @@ - - char *strpbrk(); - -+int - Onew_addword(dic,word) - char *dic; - char *word; -@@ -40,14 +43,14 @@ - int len; - - if( ONEW_MAXWORDS <= 0 ) -- return; -+ return 0; - - if( *word == 0 ) -- return; -+ return 0; - -- if( np = strpbrk(word,"\n\r") ){ -+ if((np = strpbrk(word,"\n\r")) != NULL){ - if( np == word ) -- return; -+ return 0; - len = np - word; - }else len = strlen(word); - -@@ -97,13 +100,13 @@ - return wp; - } - /* this function does not perform proper sorting X-< */ --static word_sort(nth,inc) -+static int word_sort(nth,inc) - { Word *dwp,*pwp,*twp; - Word **dwpp,**pwpp; - int nnth; - - if( (dwp = nth_wp(nth,&dwpp)) == 0 ) -- return; -+ return 0; - dwp->w_freq += inc; - - pwpp = &word_list; -@@ -116,7 +119,7 @@ - nnth++; - } - if( pwp == 0 || pwp == dwp ) -- return; -+ return 0; - - twp = *pwpp; - *pwpp = dwp; -@@ -143,14 +146,15 @@ - return str; - }else return 0; - } --static word_label(label,from,to,max) -+static void word_label(label,from,to,max) - char *label; - { - sprintf(label,"[%d/%d]",to-1,max); - } --static word_error(){ -+static void word_error(){ - } - -+void - Onew_getword(key) - char *key; - { int n; -@@ -178,11 +182,11 @@ - } - - --static -+static int - ONEWkanakan_ready(){ - return 1; - } --static -+static void - ONEWkanakan_freqsave() - { - } -@@ -192,29 +196,31 @@ - { - strncpy(kouho,nth_str(i),size); - } --static -+static void - ONEWkanakan() - { - } --static -+static void - ONEWbunsetu_next() - { - } --static -+static void - ONEWbunsetu_expand() - { - } --static -+static void - ONEWbunsetu_shrink() - { - } --static -+static void - ONEWjisyo_touroku() - { - } --static -+static void - ONEWjisyo_hinshi() - { - } -+#if 0 - RegisterKanakan(ONEW_OnewKanakan); -+#endif - diff --git a/japanese/onew/files/patch-engine-Canna.c b/japanese/onew/files/patch-engine-Canna.c deleted file mode 100644 index d143452c5755..000000000000 --- a/japanese/onew/files/patch-engine-Canna.c +++ /dev/null @@ -1,27 +0,0 @@ ---- engine/Canna.c.orig 1995-06-29 01:13:26.000000000 +0900 -+++ engine/Canna.c 2014-05-25 12:05:08.000000000 +0900 -@@ -33,6 +33,7 @@ - static int ready; - static int CID; - static int nbunsetsu; -+static void disp_kanji_buf(int); - int ONEW_CannarcDone; - - static ONEWkanakan_ready() -@@ -102,7 +103,6 @@ - int comch; - int rcode; - char yomibuf[1024]; -- static disp_kanji_buf(); - - Onew_setupYomistr(startch,yomi,yomibuf); - yomi = yomibuf; -@@ -182,7 +182,7 @@ - { - } - --static disp_kanji_buf(so) -+static void disp_kanji_buf(so) - { char kanji[1024]; - char left[1024],cur[1024],right[1024]; - int curbi,bi; diff --git a/japanese/onew/files/patch-interface-oui.c b/japanese/onew/files/patch-interface-oui.c deleted file mode 100644 index 70a75291baaf..000000000000 --- a/japanese/onew/files/patch-interface-oui.c +++ /dev/null @@ -1,169 +0,0 @@ ---- interface/oui.c.orig 1995-06-22 11:30:49.000000000 +0900 -+++ interface/oui.c 2013-11-03 22:36:39.000000000 +0900 -@@ -3,18 +3,34 @@ - ************************************************************************/ - - #include <stdio.h> -+#include <stdarg.h> - char *getenv(); - -+extern int ONEW_GETCHAR(); -+extern int ONEW_PEEKCHAR(); -+extern int ONEW_GOT_2BCHAR(); -+extern int ONEW_DISP_ROMKANMODE(); -+extern int ONEW_DISP_KANAHALVES(); -+extern int ONEW_KANAKAN(); -+extern int ONEW_DISP_KANAKANB(); -+extern int ONEW_KAKUTEI(); -+extern int ONEW_BEEP(); -+extern int ONEW_MESSAGE(); -+extern int ONEW_MESSAGE_COLS(); -+ - static FILE *ouiFp; - static int uin; - static int uilev; --ouiTrace(prim,fmt,a,b,c,d,e,f,g) -- char *fmt; -- FILE *prim; --{ char *logf; -+void -+ouiTrace(char *prim, char *fmt, ...) -+{ -+ va_list list; -+ char *logf; - -+ va_start(list, fmt); - if( ouiFp == NULL ){ -- if( logf = getenv("ONEW_UIFLOG") ) -+ logf = getenv("ONEW_UIFLOG"); -+ if( logf ) - ouiFp = fopen(logf,"w"); - if( ouiFp == NULL ) - ouiFp = (FILE*)-1; -@@ -23,11 +39,15 @@ - return; - fprintf(ouiFp,"%4d ",++uin); - fprintf(ouiFp,"%-16s ",prim); -- if(fmt) fprintf(ouiFp,fmt,a,b,c,d,e,f,g); -+ -+ if(fmt) vfprintf(ouiFp,fmt,list); - fprintf(ouiFp,"\n"); -+ va_end(list); - } --Onew_ouiTrace(prim,fmt,a,b,c,d,e,f,g){ ouiTrace(prim,fmt,a,b,c,d,e,f,g); } -+void -+Onew_ouiTrace(char *prim, char *fmt, va_list ap) { ouiTrace(prim, fmt, ap); } - -+int - ouiGETCHAR() - { int ch; - -@@ -37,6 +57,7 @@ - /*if( ch == '\n' ) LASTMSG[0] = 0;*/ - return ch; - } -+int - ouiPEEKCHAR(msecp) - int *msecp; - { int ch; -@@ -47,35 +68,41 @@ - ouiTrace("PEEKCHAR","(%x)",ch); - return ch; - } -+int - ouiGOT_2BCHAR(buf,hi,lo) - char *buf; - { - ouiTrace("GOT_2BCHAR",0); - return ONEW_GOT_2BCHAR(buf,hi,lo); - } -+int - ouiDISP_ROMKANMODE(mode,help,modeflags) - char *mode,*help; - { - ouiTrace("DISP_ROMKANMODE","%-6s[%04x]",mode,modeflags); - return ONEW_DISP_ROMKANMODE(mode,help,modeflags); - } -+int - ouiDISP_KANAHALVES(str) - char *str; - { - ouiTrace("DISP_KANAHALVES","(%s)",str); - return ONEW_DISP_KANAHALVES(str); - } -+int - ouiKANAKAN(kkchar) - { - ouiTrace("KANAKAN","%x",kkchar); - return ONEW_KANAKAN(kkchar); - } -+int - ouiDISP_KANAKANB(so,left,cur,right) - char *left,*cur,*right; - { - ouiTrace("DISP_KANAKANB","%d",so); - return ONEW_DISP_KANAKANB(so,left,cur,right); - } -+int - ouiKAKUTEI(kakutei_start_char) - { - ouiTrace("KAKUTEI","%x",kakutei_start_char); -@@ -85,11 +112,13 @@ - * ONEW_KAKUTEI: returns true if the character is consumed for kakutei - */ - -+int - ouiBEEP(waitsec) - { - ouiTrace("BEEP",0); - return ONEW_BEEP(waitsec); - } -+int - ouiMESSAGE_COLS() - { int cols; - -@@ -97,29 +126,36 @@ - ouiTrace("MESSAGE_COLS","%d",cols); - return cols; - } --ouiMESSAGE(so,fmt,a,b,c,d,e,f,g) -- char *fmt; -- char *a,*b,*c,*d,*e,*f,*g; -+int -+ouiMESSAGE(int so, char *fmt, ...) - { char msg[512]; -+ va_list list; -+ int ret; - -- sprintf(msg,fmt,a,b,c,d,e,f,g); -+ va_start(list, fmt); -+ sprintf(msg,fmt,list); - ouiTrace("MESSAGE","<%s>",msg); -- return ONEW_MESSAGE(so,fmt,a,b,c,d,e,f,g); -+ ret = ONEW_MESSAGE(so, fmt, list); -+ va_end(list); -+ -+ return (ret); - } - - - /* - * - */ --Onew_disp_kanahalf(ch) -+void Onew_disp_kanahalves(char *); -+void -+Onew_disp_kanahalf(int ch) - { char buf[128]; - - buf[0] = ch; - buf[1] = 0; - Onew_disp_kanahalves(buf); - } --Onew_disp_kanahalves(str) -- char *str; -+void -+Onew_disp_kanahalves(char *str) - { - if( *str == 0 ) - ouiDISP_KANAHALVES(" "); diff --git a/japanese/onew/files/patch-interface-ouimessage.c b/japanese/onew/files/patch-interface-ouimessage.c deleted file mode 100644 index d46c61ea744d..000000000000 --- a/japanese/onew/files/patch-interface-ouimessage.c +++ /dev/null @@ -1,116 +0,0 @@ ---- interface/ouimessage.c.orig 1994-06-04 19:37:36.000000000 +0900 -+++ interface/ouimessage.c 2013-11-03 22:34:46.000000000 +0900 -@@ -1,12 +1,14 @@ - /* - * MESSAGE OUTPUT TO APPLICATION USER INTERFACE - */ -+#include <stdio.h> -+#include <string.h> -+#include <stdarg.h> -+#include "onew.h" -+ - char *Onew_RK_smode(); - char *romkan_help(); - --typedef char Linebuff[1024]; --typedef char Mssgbuff[1024]; -- - static Linebuff LASTMSG; - static Linebuff LASTMODE; - static Linebuff LASTHELP; -@@ -16,8 +18,8 @@ - static int ONEW_msg_overw; - static int ONEW_msg_retain; - --Onew_putmode(mode,help) -- char *mode,*help; -+void -+Onew_putmode(char *mode, char *help) - { int modeflags,xmodef; - char xmode[128]; - char xhelp[512]; -@@ -48,21 +50,30 @@ - } - } - --Onew_putmsg_sys(so,fmt,a,b,c,d,e,f,g) -- char *fmt,*a,*b,*c,*d,*e,*f,*g; -+void -+Onew_putmsg_sys(int so, char *fmt, ...) - { -+ va_list list; -+ -+ va_start(list, fmt); - ONEW_msg_overw = 1; -- Onew_putmsg(so,fmt,a,b,c,d,e,f,g); -+ Onew_putmsg(so, fmt, list); -+ va_end(list); - } --Onew_putmsg_retain(so,fmt,a,b,c,d,e,f,g) -- char *fmt,*a,*b,*c,*d,*e,*f,*g; -+void -+Onew_putmsg_retain(int so, char *fmt, ...) - { -+ va_list list; -+ -+ va_start(list, fmt); - ONEW_msg_retain = 1; -- Onew_putmsg(so,fmt,a,b,c,d,e,f,g); -+ Onew_putmsg(so, fmt, list); -+ va_end(list); - } - -+void - Onew_putmodef(mode,fmt,a,b,c,d,e,f,g) -- char *fmt,*a,*b,*c,*d,*e,*f,*g; -+ char *mode,*fmt,*a,*b,*c,*d,*e,*f,*g; - { char help[1024]; - - sprintf(help,fmt,a,b,c,d,e,f,g); -@@ -71,6 +82,7 @@ - - static Linebuff PUSHEDMODE; - static Linebuff PUSHEDHELP; -+void - Onew_pushmode(mode) - char *mode; - { -@@ -79,25 +91,28 @@ - strcpy(PUSHEDHELP,LASTHELP); - Onew_putmode(mode,""); - } -+void - Onew_popmode() - { - ONEW_modedepth--; - Onew_putmode(PUSHEDMODE,PUSHEDHELP); - } - -+void - Onew_curmsg(msg) - char *msg; - { - strcpy(LASTMSG,msg); - } --Onew_putmsg(so,F,a,b,c,d,e,f,g) -- char *F; -- char *a,*b,*c,*d,*e,*f,*g; -+void -+Onew_putmsg(int so, char *F, ...) - { Mssgbuff tmsg,msg; - char *mp; - int maxcol = ouiMESSAGE_COLS(); -+ va_list list; - -- sprintf(tmsg,F,a,b,c,d,e,f,g); -+ va_start(list, F); -+ sprintf(tmsg,F,list); - - /* sprintf(msg,"%s%*s",so?" ":"",-maxcol,tmsg); */ - sprintf(msg,"%*s",-maxcol,tmsg); -@@ -117,4 +132,5 @@ - ouiMESSAGE(so,"%s",msg); - strcpy(LASTMSG,msg); - } -+ va_end(list); - } diff --git a/japanese/onew/files/patch-onew.c b/japanese/onew/files/patch-onew.c deleted file mode 100644 index 6c4a8a40f9d7..000000000000 --- a/japanese/onew/files/patch-onew.c +++ /dev/null @@ -1,11 +0,0 @@ ---- onew.c.orig 2014-05-25 11:54:18.000000000 +0900 -+++ onew.c 2014-05-25 11:54:37.000000000 +0900 -@@ -492,7 +492,7 @@ - fflush(stdout); - } - static int prev_modef; --ONEW_DISP_ROMKANMODE(cmode,chelp,modef) -+void ONEW_DISP_ROMKANMODE(cmode,chelp,modef) - char *cmode,*chelp; - { - if( modef == prev_modef ) diff --git a/japanese/onew/files/patch-onew.h b/japanese/onew/files/patch-onew.h deleted file mode 100644 index bd882934cfad..000000000000 --- a/japanese/onew/files/patch-onew.h +++ /dev/null @@ -1,41 +0,0 @@ ---- onew.h.orig 1994-06-24 10:27:13.000000000 +0900 -+++ onew.h 2014-05-25 11:45:20.000000000 +0900 -@@ -21,7 +21,7 @@ - - #define LINESIZE 1024 - typedef unsigned char Uchar; --typedef Uchar Linebuff[LINESIZE]; -+typedef char Linebuff[LINESIZE]; - typedef char Mssgbuff[LINESIZE]; - typedef char Pathname[LINESIZE]; - -@@ -272,3 +272,29 @@ - #define JVIM_RARROW 0xffffff83 - #define JVIM_HENKAN 0xffffff9f - -+int ouiGETCHAR(void); -+int ouiPEEKCHAR(int *); -+int ouiGOT_2BCHAR(char *, int, int); -+int ouiDISP_ROMKANMODE(char *, char *, int); -+int ouiDISP_KANAHALVES(char *); -+int ouiKANAKAN(int); -+int ouiDISP_KANAKANB(char *, char *, char *, char *); -+int ouiKAKUTEI(int); -+int ouiBEEP(int); -+int ouiMESSAGE_COLS(void); -+int ouiMESSAGE(int, char *, ...); -+int Onew_modef(char **, char *, char **, char *); -+void Onew_putmsg(int, char *, ...); -+void Onew_putmsg_sys(int, char *, ...); -+void Onew_putmsg_retain(int, char *, ...); -+void Onew_putmode(char *, char *); -+ -+int ONEW_getch0(int); -+ -+int oeiJisyoTouroku(int, char *, char *, char *); -+ -+int in_kana_mode(void); -+int Onew_RK_imode(void); -+int Onew_RK_imode_set(int); -+int Onew_defineKanamode(int, int, IFUNC); -+ diff --git a/japanese/onew/files/patch-onewclient.c b/japanese/onew/files/patch-onewclient.c deleted file mode 100644 index 908dfb854dd7..000000000000 --- a/japanese/onew/files/patch-onewclient.c +++ /dev/null @@ -1,11 +0,0 @@ ---- onewclient.c.orig 2014-05-25 11:46:28.000000000 +0900 -+++ onewclient.c 2014-05-25 11:47:06.000000000 +0900 -@@ -43,7 +43,7 @@ - Onew_message(form,a,b,c,d,e,f,g); - } - --static open_onew(){ -+static void open_onew(void){ - register int pid; - char *command; - diff --git a/japanese/onew/files/patch-onewlib.c b/japanese/onew/files/patch-onewlib.c deleted file mode 100644 index f1c90408b2ce..000000000000 --- a/japanese/onew/files/patch-onewlib.c +++ /dev/null @@ -1,32 +0,0 @@ ---- onewlib.c.orig 1995-07-02 16:55:41.000000000 +0900 -+++ onewlib.c 2014-05-25 11:55:49.000000000 +0900 -@@ -50,6 +50,11 @@ - int ONEW_I_SYNC_CHAR = 0xFF; - int ONEW_KK_OPDICT = 'x'; - -+static definedKanamode(); -+static romkan_modesw(); -+static thru_char1(); -+static Onew_kakuteiInRomkan(); -+ - #define MODE_SWITCHER ONEW_MODE_SWITCHER - #define ZENKAKU_TOGGLE ONEW_ZENKAKU_TOGGLE *** 127 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501011236.501Ca1ET009427>