* Separate dictionary data from dict-server. A patch problem found by bulk

  build is solved.

* Make dict-client depend on dict-server.

Bump PKGREVISIONs.

5 files changed, 61 insertions, 107 deletions

diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index 4c54c09293a..0deda8c389f 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.6 2002/11/11 12:36:40 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/27 02:40:19 uebayasi Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=	dict-server-1.8.0
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.dict.org/pub/dict/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/dict}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		dict-gazetteer-1.3.tar.gz \
-		dict-misc-1.5.tar.gz \
-		dict-web1913-1.4.tar.gz \
-		web1913-0.46-a.tar.gz \
-		dict-wn-1.5.tar.gz
+#DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+#		dict-gazetteer-1.3.tar.gz \
+#		dict-misc-1.5.tar.gz \
+#		dict-web1913-1.4.tar.gz \
+#		web1913-0.46-a.tar.gz \
+#		dict-wn-1.5.tar.gz
 
 MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.dict.org/
@@ -24,28 +25,28 @@ CONFIGURE_ARGS+=--with-etcdir=${PREFIX}/etc
 ALL_TARGET=	dictd dictzip
 INSTALL_TARGET=	install.dictd install.dictzip install.dictfmt
 
-LEXICONS=	easton.dict.dz \
-		easton.index \
-		elements.dict.dz \
-		elements.index \
-		foldoc.dict.dz \
-		foldoc.index \
-		hitchcock.dict.dz \
-		hitchcock.index \
-		jargon.dict.dz \
-		jargon.index \
-		world95.dict.dz \
-		world95.index
-GAZETTEER=	gazetteer.dict.dz \
-		gazetteer.index
-WEB1913=	web1913.dict.dz \
-		web1913.index
-WN=		wn.dict.dz \
-		wn.index
+#LEXICONS=	easton.dict.dz \
+#		easton.index \
+#		elements.dict.dz \
+#		elements.index \
+#		foldoc.dict.dz \
+#		foldoc.index \
+#		hitchcock.dict.dz \
+#		hitchcock.index \
+#		jargon.dict.dz \
+#		jargon.index \
+#		world95.dict.dz \
+#		world95.index
+#GAZETTEER=	gazetteer.dict.dz \
+#		gazetteer.index
+#WEB1913=	web1913.dict.dz \
+#		web1913.index
+#WN=		wn.dict.dz \
+#		wn.index
 
-post-extract:
-	${RM} -fr ${WRKDIR}/dict-web1913-1.4/libmaa
-	${LN} -fs ${WRKDIR}/dictd-1.8.0/libmaa ${WRKDIR}/dict-web1913-1.4/libmaa
+#post-extract:
+#	${RM} -fr ${WRKDIR}/dict-web1913-1.4/libmaa
+#	${LN} -fs ${WRKDIR}/dictd-1.8.0/libmaa ${WRKDIR}/dict-web1913-1.4/libmaa
 
 # A symbol T_USER is defined in trap.h so...
 post-patch:
@@ -59,41 +60,41 @@ post-patch:
 	done
 
 # Build dictinaries
-post-build:
-	@${LN} -fs ${WRKDIR}/web1913-0.46-a ${WRKDIR}/dict-web1913-1.4/web1913
-	@for d in dict-misc-1.5 dict-gazetteer-1.3 dict-web1913-1.4 dict-wn-1.5; do \
-		(cd ${WRKDIR}/$$d; \
-		    ${SH} configure; \
-		    ${MAKE_PROGRAM} db; \
-		); \
-	done
-	${FIND} ${WRKDIR} -name '*.dict' | \
-	while read f; do \
-		if [ ! -f $${f}.dz ]; then \
-			${WRKSRC}/dictzip $$f; \
-		fi; \
-	done
+#post-build:
+#	@${LN} -fs ${WRKDIR}/web1913-0.46-a ${WRKDIR}/dict-web1913-1.4/web1913
+#	@for d in dict-misc-1.5 dict-gazetteer-1.3 dict-web1913-1.4 dict-wn-1.5; do \
+#		(cd ${WRKDIR}/$$d; \
+#		    ${SH} configure; \
+#		    ${MAKE_PROGRAM} db; \
+#		); \
+#	done
+#	${FIND} ${WRKDIR} -name '*.dict' | \
+#	while read f; do \
+#		if [ ! -f $${f}.dz ]; then \
+#			${WRKSRC}/dictzip $$f; \
+#		fi; \
+#	done
 
 post-install:
 	${SED} "s#/usr/lib/dict#${PREFIX}/share/dictd#" \
 		${WRKSRC}/dictd.conf >${PREFIX}/etc/dictd.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
