diff options
| author | cheusov <cheusov@pkgsrc.org> | 2012-05-12 15:18:23 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2012-05-12 15:18:23 +0000 |
| commit | 502cc80615e65a83b89653447c9339b26a36200e (patch) | |
| tree | 6733fb43afc73a3dc20a03ef67ef26b87b86649e /textproc | |
| parent | 4acc6871e19ae9d08ab08f63085a9b2e59cf1886 (diff) | |
| download | pkgsrc-502cc80615e65a83b89653447c9339b26a36200e.tar.gz | |
Patch for textproc/colorit
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/dict-server/Makefile.common | 3 | ||||
| -rw-r--r-- | textproc/dict-server/distinfo | 3 | ||||
| -rw-r--r-- | textproc/dict-server/patches/patch-colorit.in | 46 |
3 files changed, 50 insertions, 2 deletions
diff --git a/textproc/dict-server/Makefile.common b/textproc/dict-server/Makefile.common index b61ef88039a..5396f54047e 100644 --- a/textproc/dict-server/Makefile.common +++ b/textproc/dict-server/Makefile.common @@ -1,4 +1,5 @@ -# $NetBSD: Makefile.common,v 1.3 2011/10/09 10:02:44 cheusov Exp $ +# $NetBSD: Makefile.common,v 1.4 2012/05/12 15:18:23 cheusov Exp $ +# used by textproc/colorit/Makefile # used by textproc/dict-server/Makefile # used by textproc/dict-client/Makefile DISTNAME= dictd-1.12.0 diff --git a/textproc/dict-server/distinfo b/textproc/dict-server/distinfo index 90f287912ab..bc05f457e71 100644 --- a/textproc/dict-server/distinfo +++ b/textproc/dict-server/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.19 2011/02/03 12:55:51 obache Exp $ +$NetBSD: distinfo,v 1.20 2012/05/12 15:18:23 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 diff --git a/textproc/dict-server/patches/patch-colorit.in b/textproc/dict-server/patches/patch-colorit.in new file mode 100644 index 00000000000..6c6ed6e7757 --- /dev/null +++ b/textproc/dict-server/patches/patch-colorit.in @@ -0,0 +1,46 @@ +$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 |