Date: Wed, 7 Oct 1998 14:41:26 -0700 (PDT) From: Jonathan Hanna <jh@cr1003333-a.crdva1.bc.wave.home.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/8192: [patch]:japanese/edict update Message-ID: <199810072141.OAA27242@cr1003333-a.crdva1.bc.wave.home.com>
next in thread | raw e-mail | index | archive | help
>Number: 8192 >Category: ports >Synopsis: [patch]:japanese/edict update >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Oct 7 14:50:01 PDT 1998 >Last-Modified: >Originator: Jonathan Hanna >Organization: >Release: FreeBSD 3.0-BETA i386 >Environment: >Description: Update to newer version of utilites. Update MASTER_SITES. >How-To-Repeat: >Fix: diff -u -r -N --exclude=CVS edict.orig/Makefile edict/Makefile --- edict.orig/Makefile Wed Oct 7 10:46:54 1998 +++ edict/Makefile Wed Oct 7 14:33:10 1998 @@ -1,23 +1,22 @@ # New ports collection makefile for: edict -# Version required: 19980409 +# Version required: 19981007 # Date created: 18 August 1997 # Whom: Jonathan Hanna # # $Id: Makefile,v 1.1.1.1 1998/05/30 01:36:05 kuriyama Exp $ # -DISTNAME= edict-19980409 -PKGNAME= ja-edict-19980409 +DISTNAME= edict-19981007 +PKGNAME= ja-edict-19981007 CATEGORIES= japanese MASTER_SITES= ftp://ftp.cc.monash.edu.au/pub/nihongo/ -MASTER_SITES+= ftp://enterprise.ic.gc.ca/pub/nihongo/ MASTER_SITES+= ftp://ftp.cdrom.com/pub/japanese/monash/ -MASTER_SITES+= ftp://kuso.shef.ac.uk/pub/japanese/monash/ -MASTER_SITES+= ftp://ftp.uwtc.washington.edu/pub/Japanese/Monash/ +MASTER_SITES+= ftp://ftp.sedl.org/pub/mirrors/nihongo/ +MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ EXTRACT_SUFX= DISTFILES= ${DICTFILES} ${SRCFILES} ${DOCFILES} -MAINTAINER= jhanna@rogers.wave.ca +MAINTAINER= jhanna@home.com BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip @@ -54,7 +53,7 @@ DICTFILES+= compverb.gz DICTFILES+= 4jwords.gz -SRCFILES= xjdic22.tar.gz +SRCFILES= xjdic23.tgz DOCFILES= edict.doc DOCFILES+= edicth.doc @@ -77,14 +76,15 @@ IGNOREFILES= $(DICTFILES) $(DOCFILES) BINFILES= exjdxgen -BINFILES+= xjdic22cl -BINFILES+= xjdic22sa -BINFILES+= xjdserver22 +BINFILES+= xjdic_cl +BINFILES+= xjdic_sa +BINFILES+= xjdserver BINFILES+= xjdxgen # Where to install the data files DATADIR= ${PREFIX}/share/dict/edict DOCDIR= ${PREFIX}/share/doc/xjdic +MAN1= xjdic.1 NO_WRKSUBDIR= @@ -155,7 +155,7 @@ ) ; \ done ${RM} -f ${PREFIX}/bin/xjdic - ln -s ${PREFIX}/bin/xjdic22sa ${PREFIX}/bin/xjdic + ln -s ${PREFIX}/bin/xjdic_sa ${PREFIX}/bin/xjdic ${INSTALL_DATA} ${WRKDIR}/radicals.tm ${DATADIR} ; ${INSTALL_DATA} ${WRKDIR}/radkfile ${DATADIR} ; ${INSTALL_DATA} ${WRKDIR}/kanjstroke ${DATADIR} ; @@ -164,29 +164,33 @@ # # Only 9 dictionaries can be enabled # - @${ECHO} dicfile ${DATADIR}/edict > ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/enamdict >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/compdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/lifscdic >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile ${DATADIR}/jddict.v02 >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile ${DATADIR}/lawgledt >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/geodic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/pandpdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/aviation >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile ${DATADIR}/findic >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile ${DATADIR}/mktdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/compverb >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ${DATADIR}/4jwords >> ${DATADIR}/.xjdicrc + @${ECHO} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc + @${ECHO} dicfile edict >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile enamdict >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile compdic >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile lifscdic >> ${DATADIR}/.xjdicrc + # @${ECHO} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc + # @${ECHO} dicfile lawgledt >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile geodic >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile pandpdic >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile aviation >> ${DATADIR}/.xjdicrc + # @${ECHO} dicfile findic >> ${DATADIR}/.xjdicrc + # @${ECHO} dicfile mktdic >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile compverb >> ${DATADIR}/.xjdicrc + @${ECHO} dicfile 4jwords >> ${DATADIR}/.xjdicrc @chown ${SHAREOWN}.${SHAREGRP} ${DATADIR}/.xjdicrc @chmod ${SHAREMODE} ${DATADIR}/.xjdicrc + ${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1 +.if !defined(NOPORTDOCS) @if [ ! -d ${DOCDIR} ] ; \ then \ ${MKDIR} ${DOCDIR} ; \ fi - ${INSTALL_MAN} ${WRKSRC}/xjdic22.doc ${DOCDIR} + ${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR} @for docfile in ${DOCFILES} ; do \ - ${ECHO} Installing ${DOCDIR}/$$docfile ; \ + ${ECHO} InstalLing ${DOCDIR}/$$docfile ; \ ${INSTALL_MAN} ${_DISTDIR}/$$docfile ${DOCDIR} ; \ done +.endif .include <bsd.port.mk> diff -u -r -N --exclude=CVS edict.orig/files/md5 edict/files/md5 --- edict.orig/files/md5 Wed Oct 7 10:46:54 1998 +++ edict/files/md5 Wed Oct 7 11:06:26 1998 @@ -1,4 +1,4 @@ -MD5 (edict/xjdic22.tar.gz) = 2aae116525cde38d4bb2b2cac6c20483 +MD5 (edict/xjdic23.tgz) = f1d6c030e3f1334fd6fe396ce0deb240 MD5 (edict/edict.gz) = IGNORE MD5 (edict/edicth) = IGNORE MD5 (edict/enamdict.gz) = IGNORE diff -u -r -N --exclude=CVS edict.orig/patches/patch-aa edict/patches/patch-aa --- edict.orig/patches/patch-aa Wed Oct 7 10:46:54 1998 +++ edict/patches/patch-aa Wed Oct 7 11:26:29 1998 @@ -1,20 +1,20 @@ ---- Makefile.orig Sun Aug 17 22:45:50 1997 -+++ Makefile Sun Aug 17 22:47:02 1997 -@@ -48,7 +48,7 @@ - # S T A N D _ A L O N E +--- Makefile.orig Wed Sep 16 04:08:01 1998 ++++ Makefile Wed Oct 7 11:26:15 1998 +@@ -80,7 +80,7 @@ # SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o --SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING -+SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING -D__STRICT_BSD__ - xjdic22sa: $(SAOBJECTS) - $(CC) $(SAOBJECTS) -o xjdic22sa - xjdsa.o: xjdsa.c -@@ -64,7 +64,7 @@ + #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING +-SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP ++SACFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDDIC -DMMAP + #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD + xjdic_sa: $(SAOBJECTS) + $(CC) $(SAOBJECTS) -o xjdic_sa +@@ -97,7 +97,7 @@ # C L I E N T # CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o -CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV -+CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV -D__STRICT_BSD__ - xjdic22cl: $(CLOBJECTS) - $(CC) $(CLOBJECTS) -o xjdic22cl ++CLCFLAGS = -D__STRICT_BSD__ -DXJDFRONTEND -DXJDCLSERV + xjdic_cl: $(CLOBJECTS) + $(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl xjdclient.o: xjdclient.c diff -u -r -N --exclude=CVS edict.orig/patches/patch-ab edict/patches/patch-ab --- edict.orig/patches/patch-ab Wed Oct 7 10:46:54 1998 +++ edict/patches/patch-ab Wed Oct 7 11:57:04 1998 @@ -1,10 +1,11 @@ ---- xjdclient.c.orig Sun Aug 17 22:48:25 1997 -+++ xjdclient.c Sun Aug 17 22:48:39 1997 -@@ -33,7 +33,6 @@ - #include "xjdic.h" - - extern int errno; --extern char *sys_errlist[]; - unsigned char host[51] = {"localhost"}; - unsigned char yn[2]; - unsigned int portno = XJ_PORTNO; +--- xjdic.h.orig Thu Sep 3 02:05:28 1998 ++++ xjdic.h Wed Oct 7 11:55:52 1998 +@@ -3,7 +3,7 @@ + #define NRKANA 250*2 /* size of the romaji to kana tables*/ + #define NOFILT 10 /* maximum number of general filters */ + #define VMAX 350 /* maximum entries in the verb table */ +-#define DEFAULT_DICDIR "" /* could be: "/usr/local/lib/xjdic" */ ++#define DEFAULT_DICDIR "/usr/local/share/dict/edict" /* could be: "/usr/local/lib/xjdic" */ + #define NOHITS 1000 /* size of hittab */ + #define SPTAG '@' /* character that flags priority entries */ + #define KFBUFFSIZE 2000 /* size of the KFlush buffer */ diff -u -r -N --exclude=CVS edict.orig/patches/patch-ac edict/patches/patch-ac --- edict.orig/patches/patch-ac Wed Oct 7 10:46:54 1998 +++ edict/patches/patch-ac Wed Dec 31 16:00:00 1969 @@ -1,10 +0,0 @@ ---- xjdserver.c.orig Sun Aug 17 22:48:52 1997 -+++ xjdserver.c Sun Aug 17 22:49:04 1997 -@@ -54,7 +54,6 @@ - int DicNum; - - extern int errno; --extern char *sys_errlist[]; - - extern unsigned char Dnamet[10][100],XJDXnamet[10][100]; - extern unsigned char *dicbufft[10]; diff -u -r -N --exclude=CVS edict.orig/patches/patch-ad edict/patches/patch-ad --- edict.orig/patches/patch-ad Wed Oct 7 10:46:54 1998 +++ edict/patches/patch-ad Wed Dec 31 16:00:00 1969 @@ -1,36 +0,0 @@ ---- xjdxgen.c.orig Mon Aug 18 00:15:57 1997 -+++ xjdxgen.c Mon Aug 18 00:25:23 1997 -@@ -80,7 +80,7 @@ - unsigned long possav,schi,diclen,indlen; - int i,inwd,cstrp,saving,isc,nodread; - unsigned char c; -- unsigned char currstr[40],strtmp[50]; -+ unsigned char currstr[40]; - unsigned char **ap; - - printf("\nXJDXGEN V2.2 Index Table Generator for XJDIC. \n Copyright J.W. Breen, 1996\n"); -@@ -95,7 +95,6 @@ - printf(" filename - file to be indexed\n\n"); - exit(0); - } -- strcpy(strtmp,*ap); - strcpy(Dname,*ap); - strcpy(JDXname,*ap); - strcat(JDXname,".xjdx"); -@@ -258,6 +257,7 @@ - jindex[0] = diclen+jiver; - fwrite(jindex,sizeof(long),indptr+1,fp); - fclose(fp); -+ exit(0); - } - /*======function to sort jindex table====================*/ - void jqsort(long lhs, long rhs) -@@ -369,7 +369,7 @@ - } - } - } -- fclose(fm); -+ if (fm) fclose(fm); - } - /*=======function to test a character for alpha or kana/kanji====*/ - int alphaoreuc(unsigned char x) diff -u -r -N --exclude=CVS edict.orig/patches/patch-ae edict/patches/patch-ae --- edict.orig/patches/patch-ae Wed Oct 7 10:46:54 1998 +++ edict/patches/patch-ae Wed Dec 31 16:00:00 1969 @@ -1,10 +0,0 @@ ---- xjdfrontend.c.orig Thu Aug 21 19:40:47 1997 -+++ xjdfrontend.c Thu Aug 21 19:46:32 1997 -@@ -1029,6 +1029,7 @@ - { - printf("Cannot open verb file - function disabled\n"); - Jverb = FALSE; -+ return; - } - while(TRUE) - { diff -u -r -N --exclude=CVS edict.orig/patches/patch-af edict/patches/patch-af --- edict.orig/patches/patch-af Wed Oct 7 10:46:54 1998 +++ edict/patches/patch-af Wed Dec 31 16:00:00 1969 @@ -1,19 +0,0 @@ -*** xjdic.h.orig Thu Aug 21 19:55:08 1997 ---- xjdic.h Thu Aug 21 19:56:20 1997 -*************** -*** 3,9 **** - #define NRKANA 250*2 /* size of the romaji to kana tables*/ - #define NOFILT 10 /* maximum number of general filters */ - #define VMAX 350 /* maximum entries in the verb table */ -! #define DEFAULT_DICDIR "" /* could be: "/usr/local/lib/xjdic" */ - #define NOHITS 1000 /* size of hittab */ - #define SPTAG '@' /* character that flags priority entries */ - #define KFBUFFSIZE 2000 /* size of the KFlush buffer */ ---- 3,9 ---- - #define NRKANA 250*2 /* size of the romaji to kana tables*/ - #define NOFILT 10 /* maximum number of general filters */ - #define VMAX 350 /* maximum entries in the verb table */ -! #define DEFAULT_DICDIR "/usr/local/share/dict/edict" /* could be: "/usr/local/lib/xjdic" */ - #define NOHITS 1000 /* size of hittab */ - #define SPTAG '@' /* character that flags priority entries */ - #define KFBUFFSIZE 2000 /* size of the KFlush buffer */ diff -u -r -N --exclude=CVS edict.orig/pkg/DESCR edict/pkg/DESCR --- edict.orig/pkg/DESCR Wed Oct 7 10:46:54 1998 +++ edict/pkg/DESCR Wed Oct 7 12:48:11 1998 @@ -1,4 +1,4 @@ -XJDIC V2.2, XJDSERVER V2.2 -- (Copyright: J.W. Breen - 1996) +XJDIC V2.3, XJDSERVER V2.3 -- (Copyright: J.W. Breen - 1998) XJDIC is an electronic Japanese-English dictionary program designed to operate in the X11 window environment. In particular, it must run in an diff -u -r -N --exclude=CVS edict.orig/pkg/PLIST edict/pkg/PLIST --- edict.orig/pkg/PLIST Wed Oct 7 10:46:54 1998 +++ edict/pkg/PLIST Wed Oct 7 12:38:18 1998 @@ -1,8 +1,8 @@ bin/exjdxgen bin/xjdic -bin/xjdic22sa -bin/xjdic22cl -bin/xjdserver22 +bin/xjdic_sa +bin/xjdic_cl +bin/xjdserver bin/xjdxgen share/dict/edict/4jwords share/dict/edict/4jwords.xjdx @@ -55,5 +55,5 @@ share/doc/xjdic/lawgldoc.new share/doc/xjdic/lifscdic.doc share/doc/xjdic/mktdic.doc -share/doc/xjdic/xjdic22.doc +share/doc/xjdic/xjdic23.inf @dirrm share/doc/xjdic >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199810072141.OAA27242>