Attachment #85288 for bug #121445

View | Details | Raw Unified | Return to bug 121445
Collapse All | Expand All

Lines 9-16 Link Here

(-)edict/Makefile (-5 / +10 lines)
9	PORTVERSION= 19990714	9	PORTVERSION= 19990714
10	PORTREVISION= 3	10	PORTREVISION= 3
11	CATEGORIES= japanese	11	CATEGORIES= japanese
12	MASTER_SITES= ftp://ftp.sedl.org/pub/mirrors/nihongo/ \	12	MASTER_SITES= \
		13	http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
		14	http://www.bcit-broadcast.com/monash/ \
		15	ftp://ftp.mirrorservice.org/sites/ftp.cc.monash.edu.au/pub/nihongo/ \
		16	ftp://ftp.edrdg.org/pub/Nihongo/ \
13	ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ \	17	ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/ \
		18	ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \
		19	ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/ \
14	ftp://ftp.cc.monash.edu.au/pub/nihongo/	20	ftp://ftp.cc.monash.edu.au/pub/nihongo/
15	EXTRACT_SUFX=	21	EXTRACT_SUFX=
16	DISTFILES= ${DICTFILES} ${SRCFILES} ${DOCFILES}	22	DISTFILES= ${DICTFILES} ${SRCFILES} ${DOCFILES}
Lines 27-41 Link Here
27	kanjidic.gz kanjd212.gz lawgledt.zip \	33	kanjidic.gz kanjd212.gz lawgledt.zip \
28	lingdic.zip geodic.gz pandpdic.zip \	34	lingdic.zip geodic.gz pandpdic.zip \
29	aviation.zip findic.zip mktdic.zip \	35	aviation.zip findic.zip mktdic.zip \
30	compverb.gz 4jword3_edict.zip concrete.zip	36	4jword3_edict.zip concrete.zip
31		37
32	SRCFILES= xjdic23.tgz	38	SRCFILES= xjdic23.tgz
33		39
34	DOCFILES= edict_doc.txt edict_doc.html edicth.doc \	40	DOCFILES= edict_doc.html edicth.doc \
35	enamdict_doc.txt enamdict_doc.html \	41	enamdict_doc.txt enamdict_doc.html \
36	j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \	42	j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
37	lawgldoc.new lingdic.txt geodic.doc aviation.txt \	43	lawgldoc.new lingdic.txt geodic.doc aviation.txt \
38	findic.doc mktdic.doc compverb.doc 4jword3_inf.txt \	44	findic.doc mktdic.doc 4jword3_inf.txt \
39	concrete.doc	45	concrete.doc
40		46
41	#	47	#
Lines 148-154 Link Here
148	@${ECHO_CMD} dicfile aviation >> ${DATADIR}/.xjdicrc	154	@${ECHO_CMD} dicfile aviation >> ${DATADIR}/.xjdicrc
149	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc	155	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
150	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc	156	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
151	@${ECHO_CMD} dicfile compverb >> ${DATADIR}/.xjdicrc
152	@${ECHO_CMD} dicfile 4jword3_edict.euc >> ${DATADIR}/.xjdicrc	157	@${ECHO_CMD} dicfile 4jword3_edict.euc >> ${DATADIR}/.xjdicrc
153	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc	158	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
154	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc	159	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc




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

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




--- 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




--- 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

Lines 1-11 Link Here

(-)edict/files/patch-ab (-11 lines)
1	--- xjdic.h.orig Thu Sep 3 02:05:28 1998
2	+++ xjdic.h Wed Oct 7 11:55:52 1998
3	@@ -3,7 +3,7 @@
4	#define NRKANA 2502 / size of the romaji to kana tables*/
5	#define NOFILT 10 /* maximum number of general filters */
6	#define VMAX 350 /* maximum entries in the verb table */
7	-#define DEFAULT_DICDIR "" /* could be: "/usr/local/lib/xjdic" */
8	+#define DEFAULT_DICDIR "/usr/local/share/dict/edict" /* could be: "/usr/local/lib/xjdic" */
9	#define NOHITS 1000 /* size of hittab */
10	#define SPTAG '@' /* character that flags priority entries */
11	#define KFBUFFSIZE 2000 /* size of the KFlush buffer */

Line 0 Link Here

(-)edict/files/patch-exjdxgen.c (+11 lines)
	1	--- exjdxgen.c.orig 1998-05-24 08:43:37.000000000 -0700
	2	+++ exjdxgen.c 2008-03-06 11:39:23.000000000 -0800
	3	@@ -22,7 +22,7 @@
	4	#include <sys/stat.h>
	5
	6	#include <stdio.h>
	7	-/#include <stdlib.h>/
	8	+#include <stdlib.h>
	9	#include <ctype.h>
	10	#include <string.h>
	11	#include "xjdic.h"

Line 0 Link Here

