diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/dict-client/Makefile | 3 | ||||
| -rw-r--r-- | textproc/dict-server/Makefile | 3 | ||||
| -rw-r--r-- | textproc/dict-server/Makefile.common | 4 | ||||
| -rw-r--r-- | textproc/dict-server/distinfo | 10 | ||||
| -rw-r--r-- | textproc/dict-server/patches/patch-colorit.in | 46 | ||||
| -rw-r--r-- | textproc/dict-server/patches/patch-dictl.in | 25 |
6 files changed, 8 insertions, 83 deletions
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile index 30f0eef69eb..4627b1ba8fb 100644 --- a/textproc/dict-client/Makefile +++ b/textproc/dict-client/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2012/06/17 13:18:43 cheusov Exp $ +# $NetBSD: Makefile,v 1.37 2012/07/22 15:32:50 cheusov Exp $ .include "../../textproc/dict-server/Makefile.common" PKGNAME= ${DISTNAME:S/dictd/dict-client/} -PKGREVISION= 2 CATEGORIES= textproc COMMENT= Dictionary Service Protocol client diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile index e6430e378c1..14fa0aac150 100644 --- a/textproc/dict-server/Makefile +++ b/textproc/dict-server/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2011/05/07 10:06:02 cheusov Exp $ +# $NetBSD: Makefile,v 1.30 2012/07/22 15:32:50 cheusov Exp $ .include "../../textproc/dict-server/Makefile.common" PKGNAME= ${DISTNAME:S/dictd/dict-server/} -PKGREVISION= 1 CATEGORIES= textproc COMMENT= Dictionary Service Protocol server LICENSE= gnu-gpl-v2 diff --git a/textproc/dict-server/Makefile.common b/textproc/dict-server/Makefile.common index 5396f54047e..22848e0df24 100644 --- a/textproc/dict-server/Makefile.common +++ b/textproc/dict-server/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.4 2012/05/12 15:18:23 cheusov Exp $ +# $NetBSD: Makefile.common,v 1.5 2012/07/22 15:32:50 cheusov Exp $ # used by textproc/colorit/Makefile # used by textproc/dict-server/Makefile # used by textproc/dict-client/Makefile -DISTNAME= dictd-1.12.0 +DISTNAME= dictd-1.12.1 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dict/} \ ftp://ftp.dict.org/pub/dict/ diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo index a17535aa2bc..b75dad6e752 100644 --- a/textproc/dict-server/distinfo +++ b/textproc/dict-server/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.21 2012/06/17 13:18:42 cheusov Exp $ +$NetBSD: distinfo,v 1.22 2012/07/22 15:32:50 cheusov Exp $ -SHA1 (dictd-1.12.0.tar.gz) = 0a1b0c4103e5c3c8b749f9a5dc005cb70e4639e8 -RMD160 (dictd-1.12.0.tar.gz) = 56abaebf57baabcb72b96ccf6ec5c39cc3a67ceb -Size (dictd-1.12.0.tar.gz) = 423183 bytes -SHA1 (patch-colorit.in) = 84e205155cce66b36196c03417deab74c10d8a1a -SHA1 (patch-dictl.in) = 56a0010eefb041474e250e746ba429e66ffd2086 +SHA1 (dictd-1.12.1.tar.gz) = 5870cc0f727f89091d0ae8a054b37e891f4cf145 +RMD160 (dictd-1.12.1.tar.gz) = 6c8b2ea5a8afa26fde019dea686d52ab5007ea17 +Size (dictd-1.12.1.tar.gz) = 423870 bytes diff --git a/textproc/dict-server/patches/patch-colorit.in b/textproc/dict-server/patches/patch-colorit.in deleted file mode 100644 index 6c6ed6e7757..00000000000 --- a/textproc/dict-server/patches/patch-colorit.in +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-colorit.in,v 1.1 2012/05/12 15:18:24 cheusov Exp $ - -# Fix for -c option. Commited to upstream. ---- colorit.in.orig 2008-02-08 10:59:15.000000000 +0000 -+++ colorit.in -@@ -6,15 +6,6 @@ - - sysconfdir=@sysconfdir@ - --if test -r $HOME/.coloritrc; then -- config_file=$HOME/.coloritrc --else if test -r "$sysconfdir/colorit.conf"; then -- config_file="$sysconfdir/colorit.conf" --else -- echo "configuration file is not readable" > "/dev/stderr" -- exit 1 --fi fi -- - usage (){ - printf "\ - colorit is intended to markup stdin or input files\n\ -@@ -37,6 +28,8 @@ colorit 0.0.1\n\ - - pp='m4' - -+config_file=$HOME/.coloritrc -+ - while test $# -ne 0; do - case $1 in - -h|--help) -@@ -70,6 +63,15 @@ while test $# -ne 0; do - shift - done - -+if test -r "$config_file"; then -+ : -+elif test -r "$sysconfdir/colorit.conf"; then -+ config_file="$sysconfdir/colorit.conf" -+else -+ echo "configuration file is not readable" > "/dev/stderr" -+ exit 1 -+fi -+ - if test "_$pp" = "_-"; then - pp= - fi diff --git a/textproc/dict-server/patches/patch-dictl.in b/textproc/dict-server/patches/patch-dictl.in deleted file mode 100644 index 3b2c04149e1..00000000000 --- a/textproc/dict-server/patches/patch-dictl.in +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-dictl.in,v 1.1 2012/06/17 13:18:42 cheusov Exp $ -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677868 ---- dictl.in.orig 2009-01-10 21:16:56.000000000 +0000 -+++ dictl.in -@@ -59,11 +59,17 @@ echo apple | - - ##################################### - -+shquote (){ -+ __cmd=`printf '%s\n' "$1" | sed "s|'|'\\\\\''|g"` -+ printf "%s\n" "'$__cmd'" -+} -+ - cmd='dict' - while test $# -ne 0; do -- cmd="$cmd '$1'" -+ cmd="$cmd "`shquote "$1"` - shift - done --cmd=$(echo $cmd | charset2charset $DICTL_CHARSET $DICTL_SERVER_CHARSET) - --eval $cmd -P - | charset2charset $DICTL_SERVER_CHARSET $DICTL_CHARSET -+cmd=$(printf '%s\n' "$cmd" | charset2charset $DICTL_CHARSET $DICTL_SERVER_CHARSET) -+ -+eval "$cmd" | charset2charset $DICTL_SERVER_CHARSET $DICTL_CHARSET |