From 5165fb313f510757c81ee27872de3489c6724a4e Mon Sep 17 00:00:00 2001 From: uebayasi Date: Fri, 11 Oct 2002 00:47:28 +0000 Subject: Note update of Dictd (dict-server and dict-client) to 1.8.0. Approximate set of changes from 1.5.5 is: * Plug-in capability is added. This helps to develop alternative database formats. * dictdmt is added. * Suffix search improvements. * UTF-8 support. And many bug fixes as usual. --- textproc/dict-client/Makefile | 12 +++--- textproc/dict-server/Makefile | 81 +++++++++++++++++++++++++---------- textproc/dict-server/PLIST | 11 +++-- textproc/dict-server/distinfo | 31 +++++++------- textproc/dict-server/patches/patch-ab | 68 +++++++++++++++++++++-------- textproc/dict-server/patches/patch-ac | 8 ++-- 6 files changed, 142 insertions(+), 69 deletions(-) (limited to 'textproc') diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile index 0ab273dd2bd..a2d738c46c0 100644 --- a/textproc/dict-client/Makefile +++ b/textproc/dict-client/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2001/10/12 10:51:51 simonb Exp $ +# $NetBSD: Makefile,v 1.6 2002/10/11 00:49:35 uebayasi Exp $ -DISTNAME= dictd-1.5.5 -PKGNAME= dict-client-1.5.5 +DISTNAME= dictd-1.8.0 +PKGNAME= dict-client-1.8.0 CATEGORIES= textproc MASTER_SITES= ftp://ftp.dict.org/pub/dict/ @@ -9,8 +9,9 @@ MAINTAINER= mike@ethmoid.org HOMEPAGE= http://www.dict.org/ COMMENT= Dictionary Service Protocol client -USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_BUILDLINK2= # defined +USE_GMAKE= # defined +GNU_CONFIGURE= # defined ALL_TARGET= dict INSTALL_TARGET= install.dict @@ -19,4 +20,5 @@ FILESDIR= ${.CURDIR}/../../textproc/dict-server/files PATCHDIR= ${.CURDIR}/../../textproc/dict-server/patches DISTINFO_FILE= ${.CURDIR}/../../textproc/dict-server/distinfo +.include "../../devel/libtool/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile index bbec5d5b0e4..c64d7bc6811 100644 --- a/textproc/dict-server/Makefile +++ b/textproc/dict-server/Makefile @@ -1,26 +1,28 @@ -# $NetBSD: Makefile,v 1.4 2001/10/12 10:51:51 simonb Exp $ +# $NetBSD: Makefile,v 1.5 2002/10/11 00:47:28 uebayasi Exp $ -DISTNAME= dictd-1.5.5 -PKGNAME= dict-server-1.5.5 +DISTNAME= dictd-1.8.0 +PKGNAME= dict-server-1.8.0 CATEGORIES= textproc -MASTER_SITES= ftp://ftp.dict.org/pub/dict/ \ - ftp://ftp.dict.org/pub/dict/pre/ +MASTER_SITES= ftp://ftp.dict.org/pub/dict/ +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/dict} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - dict-gazetteer-1.2-pre.tar.gz \ - dict-misc-1.5-pre.tar.gz \ - dict-web1913-1.4-pre.tar.gz \ - dict-wn-1.5-pre.tar.gz + 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/ COMMENT= Dictionary Service Protocol server -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-etcdir=${PREFIX}/etc +USE_BUILDLINK2= # defined +USE_GMAKE= # defined +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+=--with-etcdir=${PREFIX}/etc ALL_TARGET= dictd dictzip -INSTALL_TARGET= install.dictd install.dictzip +INSTALL_TARGET= install.dictd install.dictzip install.dictfmt LEXICONS= easton.dict.dz \ easton.index \ @@ -28,25 +30,60 @@ LEXICONS= easton.dict.dz \ elements.index \ foldoc.dict.dz \ foldoc.index \ - gazetteer.dict.dz \ - gazetteer.index \ hitchcock.dict.dz \ hitchcock.index \ jargon.dict.dz \ jargon.index \ - web1913.dict.dz \ - web1913.index \ - wn.dict.dz \ - wn.index \ world95.dict.dz \ world95.index +GAZETTEER= gazetteer.dict.dz \ + gazetteer.index +WEB1913= web1913.dict.dz \ + web1913.index +WN= wn.dict.dz \ + wn.index + +# A symbol T_USER is defined in trap.h so... +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; \ + done + +# Build dictinaries +post-build: + @${LN} -s ${WRKDIR}/web-1913-0.46a ${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; \ + ${SH} configure; \ + ${MAKE_PROGRAM} db; \ + ); \ + 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 FILE in ${LEXICONS} - ${INSTALL_DATA} ${WRKDIR}/${FILE} ${PREFIX}/share/dictd -.endfor + 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 9891b2453ea..7f4c476aede 100644 --- a/textproc/dict-server/PLIST +++ b/textproc/dict-server/PLIST @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:28 zuntum Exp $ -sbin/dictd -man/man8/dictd.8 +@comment $NetBSD: PLIST,v 1.2 2002/10/11 00:47:28 uebayasi Exp $ +bin/dictfmt +bin/dictfmt_index2suffix bin/dictzip -man/man1/dictzip.1 etc/dictd.conf +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 diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo index d5b4a5caf60..0279d73a430 100644 --- a/textproc/dict-server/distinfo +++ b/textproc/dict-server/distinfo @@ -1,23 +1,24 @@ -$NetBSD: distinfo,v 1.4 2001/10/12 10:51:51 simonb Exp $ +$NetBSD: distinfo,v 1.5 2002/10/11 00:47:29 uebayasi Exp $ -SHA1 (dictd-1.5.5.tar.gz) = 542514feaf9a8e0c1050a2faba1ffee3b4150ee0 -Size (dictd-1.5.5.tar.gz) = 531110 bytes -SHA1 (dict-gazetteer-1.2-pre.tar.gz) = bca7f242a0fac591fd8e271faf0b90e1fe59d106 -Size (dict-gazetteer-1.2-pre.tar.gz) = 2209944 bytes -SHA1 (dict-misc-1.5-pre.tar.gz) = 169a860058bb6c262f70ca107c77eda5a6001daa -Size (dict-misc-1.5-pre.tar.gz) = 4682231 bytes -SHA1 (dict-web1913-1.4-pre.tar.gz) = 2f2a0103d03b91d1df5893339daf86cf3f881709 -Size (dict-web1913-1.4-pre.tar.gz) = 13147422 bytes -SHA1 (dict-wn-1.5-pre.tar.gz) = 9f8ee64792e4a6a3700f3093ef98f8467c89539d -Size (dict-wn-1.5-pre.tar.gz) = 8464107 bytes -SHA1 (patch-aa) = 79bb027b5e0c72dd30e885245c4d9c5a7c11d794 -SHA1 (patch-ab) = eaf3a1899a5ad68461ac32ae4ce0deea494b04c4 -SHA1 (patch-ac) = 997e44984a0e7aa55cc757ae0f9b8a89993b1f1d +SHA1 (dictd-1.8.0.tar.gz) = c8318ae83a540d336405db126ff04bfc60b60ffc +Size (dictd-1.8.0.tar.gz) = 574796 bytes +SHA1 (dict-gazetteer-1.3.tar.gz) = d46d3e0aeb956bb2b49e1ec1cda271017eed94c4 +Size (dict-gazetteer-1.3.tar.gz) = 2857457 bytes +SHA1 (dict-misc-1.5.tar.gz) = faa183a736da3809719bb513c2df4c6b9814e51f +Size (dict-misc-1.5.tar.gz) = 4204499 bytes +SHA1 (dict-web1913-1.4.tar.gz) = 727751063813fbdc67f8f2a42933d8c9bf35689b +Size (dict-web1913-1.4.tar.gz) = 293649 bytes +SHA1 (web1913-0.46-a.tar.gz) = 56d6b00b79ab31c4104862b44be8c9287babecb1 +Size (web1913-0.46-a.tar.gz) = 13795530 bytes +SHA1 (dict-wn-1.5.tar.gz) = 56cfd7200e4149504376b280e36aa37abcbe054e +Size (dict-wn-1.5.tar.gz) = 6363650 bytes +SHA1 (patch-ab) = ad9343e6fad32d9c8f6ccc221ff1fe035ace4551 +SHA1 (patch-ac) = 4239819d518ccbe4b279376f7a8b2f52028b18b9 SHA1 (patch-ad) = 75d08ce1778898edcd52b4b94c974aba54f769a7 SHA1 (patch-ae) = 1b161f8c52a6029f0af2ddb824fc23ee5f867cff -SHA1 (patch-af) = 9858bfc0cbed9c32d6b4e15ddc468a584e4916e9 SHA1 (patch-ag) = 4473d472bddc34c5d5be2d6be6a0cee015717a79 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-ab b/textproc/dict-server/patches/patch-ab index 5bef1da232a..00e11497004 100644 --- a/textproc/dict-server/patches/patch-ab +++ b/textproc/dict-server/patches/patch-ab @@ -1,28 +1,58 @@ -$NetBSD: patch-ab,v 1.2 2001/10/12 10:51:51 simonb Exp $ +$NetBSD: patch-ab,v 1.3 2002/10/11 00:47:29 uebayasi Exp $ ---- Makefile.in.orig Fri Jan 12 20:24:29 2001 -+++ Makefile.in Wed Oct 10 14:57:51 2001 -@@ -141,17 +141,16 @@ - $(CC) -c $(XTRACFLAGS) $(CFLAGS) $(SCFLAGS) $< +--- 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@ - install.dict: dict -- install dict $(bindir) -- install -m 644 dict.1 $(man1_prefix)/dict.1 -+ ${INSTALL_PROGRAM} dict $(bindir) -+ ${BSD_INSTALL_MAN} dict.1 $(man1_prefix) + 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 -- install dictzip $(bindir) -- install -m 644 dictzip.1 $(man1_prefix)/dictzip.1 -+ ${INSTALL_PROGRAM} dictzip $(bindir) -+ ${BSD_INSTALL_MAN} dictzip.1 $(man1_prefix) + 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 -- install dictd $(sbindir) + if test ! -d $(sbindir); then $(INSTALL) -d 755 $(sbindir); fi - if test ! -d $(man8_prefix); then install -d 755 $(man8_prefix); fi -- install -m 644 dictd.8 $(man8_prefix)/dictd.8 -+ ${INSTALL_PROGRAM} dictd $(sbindir) -+ ${BSD_INSTALL_MAN} dictd.8 $(man8_prefix) ++ 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 - install: $(EXES) install.dict install.dictzip install.dictd + .PHONY: install diff --git a/textproc/dict-server/patches/patch-ac b/textproc/dict-server/patches/patch-ac index 15c4aabb8c0..39e16e2d1c6 100644 --- a/textproc/dict-server/patches/patch-ac +++ b/textproc/dict-server/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2001/10/12 10:51:52 simonb Exp $ +$NetBSD: patch-ac,v 1.3 2002/10/11 00:47:29 uebayasi Exp $ ---- libmaa/maaP.h.orig Fri Dec 24 00:30:12 1999 -+++ libmaa/maaP.h Wed Oct 10 14:59:11 2001 +--- libmaa/maaP.h.orig Sat Aug 3 04:43:15 2002 ++++ libmaa/maaP.h @@ -102,7 +102,7 @@ # include #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__)) + #if !(defined(__sparc) && !defined(__svr4__)) extern int getopt( int, char **, char * ); extern int optind; -- cgit v1.2.3