(-)edict/files/patch-xjdic.h (+11 lines)
	1	--- xjdic.h.orig Thu Sep 3 02:05:28 1998
	2	+++ xjdic.h Wed Oct 7 11:55:52 1998
	3	@@ -3,7 +3,7 @@
	4	#define NRKANA 2502 / size of the romaji to kana tables*/
	5	#define NOFILT 10 /* maximum number of general filters */
	6	#define VMAX 350 /* maximum entries in the verb table */
	7	-#define DEFAULT_DICDIR "" /* could be: "/usr/local/lib/xjdic" */
	8	+#define DEFAULT_DICDIR "/usr/local/share/dict/edict" /* could be: "/usr/local/lib/xjdic" */
	9	#define NOHITS 1000 /* size of hittab */
	10	#define SPTAG '@' /* character that flags priority entries */
	11	#define KFBUFFSIZE 2000 /* size of the KFlush buffer */

Line 0 Link Here

(-)edict/files/patch-xjdxgen.c (+11 lines)
	1	--- xjdxgen.c.orig 1998-09-10 20:04:21.000000000 -0700
	2	+++ xjdxgen.c 2008-03-06 11:40:41.000000000 -0800
	3	@@ -23,7 +23,7 @@
	4	#include <sys/stat.h>
	5
	6	#include <stdio.h>
	7	-/#include <stdlib.h>/
	8	+#include <stdlib.h>
	9	#include <ctype.h>
	10	#include <string.h>
	11	#include "xjdic.h"




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

@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

Return to bug 121445

Lines 31-44 Link Here

(-)edict/distinfo (-6 lines)
31	SHA256 (edict/findic.zip) = IGNORE	31	SHA256 (edict/findic.zip) = IGNORE
32	MD5 (edict/mktdic.zip) = IGNORE	32	MD5 (edict/mktdic.zip) = IGNORE
33	SHA256 (edict/mktdic.zip) = IGNORE	33	SHA256 (edict/mktdic.zip) = IGNORE
34	MD5 (edict/compverb.gz) = IGNORE
35	SHA256 (edict/compverb.gz) = IGNORE
36	MD5 (edict/4jword3_edict.zip) = IGNORE	34	MD5 (edict/4jword3_edict.zip) = IGNORE
37	SHA256 (edict/4jword3_edict.zip) = IGNORE	35	SHA256 (edict/4jword3_edict.zip) = IGNORE
38	MD5 (edict/concrete.zip) = IGNORE	36	MD5 (edict/concrete.zip) = IGNORE
39	SHA256 (edict/concrete.zip) = IGNORE	37	SHA256 (edict/concrete.zip) = IGNORE
40	MD5 (edict/edict_doc.txt) = IGNORE
41	SHA256 (edict/edict_doc.txt) = IGNORE
42	MD5 (edict/edict_doc.html) = IGNORE	38	MD5 (edict/edict_doc.html) = IGNORE
43	SHA256 (edict/edict_doc.html) = IGNORE	39	SHA256 (edict/edict_doc.html) = IGNORE
44	MD5 (edict/edicth.doc) = IGNORE	40	MD5 (edict/edicth.doc) = IGNORE
Lines 67-74 Link Here
67	SHA256 (edict/findic.doc) = IGNORE	63	SHA256 (edict/findic.doc) = IGNORE
68	MD5 (edict/mktdic.doc) = IGNORE	64	MD5 (edict/mktdic.doc) = IGNORE
69	SHA256 (edict/mktdic.doc) = IGNORE	65	SHA256 (edict/mktdic.doc) = IGNORE
70	MD5 (edict/compverb.doc) = IGNORE
71	SHA256 (edict/compverb.doc) = IGNORE
72	MD5 (edict/4jword3_inf.txt) = IGNORE	66	MD5 (edict/4jword3_inf.txt) = IGNORE
73	SHA256 (edict/4jword3_inf.txt) = IGNORE	67	SHA256 (edict/4jword3_inf.txt) = IGNORE
74	MD5 (edict/concrete.doc) = IGNORE	68	MD5 (edict/concrete.doc) = IGNORE

Line 0 Link Here

(-)edict/files/patch-Makefile (+38 lines)
	1	--- Makefile.orig Wed Sep 16 04:08:01 1998
	2	+++ Makefile Sat Jul 17 21:33:01 1999
	3	@@ -54,7 +54,7 @@
	4	#
	5	#LIBS= -lsocket -lnsl
	6	#
	7	-CC=gcc -g
	8	+#CC=gcc -g
	9	all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
	10	client: xjdic_cl
	11	server: xjdserver
	12	@@ -80,7 +80,7 @@
	13	#
	14	SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
	15	#SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
	16	-SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
	17	+SACFLAGS = -D__POSIX__ -DXJDFRONTEND -DXJDDIC -DMMAP ${CFLAGS}
	18	#SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD
	19	xjdic_sa: $(SAOBJECTS)
	20	$(CC) $(SAOBJECTS) -o xjdic_sa
	21	@@ -97,7 +97,7 @@
	22	# C L I E N T
	23	#
	24	CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o
	25	-CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV
	26	+CLCFLAGS = -D__POSIX__ -DXJDFRONTEND -DXJDCLSERV ${CFLAGS}
	27	xjdic_cl: $(CLOBJECTS)
	28	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
	29	xjdclient.o: xjdclient.c
	30	@@ -112,7 +112,7 @@
	31	#
	32	SVOBJECTS = xjdcomm_sv.o xjdservcomm_sv.o xjdserver.o
	33	#SVCFLAGS = -DXJDDIC -DXJDCLSERV -DDEMAND_PAGING
	34	-SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP
	35	+SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP ${CFLAGS}
	36	#SVCFLAGS = -DXJDDIC -DXJDCLSERV -DRAM_LOAD
	37	xjdserver: $(SVOBJECTS)
	38	$(CC) $(SVOBJECTS) $(LIBS) -o xjdserver

