From ab9d51b7e6e7377077287d42f71c53eae6a06974 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Thu, 22 Jun 1995 00:35:39 +0000 Subject: Upgrade, 3.2p1 -> 3.2p2. Submitted by: NIIMI Satoshi --- japanese/canna-server/Makefile | 9 +- japanese/canna-server/distinfo | 2 +- japanese/canna-server/files/patch-aa | 346 ++++++----------------------------- japanese/canna-server/pkg-comment | 2 +- japanese/canna-server/pkg-descr | 1 + 5 files changed, 64 insertions(+), 296 deletions(-) (limited to 'japanese/canna-server') diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 57ea64032379..3348f096f37d 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -1,13 +1,14 @@ # New ports collection makefile for: Canna -# Version required: 3.2p1 +# Version required: 3.2p2 # Date created: 3 November 1995 # Whom: Nobuhiro Yasutomi +# NIIMI Satoshi # -# $Id: Makefile,v 1.3 1995/04/01 12:46:20 jkh Exp $ +# $Id: Makefile,v 1.4 1995/04/07 05:47:57 asami Exp $ # -DISTNAME= Canna32p1 -PKGNAME= Canna-3.2.1 +DISTNAME= Canna32p2 +PKGNAME= Canna-3.2.2 CATEGORIES+= japanese MASTER_SITES= ftp://ftp.nec.co.jp/pub/packages/Canna32/ \ ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/ diff --git a/japanese/canna-server/distinfo b/japanese/canna-server/distinfo index 1486bbe4af0c..a844d290c415 100644 --- a/japanese/canna-server/distinfo +++ b/japanese/canna-server/distinfo @@ -1 +1 @@ -MD5 (Canna32p1.tar.gz) = dfe6ef05c20d62b3baf4f6ddb4ef71b2 +MD5 (Canna32p2.tar.gz) = fc5016ed531512618b0541db67d2c2dd diff --git a/japanese/canna-server/files/patch-aa b/japanese/canna-server/files/patch-aa index a34b243c2e09..603875c8bca1 100644 --- a/japanese/canna-server/files/patch-aa +++ b/japanese/canna-server/files/patch-aa @@ -1,6 +1,7 @@ -diff -uNr Canna32p1/Canna.conf Canna32p1-FreeBSD2.0/Canna.conf ---- Canna32p1/Canna.conf Tue May 31 08:47:26 1994 -+++ Canna32p1-FreeBSD2.0/Canna.conf Sat Jan 14 00:00:01 1995 +Index: canna/Canna.conf +diff -u canna/Canna.conf:1.1.1.1 canna/Canna.conf:1.2 +--- canna/Canna.conf:1.1.1.1 Tue Jun 20 09:45:46 1995 ++++ canna/Canna.conf Tue Jun 20 09:59:41 1995 @@ -119,10 +119,10 @@ cannaLibDir = /usr/local/canna/lib cannaManDir = /usr/local/canna/man @@ -24,20 +25,39 @@ diff -uNr Canna32p1/Canna.conf Canna32p1-FreeBSD2.0/Canna.conf sharedLibExtension = so.$(cannaDsoRev) /* 以下の３つは root にならないでインストールするのであれば echo に -diff -uNr Canna32p1/canna/Imakefile Canna32p1-FreeBSD2.0/canna/Imakefile ---- Canna32p1/canna/Imakefile Tue Apr 12 07:32:59 1994 -+++ Canna32p1-FreeBSD2.0/canna/Imakefile Sat Jan 14 13:37:38 1995 -@@ -1,7 +1,6 @@ - /* $Id: Imakefile,v 2.4 1994/04/12 12:32:59 kon Exp $ */ - #include "../Canna.conf" +@@ -145,7 +145,7 @@ + CHMOD = chmod + + /* 日本語マニュアルを使わないのであればコメントアウト */ +-#define JAPANESEMAN ++/* #define JAPANESEMAN */ + + /* locale ディレクトリを持っている場合は以下を記述する */ + /* #define LOCALE_DIR /usr/lib/locale */ +Index: canna/canna/protodefs.h +diff -u canna/canna/protodefs.h:1.1.1.1 canna/canna/protodefs.h:1.2 +--- canna/canna/protodefs.h:1.1.1.1 Tue Jun 20 09:45:47 1995 ++++ canna/canna/protodefs.h Tue Jun 20 09:59:47 1995 +@@ -77,6 +77,7 @@ + #define I16toI32(x) (x) + #define I8toI32(x) (((x) & 0x80) ? ((x) | 0xffffff80) : (x)) + ++#if 0 + #ifdef HTONS /* hir, 1993.1.2 */ + #undef HTONS + #endif +@@ -85,6 +86,7 @@ + work = htons( (len) ) ; \ + bcopy( (char *)&work, (char *)(data), sizeof( short ) ) ; \ + } ++#endif -- INSTALLFLAGS = $(INSTINCFLAGS) - CANNAROOT = .. - CANNA_HEADER = jrkanji.h keydef.h mfdef.h - OSDEP_HEADER = net.h widedef.h -diff -uNr Canna32p1/canna/widedef.h Canna32p1-FreeBSD2.0/canna/widedef.h ---- Canna32p1/canna/widedef.h Tue May 31 08:47:33 1994 -+++ Canna32p1-FreeBSD2.0/canna/widedef.h Sat Jan 14 14:03:43 1995 + #ifndef MIN + #define MIN( n, m ) ( ((unsigned)(n) > (unsigned)(m)) ? (m) : (n) ) +Index: canna/canna/widedef.h +diff -u canna/canna/widedef.h:1.1.1.1 canna/canna/widedef.h:1.2 +--- canna/canna/widedef.h:1.1.1.1 Tue Jun 20 09:45:48 1995 ++++ canna/canna/widedef.h Tue Jun 20 09:59:48 1995 @@ -27,6 +27,10 @@ #ifndef _WIDEDEF_H_ #define _WIDEDEF_H_ @@ -61,281 +81,24 @@ diff -uNr Canna32p1/canna/widedef.h Canna32p1-FreeBSD2.0/canna/widedef.h +# else +# define _BSD_WCHAR_T_ unsigned long +# endif -+# include -+# define _WCHAR_T ++# include ++# define _WCHAR_T +# endif +#else #if !defined(WCHAR_T) && !defined(_WCHAR_T) && !defined(_WCHAR_T_) \ && !defined(__WCHAR_T) && !defined(_GCC_WCHAR_T) # ifdef WCHAR16 -@@ -53,6 +69,7 @@ - # define _WCHAR_T_ +@@ -54,5 +70,6 @@ # define __WCHAR_T # define _GCC_WCHAR_T -+#endif #endif ++#endif /* __FreeBSD__ || __NetBSD__ */ #endif /* _WIDEDEF_H_ */ -diff -uNr Canna32p1/cmd/crfreq/crfreq.c Canna32p1-FreeBSD2.0/cmd/crfreq/crfreq.c ---- Canna32p1/cmd/crfreq/crfreq.c Mon Feb 7 04:52:39 1994 -+++ Canna32p1-FreeBSD2.0/cmd/crfreq/crfreq.c Sat Jan 14 13:37:51 1995 -@@ -25,6 +25,7 @@ - #endif - - #include "RKintern.h" -+#include - #include - #include - -@@ -148,7 +149,7 @@ - doff = off; - off += hd.data[HD_SIZ].var; - if (!strncmp(".swd", (char *)(hd.data[HD_DMNM].ptr + strlen((char *)hd.data[HD_DMNM].ptr) - 4), 4)) { -- if (lseek(fd, (long)off, 0) < 0 || read(fd, (char *)ll, 4) != 4) -+ if (lseek(fd, (off_t)off, 0) < 0 || read(fd, (char *)ll, 4) != 4) - err = 1; - off += bst4_to_l(ll) + 4; - } -@@ -211,7 +212,7 @@ - } - fqoffset = 0; - for (i = 0; i < lk; i++) { -- (void)lseek(fd, (long)doff, 0); -+ (void)lseek(fd, (off_t)doff, 0); - doff += sz; - if (read(fd, (char *)buf, sz) != sz) { - (void)fprintf(stderr, "%s: cannot read %s.\n", program, dmnm); -diff -uNr Canna32p1/cmd/dicar/dicar.c Canna32p1-FreeBSD2.0/cmd/dicar/dicar.c ---- Canna32p1/cmd/dicar/dicar.c Fri Jan 28 01:37:36 1994 -+++ Canna32p1-FreeBSD2.0/cmd/dicar/dicar.c Sat Jan 14 13:37:55 1995 -@@ -229,7 +229,7 @@ - if (!fname || !strcmp(fname, key)) { /* 原子辞書が同じ時 */ - if ((dst = openForWrite(key)) >= 0) { - actmessage("x", key); /* 出力メッセージ */ -- (void)lseek(fd, offset, 0); -+ (void)lseek(fd, (off_t)offset, 0); - copyfile(fd, dst, dmsize); - closeForWrite(dst, key); - } -@@ -330,7 +330,7 @@ - (void)strcpy(key, childdic[i].key); - (void)strcat(key, ".d"); - actmessage("r", key); /* 出力メッセージ */ -- (void)lseek(atm, childdic[i].offset, 0); -+ (void)lseek(atm, (off_t)childdic[i].offset, 0); - copyfile(atm, dst, childdic[i].size); - childdic[i].flag = 0; - break; -@@ -339,7 +339,7 @@ - _RkClearHeader(&hd); - - if (i == num) { /* リプレース指定されていなければ */ -- (void)lseek(src, offset, 0); -+ (void)lseek(src, (off_t)offset, 0); - copyfile(src, dst, dmsize); - } - offset += dmsize; -@@ -352,7 +352,7 @@ - (void)strcpy(key, childdic[i].key); - (void)strcat(key, ".d"); - actmessage("a", key); /* 出力メッセージ */ -- (void)lseek(atm, childdic[i].offset, 0); -+ (void)lseek(atm, (off_t)childdic[i].offset, 0); - copyfile(atm, dst, childdic[i].size); - } - } -@@ -385,7 +385,7 @@ - _RkClearHeader(&hd); - - if (strcmp(fname, key)) { /* 指定原子辞書以外はコピー */ -- (void)lseek(src, offset, 0); -+ (void)lseek(src, (off_t)offset, 0); - copyfile(src, dst, dmsize); - } - else { -diff -uNr Canna32p1/cmd/dpxdic/dpxdic.c Canna32p1-FreeBSD2.0/cmd/dpxdic/dpxdic.c ---- Canna32p1/cmd/dpxdic/dpxdic.c Sat Jan 14 12:57:21 1995 -+++ Canna32p1-FreeBSD2.0/cmd/dpxdic/dpxdic.c Sat Jan 14 13:37:57 1995 -@@ -219,7 +219,7 @@ - } - if (!(buf = (unsigned char *)malloc(size))) - return(-1); -- (void)lseek(fd, (long)off, 0); -+ (void)lseek(fd, (off_t)off, 0); - if (read(fd, (char *)buf, size) != size) - return(-1); - dic->buf = buf; -@@ -253,7 +253,7 @@ - return(-1); - } - -- (void)lseek(fd, (long)off, 0); -+ (void)lseek(fd, (off_t)off, 0); - if (read(fd, (char *)buf, size) != size) { - (void)fprintf(stderr, "cannot read page %d (%d)\n", id, size); - return(-1); -@@ -445,7 +445,7 @@ - doff = off; - off += hd.data[HD_SIZ].var; - if (!strncmp(".swd", (char *)(hd.data[HD_DMNM].ptr + strlen((char *)hd.data[HD_DMNM].ptr) - 4), 4)) { -- if (lseek(fd, (long)off, 0) < 0 || read(fd, (char *)ll, 4) != 4) -+ if (lseek(fd, (off_t)off, 0) < 0 || read(fd, (char *)ll, 4) != 4) - err = 1; - off += bst4_to_l(ll) + 4; - } -diff -uNr Canna32p1/lib/RK/RKfq.c Canna32p1-FreeBSD2.0/lib/RK/RKfq.c ---- Canna32p1/lib/RK/RKfq.c Wed Jun 1 01:54:20 1994 -+++ Canna32p1-FreeBSD2.0/lib/RK/RKfq.c Sat Jan 14 13:37:28 1995 -@@ -25,6 +25,7 @@ - #endif - - #include "RKintern.h" -+#include - - #if defined(USG) || defined(SYSV) || defined(SVR4) - #include -@@ -542,13 +543,13 @@ - || ((struct ND *)codm->dm_xdm)->can != hd.data[HD_CAN].var) - break; - off += hd.data[HD_HSZ].var; -- (void)lseek(fd, off, 0); -+ (void)lseek(fd, (off_t)off, 0); - (void)read(fd, (char *)ll, 4); - off += 4; - bitsiz = L4TOL(ll); - bitoff = off; - off += bitsiz; -- (void)lseek(fd, off, 0); -+ (void)lseek(fd, (off_t)off, 0); - dmh = &df->df_members; - for (dm = dmh->dm_next; dm != dmh; dm = dm->dm_next) { - if (!strcmp((char *)dm->dm_dicname, (char *)hd.data[HD_CODM].ptr)) { -@@ -620,7 +621,7 @@ - qm->dm_qbits = (unsigned char *)malloc((unsigned)xqm->ex_bsiz); - if (!qm->dm_qbits) - return -1; -- (void)lseek(fd, xqm->ex_boff, 0); -+ (void)lseek(fd, (off_t)xqm->ex_boff, 0); - (void)read(fd, (char *)qm->dm_qbits, (int)xqm->ex_bsiz); - qm->dm_rut = LoadRUC(fd); - qm->dm_nv = readNV(fd); -@@ -650,7 +651,7 @@ - if (xqm) { - if (qm->dm_qbits) { - if (qm->dm_flags & DM_UPDATED) { -- (void)lseek(fd, xqm->ex_boff, 0); -+ (void)lseek(fd, (off_t)xqm->ex_boff, 0); - (void)write(fd, (char *)qm->dm_qbits, (int)xqm->ex_bsiz); - }; - (void)free((char *)qm->dm_qbits); -@@ -702,7 +703,7 @@ - if (xqm) { - if (qm->dm_qbits) { - if (qm->dm_flags & DM_UPDATED) { -- (void)lseek(fd, xqm->ex_boff, 0); -+ (void)lseek(fd, (off_t)xqm->ex_boff, 0); - if (write(fd, (char *)qm->dm_qbits, (int)xqm->ex_bsiz) != - (int) xqm->ex_bsiz) - rv = -1; -diff -uNr Canna32p1/lib/RK/RKngram.c Canna32p1-FreeBSD2.0/lib/RK/RKngram.c ---- Canna32p1/lib/RK/RKngram.c Wed Jun 1 01:54:27 1994 -+++ Canna32p1-FreeBSD2.0/lib/RK/RKngram.c Sat Jan 14 13:37:30 1995 -@@ -26,6 +26,7 @@ - - #include "RKintern.h" - -+#include - #include - #ifdef SVR4 - #include -@@ -141,7 +142,7 @@ - + strlen((char *)hd.data[HD_DMNM].ptr) - 4), - 4)) { - lk = 0; -- if (lseek(fd, off, 0) < 0) { -+ if (lseek(fd, (off_t)off, 0) < 0) { - lk = 1; - RkSetErrno(RK_ERRNO_EACCES); - } -diff -uNr Canna32p1/lib/RK/RKpermdic.c Canna32p1-FreeBSD2.0/lib/RK/RKpermdic.c ---- Canna32p1/lib/RK/RKpermdic.c Sat Jan 14 12:57:51 1995 -+++ Canna32p1-FreeBSD2.0/lib/RK/RKpermdic.c Sat Jan 14 13:37:30 1995 -@@ -26,6 +26,7 @@ - - #include "RKintern.h" - -+#include - #ifdef SVR4 - #include - #endif -@@ -82,7 +83,7 @@ - (char *)(hd.data[HD_DMNM].ptr - + strlen((char *)hd.data[HD_DMNM].ptr) - 4), - 4)) { -- if (lseek(fd, off, 0) < 0 || read(fd, (char *)ll, 4) != 4) -+ if (lseek(fd, (off_t)off, 0) < 0 || read(fd, (char *)ll, 4) != 4) - err++; - off += bst4_to_l(ll) + 4; - } -@@ -159,7 +160,7 @@ - xdm->pgs[i].count = 0; - xdm->pgs[i].buf = (unsigned char *) 0; - } -- (void)lseek(fd, xdm->doff, 0); -+ (void)lseek(fd, (off_t)xdm->doff, 0); - if (read(fd, (char *)xdm->buf, xdm->drsz) != xdm->drsz) { - (void)free((char *)xdm->pgs); - (void)free((char *)xdm->buf); -@@ -170,7 +171,7 @@ - if (dm->dm_class == ND_SWD) { - struct RkKxGram *gram; - -- lseek(fd, xdm->doff + xdm->drsz + xdm->ttlpg * xdm->pgsz, 0); -+ lseek(fd, (off_t)(xdm->doff + xdm->drsz + xdm->ttlpg * xdm->pgsz), 0); - gram = RkReadGram(fd); - if (gram) { - dm->dm_gram = (struct RkGram *)malloc(sizeof(struct RkGram)); -@@ -265,7 +266,7 @@ - if (!isLoadedPage(dic->pgs + id)) { - if (!(buf = (unsigned char *)malloc(size))) - return((unsigned char *)0); -- (void)lseek(fd, off, 0); -+ (void)lseek(fd, (off_t)off, 0); - if (read(fd, (char *)buf, size) != size) { - free((char *)buf); - return((unsigned char *)0); -diff -uNr Canna32p1/lib/RK/RKutil.c Canna32p1-FreeBSD2.0/lib/RK/RKutil.c ---- Canna32p1/lib/RK/RKutil.c Wed Jun 1 01:54:39 1994 -+++ Canna32p1-FreeBSD2.0/lib/RK/RKutil.c Sat Jan 14 13:37:31 1995 -@@ -25,6 +25,7 @@ - #endif - - #include "RKintern.h" -+#include - #include - - static char *Hdrtag[] = { -@@ -219,7 +220,7 @@ - hd->flag[i] = 0; - } - /* 次の off_from_top の計算がうさんくさいぞ */ -- if (lseek(fd, off_from_top, 0) < 0) { -+ if (lseek(fd, (off_t)off_from_top, 0) < 0) { - RkSetErrno(RK_ERRNO_EACCES); - goto read_err; - } -@@ -255,7 +256,7 @@ - if (off < hdrsize) { - (void)memcpy(hd->data[i].ptr, localbuffer + off, len); - } else { -- if (lseek(fd, (long)(off_from_top + off), 0) < 0) { -+ if (lseek(fd, (off_t)(off_from_top + off), 0) < 0) { - RkSetErrno(RK_ERRNO_EACCES); - goto read_err; - } -diff -uNr Canna32p1/lib/RKC/Imakefile Canna32p1-FreeBSD2.0/lib/RKC/Imakefile ---- Canna32p1/lib/RKC/Imakefile Sat Jan 14 12:57:53 1995 -+++ Canna32p1-FreeBSD2.0/lib/RKC/Imakefile Sat Jan 14 13:37:36 1995 +Index: canna/lib/RKC/Imakefile +diff -u canna/lib/RKC/Imakefile:1.1.1.1 canna/lib/RKC/Imakefile:1.2 +--- canna/lib/RKC/Imakefile:1.1.1.1 Tue Jun 20 09:46:30 1995 ++++ canna/lib/RKC/Imakefile Tue Jun 20 10:00:01 1995 @@ -26,7 +26,7 @@ #if ProjectX > 5 @@ -345,9 +108,10 @@ diff -uNr Canna32p1/lib/RKC/Imakefile Canna32p1-FreeBSD2.0/lib/RKC/Imakefile #define SHLIBDIR libCannaDir #define USRLIBDIR libCannaDir #define LibHeaders 0 -diff -uNr Canna32p1/lib/RKC16/Imakefile Canna32p1-FreeBSD2.0/lib/RKC16/Imakefile ---- Canna32p1/lib/RKC16/Imakefile Sat Jan 14 12:57:58 1995 -+++ Canna32p1-FreeBSD2.0/lib/RKC16/Imakefile Sat Jan 14 13:37:37 1995 +Index: canna/lib/RKC16/Imakefile +diff -u canna/lib/RKC16/Imakefile:1.1.1.1 canna/lib/RKC16/Imakefile:1.2 +--- canna/lib/RKC16/Imakefile:1.1.1.1 Tue Jun 20 09:46:31 1995 ++++ canna/lib/RKC16/Imakefile Tue Jun 20 10:00:03 1995 @@ -23,7 +23,7 @@ #if ProjectX > 5 @@ -357,9 +121,10 @@ diff -uNr Canna32p1/lib/RKC16/Imakefile Canna32p1-FreeBSD2.0/lib/RKC16/Imakefile #define SHLIBDIR libCannaDir #define USRLIBDIR libCannaDir #define LibHeaders 0 -diff -uNr Canna32p1/lib/canna/Imakefile Canna32p1-FreeBSD2.0/lib/canna/Imakefile ---- Canna32p1/lib/canna/Imakefile Sat Jan 14 12:58:00 1995 -+++ Canna32p1-FreeBSD2.0/lib/canna/Imakefile Sat Jan 14 13:37:32 1995 +Index: canna/lib/canna/Imakefile +diff -u canna/lib/canna/Imakefile:1.1.1.1 canna/lib/canna/Imakefile:1.2 +--- canna/lib/canna/Imakefile:1.1.1.1 Tue Jun 20 09:46:33 1995 ++++ canna/lib/canna/Imakefile Tue Jun 20 10:00:06 1995 @@ -56,7 +56,7 @@ #if ProjectX > 5 @@ -369,9 +134,10 @@ diff -uNr Canna32p1/lib/canna/Imakefile Canna32p1-FreeBSD2.0/lib/canna/Imakefile #define SHLIBDIR libCannaDir #define USRLIBDIR libCannaDir #define LibHeaders 0 -diff -uNr Canna32p1/lib/canna16/Imakefile Canna32p1-FreeBSD2.0/lib/canna16/Imakefile ---- Canna32p1/lib/canna16/Imakefile Sat Jan 14 12:58:07 1995 -+++ Canna32p1-FreeBSD2.0/lib/canna16/Imakefile Sat Jan 14 13:37:35 1995 +Index: canna/lib/canna16/Imakefile +diff -u canna/lib/canna16/Imakefile:1.1.1.1 canna/lib/canna16/Imakefile:1.2 +--- canna/lib/canna16/Imakefile:1.1.1.1 Tue Jun 20 09:46:43 1995 ++++ canna/lib/canna16/Imakefile Tue Jun 20 10:00:08 1995 @@ -58,7 +58,7 @@ #if ProjectX > 5 diff --git a/japanese/canna-server/pkg-comment b/japanese/canna-server/pkg-comment index 7afc25672120..772cc4ac23d9 100644 --- a/japanese/canna-server/pkg-comment +++ b/japanese/canna-server/pkg-comment @@ -1 +1 @@ -Canna 3.2p1 - Kana-Kanji convertion system +Canna 3.2p2 - Kana-Kanji convertion system diff --git a/japanese/canna-server/pkg-descr b/japanese/canna-server/pkg-descr index e3f9d4d17c9c..3945645d1a71 100644 --- a/japanese/canna-server/pkg-descr +++ b/japanese/canna-server/pkg-descr @@ -6,6 +6,7 @@ cannum front end and some others. canna=/usr/local/canna/bin/cannaserver if [ -f $canna ]; then + rm -f /var/spool/canna/lock/.CANNALOCK* echo -n " Canna"; $canna fi -- cgit v1.2.3