Fix build problems.

4 files changed, 14 insertions, 28 deletions

diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index c64d7bc6811..4c54c09293a 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/11 00:47:28 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2002/11/11 12:36:40 uebayasi Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=	dict-server-1.8.0
@@ -43,6 +43,10 @@ WEB1913=	web1913.dict.dz \
 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
+
 # A symbol T_USER is defined in trap.h so...
 post-patch:
 	${GREP} -lr T_USER ${WRKSRC} | \
@@ -56,13 +60,19 @@ post-patch:
 
 # Build dictinaries
 post-build:
-	@${LN} -s ${WRKDIR}/web-1913-0.46a ${WRKDIR}/dict-web1913-1.4/web1913
+	@${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 $$d; \
+		(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#" \
diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo
index 0279d73a430..cd5ab352ab2 100644
--- a/textproc/dict-server/distinfo
+++ b/textproc/dict-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/10/11 00:47:29 uebayasi Exp $
+$NetBSD: distinfo,v 1.6 2002/11/11 12:36:40 uebayasi Exp $
 
 SHA1 (dictd-1.8.0.tar.gz) = c8318ae83a540d336405db126ff04bfc60b60ffc
 Size (dictd-1.8.0.tar.gz) = 574796 bytes
@@ -21,4 +21,3 @@ SHA1 (patch-ah) = d3453553e15858054bce4943a0316d485938806a
 SHA1 (patch-ai) = 21b2c9ace814e005139c64c4b6890e8b7e249f29
 SHA1 (patch-aj) = 76527be1d4ff89aeec72606d9575a99e6a8e2d3b
 SHA1 (patch-ak) = 4167c9007ed7b31ff9a29b368d82154bc95893cf
-SHA1 (patch-al) = 5fe89cafc86aea846f949566739d2dfde2b74adf
diff --git a/textproc/dict-server/patches/patch-aa b/textproc/dict-server/patches/patch-aa
deleted file mode 100644
index f5ddfdc8f9b..00000000000
--- a/textproc/dict-server/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/10/12 10:51:51 simonb Exp $
-
---- configure.orig	Fri Jan 12 20:24:53 2001
-+++ configure	Wed Oct 10 14:54:02 2001
-@@ -1416,7 +1416,6 @@
-     fi
- fi
- 
--local_zlib=1
- if test "$local_zlib" = 0; then
-     echo $ac_n "checking for zlibVersion in -lz""... $ac_c" 1>&6
- echo "configure:1423: checking for zlibVersion in -lz" >&5
diff --git a/textproc/dict-server/patches/patch-af b/textproc/dict-server/patches/patch-af
deleted file mode 100644
index 724cebd0813..00000000000
--- a/textproc/dict-server/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/06/26 21:02:05 dmcmahill Exp $
-
---- regex/regcomp.c.orig	Tue Mar 11 20:13:13 1997
-+++ regex/regcomp.c	Mon Jun 26 16:22:12 2000
-@@ -7,5 +7,5 @@
- #include <regex.h>
- 
--#if defined(__sparc__) && !defined(__svr4__)
-+#if defined(__sparc__) && !defined(__svr4__) && !defined(__NetBSD__)
- #define USEBCOPY
- #endif