Lines 1-38 Link Here

(-)edict/files/patch-aa (-38 lines)
1	--- Makefile.orig Wed Sep 16 04:08:01 1998
2	+++ Makefile Sat Jul 17 21:33:01 1999
3	@@ -54,7 +54,7 @@
4	#
5	#LIBS= -lsocket -lnsl
6	#
7	-CC=gcc -g
8	+#CC=gcc -g
9	all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
10	client: xjdic_cl
11	server: xjdserver
12	@@ -80,7 +80,7 @@
13	#
14	SAOBJECTS = xjdsa.o xjdcomm_sa.o xjdservcomm_sa.o xjdfrontend_sa.o
15	#SACFLAGS = -DXJDFRONTEND -DXJDDIC -DDEMAND_PAGING
16	-SACFLAGS = -DXJDFRONTEND -DXJDDIC -DMMAP
17	+SACFLAGS = -D__POSIX__ -DXJDFRONTEND -DXJDDIC -DMMAP ${CFLAGS}
18	#SACFLAGS = -DXJDFRONTEND -DXJDDIC -DRAM_LOAD
19	xjdic_sa: $(SAOBJECTS)
20	$(CC) $(SAOBJECTS) -o xjdic_sa
21	@@ -97,7 +97,7 @@
22	# C L I E N T
23	#
24	CLOBJECTS = xjdclient.o xjdcomm_cl.o xjdfrontend_cl.o
25	-CLCFLAGS = -DXJDFRONTEND -DXJDCLSERV
26	+CLCFLAGS = -D__POSIX__ -DXJDFRONTEND -DXJDCLSERV ${CFLAGS}
27	xjdic_cl: $(CLOBJECTS)
28	$(CC) $(CLOBJECTS) $(LIBS) -o xjdic_cl
29	xjdclient.o: xjdclient.c
30	@@ -112,7 +112,7 @@
31	#
32	SVOBJECTS = xjdcomm_sv.o xjdservcomm_sv.o xjdserver.o
33	#SVCFLAGS = -DXJDDIC -DXJDCLSERV -DDEMAND_PAGING
34	-SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP
35	+SVCFLAGS = -DXJDDIC -DXJDCLSERV -DMMAP ${CFLAGS}
36	#SVCFLAGS = -DXJDDIC -DXJDCLSERV -DRAM_LOAD
37	xjdserver: $(SVOBJECTS)
38	$(CC) $(SVOBJECTS) $(LIBS) -o xjdserver

Lines 10-17 Link Here

(-)edict/pkg-plist (-4 lines)
10	share/dict/edict/aviation.xjdx	10	share/dict/edict/aviation.xjdx
11	share/dict/edict/compdic	11	share/dict/edict/compdic
12	share/dict/edict/compdic.xjdx	12	share/dict/edict/compdic.xjdx
13	share/dict/edict/compverb
14	share/dict/edict/compverb.xjdx
15	share/dict/edict/concrete	13	share/dict/edict/concrete
16	share/dict/edict/concrete.xjdx	14	share/dict/edict/concrete.xjdx
17	share/dict/edict/ediclsd3	15	share/dict/edict/ediclsd3
Lines 49-59 Link Here
49	@dirrm share/dict/edict	47	@dirrm share/dict/edict
50	share/doc/xjdic/4jword3_inf.txt	48	share/doc/xjdic/4jword3_inf.txt
51	share/doc/xjdic/aviation.txt	49	share/doc/xjdic/aviation.txt
52	share/doc/xjdic/compverb.doc
53	share/doc/xjdic/concrete.doc	50	share/doc/xjdic/concrete.doc
54	share/doc/xjdic/ediclsd3.rme	51	share/doc/xjdic/ediclsd3.rme
55	share/doc/xjdic/edict_doc.html	52	share/doc/xjdic/edict_doc.html
56	share/doc/xjdic/edict_doc.txt
57	share/doc/xjdic/edicth.doc	53	share/doc/xjdic/edicth.doc
58	share/doc/xjdic/enamdict_doc.html	54	share/doc/xjdic/enamdict_doc.html
59	share/doc/xjdic/enamdict_doc.txt	55	share/doc/xjdic/enamdict_doc.txt