Attachment 85288 Details for Bug 121445 – file.diff

[patch] file.diff

file.diff (text/plain), 9.09 KB, created by Jonathan Hanna on 2008-03-06 21:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Hanna

Created: 2008-03-06 21:20:00 UTC

Size: 9.09 KB

patch

obsolete

>diff -urN edict.orig/Makefile edict/Makefile
>--- edict.orig/Makefile	2005-11-11 13:28:08.000000000 -0800
>+++ edict/Makefile	2008-03-06 11:56:01.000000000 -0800
>@@ -9,8 +9,14 @@
> PORTVERSION=	19990714
> PORTREVISION=	3
> CATEGORIES=	japanese
>-MASTER_SITES=	ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
>+MASTER_SITES=	\
>+		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
>+		http://www.bcit-broadcast.com/monash/ \
>+		ftp://ftp.mirrorservice.org/sites/ftp.cc.monash.edu.au/pub/nihongo/ \
>+		ftp://ftp.edrdg.org/pub/Nihongo/ \
> 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ \
>+		ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \
>+		ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/ \
> 		ftp://ftp.cc.monash.edu.au/pub/nihongo/
> EXTRACT_SUFX=
> DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
>@@ -27,15 +33,15 @@
> 		kanjidic.gz kanjd212.gz lawgledt.zip \
> 		lingdic.zip geodic.gz pandpdic.zip \
> 		aviation.zip findic.zip mktdic.zip \
>-		compverb.gz 4jword3_edict.zip concrete.zip
>+		4jword3_edict.zip concrete.zip
> 
> SRCFILES=	xjdic23.tgz
> 
>-DOCFILES=	edict_doc.txt edict_doc.html edicth.doc \
>+DOCFILES=	edict_doc.html edicth.doc \
> 		enamdict_doc.txt enamdict_doc.html \
> 		j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
> 		lawgldoc.new lingdic.txt geodic.doc aviation.txt \
>-		findic.doc mktdic.doc compverb.doc 4jword3_inf.txt \
>+		findic.doc mktdic.doc 4jword3_inf.txt \
> 		concrete.doc
> 
> #
>@@ -148,7 +154,6 @@
> 	@${ECHO_CMD} dicfile aviation >> ${DATADIR}/.xjdicrc
> 	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
> 	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
>-	@${ECHO_CMD} dicfile compverb >> ${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile 4jword3_edict.euc >> ${DATADIR}/.xjdicrc
> 	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
> 	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc
>diff -urN edict.orig/distinfo edict/distinfo
>--- edict.orig/distinfo	2006-01-30 02:46:58.000000000 -0800
>+++ edict/distinfo	2008-03-06 11:58:23.000000000 -0800
>@@ -31,14 +31,10 @@
> SHA256 (edict/findic.zip) = IGNORE
> MD5 (edict/mktdic.zip) = IGNORE
> SHA256 (edict/mktdic.zip) = IGNORE
>-MD5 (edict/compverb.gz) = IGNORE
>-SHA256 (edict/compverb.gz) = IGNORE
> MD5 (edict/4jword3_edict.zip) = IGNORE
> SHA256 (edict/4jword3_edict.zip) = IGNORE
> MD5 (edict/concrete.zip) = IGNORE
> SHA256 (edict/concrete.zip) = IGNORE
>-MD5 (edict/edict_doc.txt) = IGNORE
>-SHA256 (edict/edict_doc.txt) = IGNORE
> MD5 (edict/edict_doc.html) = IGNORE
> SHA256 (edict/edict_doc.html) = IGNORE
> MD5 (edict/edicth.doc) = IGNORE
>@@ -67,8 +63,6 @@
> SHA256 (edict/findic.doc) = IGNORE
> MD5 (edict/mktdic.doc) = IGNORE
> SHA256 (edict/mktdic.doc) = IGNORE
>-MD5 (edict/compverb.doc) = IGNORE
>-SHA256 (edict/compverb.doc) = IGNORE
> MD5 (edict/4jword3_inf.txt) = IGNORE
> SHA256 (edict/4jword3_inf.txt) = IGNORE
> MD5 (edict/concrete.doc) = IGNORE
>diff -urN edict.orig/files/patch-Makefile edict/files/patch-Makefile
>--- edict.orig/files/patch-Makefile	1969-12-31 16:00:00.000000000 -0800
>+++ edict/files/patch-Makefile	2008-02-18 19:57:59.000000000 -0800
>@@ -0,0 +1,38 @@
>+--- Makefile.orig	Wed Sep 16 04:08:01 1998
>++++ Makefile	Sat Jul 17 21:33:01 1999
>+@@ -54,7 +54,7 @@
>+ #
>+ #LIBS= -lsocket -lnsl
>+ #
>+-CC=gcc -g
>++#CC=gcc -g
>+ all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
>+ client: xjdic_cl
>+ server: xjdserver
>+@@ -80,7 +80,7 @@
>+ #
>+ SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
>+ #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
>+-SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
>++SACFLAGS = -D__POSIX__ -DXJDFRONTEND -DXJDDIC -DMMAP ${CFLAGS}
>+ #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 = -D__POSIX__ -DXJDFRONTEND -DXJDCLSERV ${CFLAGS}
>+ xjdic_cl: $(CLOBJECTS)
>+ 	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
>+ xjdclient.o: xjdclient.c
>+@@ -112,7 +112,7 @@
>+ #
>+ SVOBJECTS = xjdcomm_sv.o xjdservcomm_sv.o xjdserver.o
>+ #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DDEMAND_PAGING
>+-SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP
>++SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP ${CFLAGS}
>+ #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DRAM_LOAD
>+ xjdserver: $(SVOBJECTS)
>+ 	$(CC) $(SVOBJECTS) $(LIBS) -o xjdserver
>diff -urN edict.orig/files/patch-aa edict/files/patch-aa
>--- edict.orig/files/patch-aa	2008-02-18 19:57:59.000000000 -0800
>+++ edict/files/patch-aa	1969-12-31 16:00:00.000000000 -0800
>@@ -1,38 +0,0 @@
>---- Makefile.orig	Wed Sep 16 04:08:01 1998
>-+++ Makefile	Sat Jul 17 21:33:01 1999
>-@@ -54,7 +54,7 @@
>- #
>- #LIBS= -lsocket -lnsl
>- #
>--CC=gcc -g
>-+#CC=gcc -g
>- all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
>- client: xjdic_cl
>- server: xjdserver
>-@@ -80,7 +80,7 @@
>- #
>- SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
>- #SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
>--SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
>-+SACFLAGS = -D__POSIX__ -DXJDFRONTEND -DXJDDIC -DMMAP ${CFLAGS}
>- #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 = -D__POSIX__ -DXJDFRONTEND -DXJDCLSERV ${CFLAGS}
>- xjdic_cl: $(CLOBJECTS)
>- 	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
>- xjdclient.o: xjdclient.c
>-@@ -112,7 +112,7 @@
>- #
>- SVOBJECTS = xjdcomm_sv.o xjdservcomm_sv.o xjdserver.o
>- #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DDEMAND_PAGING
>--SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP
>-+SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP ${CFLAGS}
>- #SVCFLAGS = -DXJDDIC -DXJDCLSERV -DRAM_LOAD
>- xjdserver: $(SVOBJECTS)
>- 	$(CC) $(SVOBJECTS) $(LIBS) -o xjdserver
>diff -urN edict.orig/files/patch-ab edict/files/patch-ab
>--- edict.orig/files/patch-ab	1998-10-09 21:35:06.000000000 -0700
>+++ edict/files/patch-ab	1969-12-31 16:00:00.000000000 -0800
>@@ -1,11 +0,0 @@
>---- 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 -urN edict.orig/files/patch-exjdxgen.c edict/files/patch-exjdxgen.c
>--- edict.orig/files/patch-exjdxgen.c	1969-12-31 16:00:00.000000000 -0800
>+++ edict/files/patch-exjdxgen.c	2008-03-06 11:39:57.000000000 -0800
>@@ -0,0 +1,11 @@
>+--- exjdxgen.c.orig	1998-05-24 08:43:37.000000000 -0700
>++++ exjdxgen.c	2008-03-06 11:39:23.000000000 -0800
>+@@ -22,7 +22,7 @@
>+ #include <sys/stat.h>
>+ 
>+ #include <stdio.h>
>+-/*#include <stdlib.h>*/
>++#include <stdlib.h>
>+ #include <ctype.h>
>+ #include <string.h>
>+ #include "xjdic.h"
>diff -urN edict.orig/files/patch-xjdic.h edict/files/patch-xjdic.h
>--- edict.orig/files/patch-xjdic.h	1969-12-31 16:00:00.000000000 -0800
>+++ edict/files/patch-xjdic.h	1998-10-09 21:35:06.000000000 -0700
>@@ -0,0 +1,11 @@
>+--- 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 -urN edict.orig/files/patch-xjdxgen.c edict/files/patch-xjdxgen.c
>--- edict.orig/files/patch-xjdxgen.c	1969-12-31 16:00:00.000000000 -0800
>+++ edict/files/patch-xjdxgen.c	2008-03-06 11:41:09.000000000 -0800
>@@ -0,0 +1,11 @@
>+--- xjdxgen.c.orig	1998-09-10 20:04:21.000000000 -0700
>++++ xjdxgen.c	2008-03-06 11:40:41.000000000 -0800
>+@@ -23,7 +23,7 @@
>+ #include <sys/stat.h>
>+ 
>+ #include <stdio.h>
>+-/*#include <stdlib.h>*/
>++#include <stdlib.h>
>+ #include <ctype.h>
>+ #include <string.h>
>+ #include "xjdic.h"
>diff -urN edict.orig/pkg-plist edict/pkg-plist
>--- edict.orig/pkg-plist	2005-11-02 18:36:47.000000000 -0800
>+++ edict/pkg-plist	2008-03-06 11:45:09.000000000 -0800
>@@ -10,8 +10,6 @@
> share/dict/edict/aviation.xjdx
> share/dict/edict/compdic
> share/dict/edict/compdic.xjdx
>-share/dict/edict/compverb
>-share/dict/edict/compverb.xjdx
> share/dict/edict/concrete
> share/dict/edict/concrete.xjdx
> share/dict/edict/ediclsd3
>@@ -49,11 +47,9 @@
> @dirrm share/dict/edict
> share/doc/xjdic/4jword3_inf.txt
> share/doc/xjdic/aviation.txt
>-share/doc/xjdic/compverb.doc
> share/doc/xjdic/concrete.doc
> share/doc/xjdic/ediclsd3.rme
> share/doc/xjdic/edict_doc.html
>-share/doc/xjdic/edict_doc.txt
> share/doc/xjdic/edicth.doc
> share/doc/xjdic/enamdict_doc.html
> share/doc/xjdic/enamdict_doc.txt

Actions: View | Diff

Attachments on bug 121445: 85288