Changes 1.9.15:

  Format of .index files for 8-bit databases (not-ASCII and non-UTF8)
  has been changed. This makes `dictd' backward incompatible with
  8-bit dagabases built by earlier versions of `dictfmt', i.e.
  `dictd-1.9.15' and later doesn't work with 8-bit databases
  generated by dictfmt-1.9.14 and earlier. See ChangeLog for details.
  If you use 8-bit database, rebuild them using new `dictfmt' like this
  dictunformat db.index < db.dict | dictfmt -t --locale <locale> db-new

  dictd:
    - fixed: Function `dict_search_bmh' works incorrectly in utf-8 mode
        on non-GLIBC systems.
        As a result `suffix', `substring' and `word' strategies
        may work incorrectly with UTF-8 databases
        on such platforms (FreeBSD).

    - fixed: In dictd-1.9.8 support of CYGWIN was declared,
             but it was broken in later versions.
             dictd-1.9.15 can be succesfully built with CYGWIN.

    - fixed: `dictd' dies when client tries to obtain information
             about virtual database (SHOW INFO <virt_db>).

    - Every database specified in configuration file
        may have its own "default" search
        strategy (i.e. `.' strategy).
        For this purpose additional
        keyword `default_strategy' is implemented.
        See example2.conf sample file and dictd.8 for documentation.

    - When `-d' is applied,
        debugging information is printed to syslog (or log file or stderr).

        NOTE: `-dinit' option may show you a reason why dictd doesn't start.
              If you are in trouble, apply it first (and -L or -s of course)!

    - dictd works correctly even on platforms which do not support
        `iswalnum', `iswspace' and `towlower' functions.
        Dictd with utf-8 databases was slightly tested on FreeBSD4.{9,10}

    -fixed: logging is directed when --inetd is applied

    - `AC_FUNC_MMAP' is replaced for `AC_CHECK_FUNC(mmap)' in configure.in
      As a result `mmap/munmap' functions will be used on CYGWIN and INTERIX
      if they are present.
      If you dislike it, use --without-mmap option.

  dictdplugin_dbi plugin:
    - new options: `all_char' and `utf8'.
      `all_char' option is set to FALSE by default.
      `utf8' option is set to TRUE by default.
      Both are overrided by
      `00-database-allchars' and `00-database-utf8' special headwords.

  dictd/dict/... have been ported to Interix (MS SFU-3.0 and SFU-3.5).
       It works fine as Interix daemon
       with ASCII databases (tested on Interix 3.0 and 3.5)

       NOTE: GNU make is needed for building `dictd'

  dictfmt:
    - new option --default-strategy. See dictfmt(1).

10 files changed, 53 insertions, 171 deletions

diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile
index 5c2a3d808a0..21fe4f2deb8 100644
--- a/textproc/dict-client/Makefile
+++ b/textproc/dict-client/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/12/03 15:15:11 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/02/22 16:09:54 adam Exp $
 
-DISTNAME=       dictd-1.8.0
-PKGNAME=        dict-client-1.8.0
-PKGREVISION=	4
+DISTNAME=       dictd-1.9.15
+PKGNAME=        dict-client-1.9.15
 CATEGORIES=	textproc
 MASTER_SITES=   ftp://ftp.dict.org/pub/dict/
 
@@ -10,9 +9,11 @@ MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol client
 
-USE_BUILDLINK3=	yes
-USE_GNU_TOOLS+=	make
-GNU_CONFIGURE=	yes
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-cflags="${CFLAGS}"
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 
 BUILD_TARGET=	dict
 INSTALL_TARGET=	install.dict
@@ -21,7 +22,6 @@ FILESDIR=	${.CURDIR}/../../textproc/dict-server/files
 PATCHDIR=	${.CURDIR}/../../textproc/dict-server/patches
 DISTINFO_FILE=	${.CURDIR}/../../textproc/dict-server/distinfo
 
-CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
-
 .include "../../devel/libltdl/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-client/PLIST b/textproc/dict-client/PLIST
index fee7844f267..be301383397 100644
--- a/textproc/dict-client/PLIST
+++ b/textproc/dict-client/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/22 16:09:54 adam Exp $
 bin/dict
+bin/dictl
 man/man1/dict.1
+man/man1/dictl.1
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index a02c586da2b..656cd56dcbc 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.14 2004/12/03 15:15:11 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/02/22 16:10:03 adam Exp $
 
-DISTNAME=	dictd-1.8.0
-PKGNAME=	dict-server-1.8.0
-PKGREVISION=	3
+DISTNAME=	dictd-1.9.15
+PKGNAME=	dict-server-1.9.15
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.dict.org/pub/dict/
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/dict}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dict/} \
+		ftp://ftp.dict.org/pub/dict/
 
 MAINTAINER=	mike@ethmoid.org
 HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol server
 
-USE_BUILDLINK3=	yes
-USE_GNU_TOOLS+=	make
-USE_PKGINSTALL=	yes
-GNU_CONFIGURE=	# defined
-CONFIGURE_ARGS+=--with-etcdir=${PKG_SYSCONFDIR}
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-cflags="${CFLAGS}"
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 
 BUILD_TARGET=	dictd dictzip
 INSTALL_TARGET=	install.dictd install.dictzip install.dictfmt
@@ -29,10 +29,8 @@ post-patch:
 	${GREP} -lr T_USER ${WRKSRC} | \
 	while read f; do \
 		${MV} $$f $${f}.orig; \
-		${SED} \
-		    -e 's/T_USER/T_XUSER/g' \
-		    -e 's/DICT_XUSER/DICT_USER/g' \
-		    $${f}.orig >$$f; \
+		${SED}	-e 's/T_USER/T_XUSER/g' \
+			-e 's/DICT_XUSER/DICT_USER/g' $${f}.orig >$$f; \
 	done
 
 post-install:
@@ -42,4 +40,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
 
 .include "../../devel/libltdl/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-server/PLIST b/textproc/dict-server/PLIST
index f36607c7645..4bb6fb3dbf1 100644
--- a/textproc/dict-server/PLIST
+++ b/textproc/dict-server/PLIST
@@ -1,8 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/28 21:43:26 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/02/22 16:10:03 adam Exp $
 bin/dictfmt
 bin/dictfmt_index2suffix
+bin/dictfmt_index2word
+bin/dictfmt_plugin
+bin/dictfmt_virtual
+bin/dictunformat
 bin/dictzip
 man/man1/dictfmt.1
+man/man1/dictfmt_index2suffix.1
+man/man1/dictfmt_index2word.1
+man/man1/dictunformat.1
 man/man1/dictzip.1
 man/man8/dictd.8
 sbin/dictd
diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo
index 34eecf81787..c92bad7f790 100644
--- a/textproc/dict-server/distinfo
+++ b/textproc/dict-server/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.10 2004/06/01 08:55:34 shannonjr Exp $
+$NetBSD: distinfo,v 1.11 2005/02/22 16:10:03 adam Exp $
 
-SHA1 (dictd-1.8.0.tar.gz) = c8318ae83a540d336405db126ff04bfc60b60ffc
-Size (dictd-1.8.0.tar.gz) = 574796 bytes
-SHA1 (patch-ab) = ad9343e6fad32d9c8f6ccc221ff1fe035ace4551
-SHA1 (patch-ac) = 4239819d518ccbe4b279376f7a8b2f52028b18b9
+SHA1 (dictd-1.9.15.tar.gz) = 081ea97a4a6a936855af30d9c2a31f5733985822
+Size (dictd-1.9.15.tar.gz) = 741597 bytes
 SHA1 (patch-ad) = 75d08ce1778898edcd52b4b94c974aba54f769a7
 SHA1 (patch-ae) = 1b161f8c52a6029f0af2ddb824fc23ee5f867cff
 SHA1 (patch-ag) = 4473d472bddc34c5d5be2d6be6a0cee015717a79
 SHA1 (patch-ah) = d3453553e15858054bce4943a0316d485938806a
 SHA1 (patch-ai) = 21b2c9ace814e005139c64c4b6890e8b7e249f29
 SHA1 (patch-aj) = 76527be1d4ff89aeec72606d9575a99e6a8e2d3b
-SHA1 (patch-ak) = 4167c9007ed7b31ff9a29b368d82154bc95893cf
-SHA1 (patch-al) = 4a959c6a363941a38256f5eb984a79eec98ab44f
-SHA1 (patch-am) = 5221f23eb9299202d77da2bcb041b438ee6a468e
+SHA1 (patch-ak) = 53b62d44db6247116261916d1131269313c3a572
diff --git a/textproc/dict-server/patches/patch-ab b/textproc/dict-server/patches/patch-ab
deleted file mode 100644
index 00e11497004..00000000000
--- a/textproc/dict-server/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/10/11 00:47:29 uebayasi Exp $
-
---- Makefile.in.orig	Tue Aug 13 22:28:04 2002
-+++ Makefile.in
-@@ -33,7 +33,7 @@
- srcdir=		@srcdir@
- VPATH=		@srcdir@
- prefix=		@prefix@
--subdirs=        @allsubdirs@ regex # doc -- use rfc2229 instead
-+subdirs=        @allsubdirs@ # regex doc -- use rfc2229 instead
- exec_prefix=	@exec_prefix@
- man1_prefix=	@mandir@/man1
- man8_prefix=	@mandir@/man8
-@@ -57,9 +57,9 @@
- 		-DDICT_CONFIG_PATH=\"$(conf)\"
- SCFLAGS=        @SCFLAGS@
- LDFLAGS=        @LDFLAGS@
--XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
-+XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I.
- XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
--LDLIBS=		@LIBS@ -Lregex -lregex
-+LDLIBS=		@LIBS@
- 
- EXES=	 	dict dictd dictzip dictfmt
- 
-@@ -150,26 +150,26 @@
- 	if test ! -d $(bindir); then $(INSTALL) -d 755 $(bindir); fi
- 	if test ! -d $(man1_prefix); then $(INSTALL) -d 755 $(man1_prefix); fi
- 	$(INSTALL_PROGRAM) dict $(bindir)
--	$(INSTALL_DATA) dict.1 $(man1_prefix)/dict.1
-+	$(BSD_INSTALL_MAN) dict.1 $(man1_prefix)/dict.1
- 
- install.dictzip: dictzip
- 	if test ! -d $(bindir); then $(INSTALL) -d 755 $(bindir); fi
- 	if test ! -d $(man1_prefix); then $(INSTALL) -d 755 $(man1_prefix); fi
- 	$(INSTALL_PROGRAM) dictzip $(bindir)
--	$(INSTALL_DATA) dictzip.1 $(man1_prefix)/dictzip.1
-+	$(BSD_INSTALL_MAN) dictzip.1 $(man1_prefix)/dictzip.1
- 
- install.dictfmt: dictfmt
- 	if test ! -d $(bindir); then $(INSTALL) -d 755 $(bindir); fi
- 	if test ! -d $(man1_prefix); then $(INSTALL) -d 755 $(man1_prefix); fi
- 	$(INSTALL_PROGRAM) dictfmt $(bindir)
--	$(INSTALL_PROGRAM) dictfmt_index2suffix $(bindir)
--	$(INSTALL_DATA) dictfmt.1 $(man1_prefix)/dictfmt.1
-+	$(BSD_INSTALL_SCRIPT) dictfmt_index2suffix $(bindir)
-+	$(BSD_INSTALL_MAN) dictfmt.1 $(man1_prefix)/dictfmt.1
- 
- install.dictd: dictd
- 	if test ! -d $(sbindir); then $(INSTALL) -d 755 $(sbindir); fi
--	if test ! -d $(man8_prefix); then install -d 755 $(man8_prefix); fi
-+	if test ! -d $(man8_prefix); then $(INSTALL) -d 755 $(man8_prefix); fi
- 	$(INSTALL_PROGRAM) dictd $(sbindir)
--	$(INSTALL_DATA) dictd.8 $(man8_prefix)/dictd.8
-+	$(BSD_INSTALL_MAN) dictd.8 $(man8_prefix)/dictd.8
- 
- .PHONY: install
- 
diff --git a/textproc/dict-server/patches/patch-ac b/textproc/dict-server/patches/patch-ac
deleted file mode 100644
index 39e16e2d1c6..00000000000
--- a/textproc/dict-server/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/10/11 00:47:29 uebayasi Exp $
-
---- libmaa/maaP.h.orig	Sat Aug  3 04:43:15 2002
-+++ libmaa/maaP.h
-@@ -102,7 +102,7 @@
- # include <getopt.h>
- #else
- #if !defined(__FreeBSD__) && !defined(__DGUX__) && !defined(__hpux__)
--#if !defined(__bsdi__) && !defined(__OpenBSD__)
-+#if !defined(__bsdi__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #if !(defined(__sparc) && !defined(__svr4__))
- extern int  getopt( int, char **, char * );
- extern int  optind;
diff --git a/textproc/dict-server/patches/patch-ak b/textproc/dict-server/patches/patch-ak
index 6b7a5f4e0b8..2a197c956ed 100644
--- a/textproc/dict-server/patches/patch-ak
+++ b/textproc/dict-server/patches/patch-ak
@@ -1,13 +1,23 @@
-$NetBSD: patch-ak,v 1.1 2001/08/16 07:03:22 agc Exp $
+$NetBSD: patch-ak,v 1.2 2005/02/22 16:10:03 adam Exp $
 
---- libmaa/configure	Thu Aug 16 08:03:02 2001
-+++ libmaa/configure.new	Thu Aug 16 08:02:52 2001
-@@ -549,6 +549,8 @@
- echo Configuring for libmaa $MAA_MAJOR.$MAA_MINOR
+--- libmaa/configure.orig	2004-12-23 19:23:25.000000000 +0000
++++ libmaa/configure
+@@ -1320,6 +1320,8 @@ echo Configuring for libmaa $MAA_MAJOR.$
  echo .
  
+ 
 +LIBS=`echo $LIBS | sed -e 's|-lmaa||'`
 +
  # Check whether --with-cc or --without-cc was given.
  if test "${with_cc+set}" = set; then
    withval="$with_cc"
+@@ -2523,9 +2525,7 @@ esac
+ if test "${with_cflags+set}" = set; then
+   withval="$with_cflags"
+ 
+-if test "x${withval}" = xyes; then
+     CFLAGS="$withval"
+-fi
+ 
+ fi;
+ 
diff --git a/textproc/dict-server/patches/patch-al b/textproc/dict-server/patches/patch-al
deleted file mode 100644
index 92be0cd14ca..00000000000
--- a/textproc/dict-server/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.4 2004/06/01 08:55:34 shannonjr Exp $
-
---- dictfmt.c.orig	2002-08-23 11:33:10.000000000 -0600
-+++ dictfmt.c
-@@ -369,7 +369,7 @@ static void help( FILE *out_stream )
-            several words to have the same definition\n\
-            Example: autumn%%%fall can be used\n\
-            if '--headword-separator %%%' is supplied",
--"--without-headword         with this parameter supplied
-+"--without-headword         with this parameter supplied\n\
-            head words will not be copied to .dict file",
-       0 };
-    const char        **p = help_msg;
-@@ -685,6 +685,7 @@ int main( int argc, char **argv )
- 	 fmt_newline();
-       }
-  skip:
-+      ;
-    }
- 
-    fmt_newheadword(NULL,0);
diff --git a/textproc/dict-server/patches/patch-am b/textproc/dict-server/patches/patch-am
deleted file mode 100644
index 28a22d30592..00000000000
--- a/textproc/dict-server/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.3 2004/06/01 08:55:34 shannonjr Exp $
-
---- libmaa/parse.c.orig	2002-08-02 13:43:15.000000000 -0600
-+++ libmaa/parse.c
-@@ -75,7 +75,7 @@ void prs_file( const char *filename )
- 
-    if (!cpp) {
-       if ((cpp = getenv( "KHEPERA_CPP" ))) {
--         PRINTF(MAA_PARSE,(__FUNCTION__ ": Using KHEPERA_CPP from %s\n",cpp));
-+         PRINTF(MAA_PARSE,(__FUNCTION__, ": Using KHEPERA_CPP from %s\n",cpp));
-       }
-       
-                                 /* Always look for gcc's cpp first, since
-@@ -86,7 +86,7 @@ void prs_file( const char *filename )
-          
-          if (fread( buf, 1, 1023, tmp ) > 0) {
-             if ((t = strchr( buf, '\n' ))) *t = '\0';
--            PRINTF(MAA_PARSE,(__FUNCTION__ ": Using GNU cpp from %s\n",buf));
-+            PRINTF(MAA_PARSE,(__FUNCTION__, ": Using GNU cpp from %s\n",buf));
-             cpp = str_find( buf );
-             extra_options = "-nostdinc -nostdinc++";
-          }
-@@ -103,7 +103,7 @@ void prs_file( const char *filename )
-          for (pt = cpps; **pt; pt++) {
-             if (!access( *pt, X_OK )) {
-                PRINTF(MAA_PARSE,
--                      (__FUNCTION__ ": Using system cpp from %s\n",*pt));
-+                      (__FUNCTION__, ": Using system cpp from %s\n",*pt));
-                cpp = *pt;
-                break;
-             }
-@@ -123,7 +123,7 @@ void prs_file( const char *filename )
-    sprintf( buffer, "%s -I. %s %s 2>/dev/null", cpp,
- 	    _prs_cpp_options ? _prs_cpp_options : "", filename );
- 
--   PRINTF(MAA_PARSE,(__FUNCTION__ ": %s\n",buffer));
-+   PRINTF(MAA_PARSE,(__FUNCTION__ ,": %s\n",buffer));
-    if (!(yyin = popen( buffer, "r" )))
-       err_fatal_errno( __FUNCTION__,
- 		       "Cannot open \"%s\" for read\n", filename );