-	for f in ${LEXICONS}; do \
-		${INSTALL_DATA} ${WRKDIR}/dict-misc-1.5/$$f \
-		    ${PREFIX}/share/dictd; \
-	done
-	for f in ${GAZETTEER}; do \
-		${INSTALL_DATA} ${WRKDIR}/dict-gazetteer-1.3/$$f \
-		    ${PREFIX}/share/dictd; \
-	done
-	for f in ${WEB1913}; do \
-		${INSTALL_DATA} ${WRKDIR}/dict-web1913-1.4/$$f \
-		    ${PREFIX}/share/dictd; \
-	done
-	for f in ${WN}; do \
-		${INSTALL_DATA} ${WRKDIR}/dict-wn-1.5/$$f \
-		    ${PREFIX}/share/dictd; \
-	done
+#	for f in ${LEXICONS}; do \
+#		${INSTALL_DATA} ${WRKDIR}/dict-misc-1.5/$$f \
+#		    ${PREFIX}/share/dictd; \
+#	done
+#	for f in ${GAZETTEER}; do \
+#		${INSTALL_DATA} ${WRKDIR}/dict-gazetteer-1.3/$$f \
+#		    ${PREFIX}/share/dictd; \
+#	done
+#	for f in ${WEB1913}; do \
+#		${INSTALL_DATA} ${WRKDIR}/dict-web1913-1.4/$$f \
+#		    ${PREFIX}/share/dictd; \
+#	done
+#	for f in ${WN}; do \
+#		${INSTALL_DATA} ${WRKDIR}/dict-wn-1.5/$$f \
+#		    ${PREFIX}/share/dictd; \
+#	done
 
 .include "../../devel/libtool/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-server/PLIST b/textproc/dict-server/PLIST
index 7f4c476aede..d3c103bf1e6 100644
--- a/textproc/dict-server/PLIST
+++ b/textproc/dict-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/11 00:47:28 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/27 02:40:19 uebayasi Exp $
 bin/dictfmt
 bin/dictfmt_index2suffix
 bin/dictzip
@@ -7,22 +7,3 @@ man/man1/dictfmt.1
 man/man1/dictzip.1
 man/man8/dictd.8
 sbin/dictd
-share/dictd/web1913.dict.dz
-share/dictd/web1913.index
-share/dictd/wn.dict.dz
-share/dictd/wn.index
-share/dictd/gazetteer.dict.dz
-share/dictd/gazetteer.index
-share/dictd/jargon.dict.dz
-share/dictd/jargon.index
-share/dictd/foldoc.dict.dz
-share/dictd/foldoc.index
-share/dictd/elements.dict.dz
-share/dictd/elements.index
-share/dictd/easton.dict.dz
-share/dictd/easton.index
-share/dictd/hitchcock.dict.dz
-share/dictd/hitchcock.index
-share/dictd/world95.dict.dz
-share/dictd/world95.index
-@dirrm share/dictd
diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo
index 2c35a62dc13..d9d38a86f5a 100644
--- a/textproc/dict-server/distinfo
+++ b/textproc/dict-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/12/10 08:26:43 uebayasi Exp $
+$NetBSD: distinfo,v 1.8 2002/12/27 02:40:19 uebayasi Exp $
 
 SHA1 (dictd-1.8.0.tar.gz) = c8318ae83a540d336405db126ff04bfc60b60ffc
 Size (dictd-1.8.0.tar.gz) = 574796 bytes
@@ -21,5 +21,3 @@ SHA1 (patch-ah) = d3453553e15858054bce4943a0316d485938806a
 SHA1 (patch-ai) = 21b2c9ace814e005139c64c4b6890e8b7e249f29
 SHA1 (patch-aj) = 76527be1d4ff89aeec72606d9575a99e6a8e2d3b
 SHA1 (patch-ak) = 4167c9007ed7b31ff9a29b368d82154bc95893cf
-SHA1 (patch-al) = 548956d7eba7ebd937128fb8eb53fb0f70cd64fb
-SHA1 (patch-am) = 4ba0be52fcd42d8b2f4ebb3bb499ad507966c678
diff --git a/textproc/dict-server/patches/patch-al b/textproc/dict-server/patches/patch-al
deleted file mode 100644
index d1169b3f18e..00000000000
--- a/textproc/dict-server/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/12/10 08:26:44 uebayasi Exp $
-
---- ../dict-gazetteer-1.3/format.c.orig	Mon Jul 21 00:21:24 1997
-+++ ../dict-gazetteer-1.3/format.c
-@@ -22,7 +22,7 @@
-                                    This is usually clearer when
-                                    searching. */
- 
--#ifdef __sparc__
-+#if defined(__sparc__) && !defined(__NetBSD__)
- extern int    atoi(char *);
- extern int    printf( char *, ... );
- extern int    fprintf( FILE *, char *, ... );
diff --git a/textproc/dict-server/patches/patch-am b/textproc/dict-server/patches/patch-am
deleted file mode 100644
index 8b0680e4be5..00000000000
--- a/textproc/dict-server/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/12/10 08:26:44 uebayasi Exp $
-
---- ../dict-web1913-1.4/dump.h.orig	Mon Feb 23 04:31:40 1998
-+++ ../dict-web1913-1.4/dump.h
-@@ -139,7 +139,7 @@
- declarations for standard library calls.  We provide them here for
- situations that we know about. */
- 
--#if defined(__sparc__)
-+#if defined(__sparc__) && !defined(__NetBSD__)
- 				/* Both SunOS and Solaris */
- extern int    getrusage( int who, struct rusage * );
- extern void   bcopy( const void *, void *, int );