pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc textproc/cdif: update license
details: https://anonhg.NetBSD.org/pkgsrc/rev/7865f2613f79
branches: trunk
changeset: 375639:7865f2613f79
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Feb 18 10:07:36 2018 +0000
description:
textproc/cdif: update license
The license file has only been used by this one package, therefore it was
safe to replace the text with the current license text, as taken from
README.md.
diffstat:
licenses/cdif-license | 19 ++++++-------------
textproc/cdif/DESCR | 33 ++++++++++-----------------------
textproc/cdif/Makefile | 6 +++---
3 files changed, 19 insertions(+), 39 deletions(-)
diffs (83 lines):
diff -r 7e2e7eae7051 -r 7865f2613f79 licenses/cdif-license
--- a/licenses/cdif-license Sun Feb 18 08:03:02 2018 +0000
+++ b/licenses/cdif-license Sun Feb 18 10:07:36 2018 +0000
@@ -1,13 +1,6 @@
-cdif: word context diff
-
-Copyright (c) 1992-1998 Kazumasa Utashiro <utashiro%iij.ad.jp@localhost>
-Internet Initiative Japan Inc.
-3-13 Kanda Nishiki-cho, Chiyoda-ku, Tokyo 101-0054, Japan
-
-$rcsid = q#Id: cdif,v 1.15 1999/02/03 13:14:20 utashiro Exp #;
-Original: 1992/03/11
-
-Redistribution for non-commercial purpose, with or without
-modification, is granted as long as all copyright notices are
-retained. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED.
+Use and redistribution for ANY PURPOSE are granted as long as all
+copyright notices are retained. Redistribution with modification is
+allowed provided that you make your modified version obviously
+distinguishable from the original one. THIS SOFTWARE IS PROVIDED BY
+THE AUTHOR \`\`AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES ARE
+DISCLAIMED.
diff -r 7e2e7eae7051 -r 7865f2613f79 textproc/cdif/DESCR
--- a/textproc/cdif/DESCR Sun Feb 18 08:03:02 2018 +0000
+++ b/textproc/cdif/DESCR Sun Feb 18 10:07:36 2018 +0000
@@ -1,23 +1,10 @@
-Usage: cdif [-Bvn] [-A #] [-C #] [-D #] [-I #] [-[bwcu]] file1 file2
- cdif [-rcs] [-q] [-rrev1 [-rrev2]] [cdif options] file
- cdif [cdif options] [diff-output-file]
-Options:
- -B byte compare
- -v use video standout (default for tty)
- -n use nroff style overstrike (default for non-tty)
- -b ignore trailing blank
- -w ignore whitespace
- -c[#] context diff
- -u[#] unified diff (if diff has -u option)
- -e # expression of `word' (default is '\w+')
- -A, -C, -D (Append, Change, Delete) takes one of
- vso: video standout vul: video underline
- vbd: video bold bd: nroff style overstrike
- ul: nroff style underline
- or any sequence or sequences separated by comma
- -I specify string to be shown on insertion point
- Following strings have special meanings.
- vbar: print vertical bar at the point
- caret: print caret under the point
- -diff=command
- specify any diff command
+cdif is a post-processor of the Unix diff command. It highlights
+deleted, changed and added words based on word context.
+
+To compare character-by-character rather than word-by-word, use the -B
+option.
+
+If only one file is specified, cdif reads that file (stdin if no file)
+as a output from diff command.
+
+Lines that don't look like diff output are simply ignored and printed.
diff -r 7e2e7eae7051 -r 7865f2613f79 textproc/cdif/Makefile
--- a/textproc/cdif/Makefile Sun Feb 18 08:03:02 2018 +0000
+++ b/textproc/cdif/Makefile Sun Feb 18 10:07:36 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2016/07/09 06:39:04 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2018/02/18 10:07:37 rillig Exp $
#
DISTNAME= cdif-2.14
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=kaz-utashiro/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -10,7 +10,7 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/kaz-utashiro/cdif
COMMENT= Word context diff
-#LICENSE= cdif-license # 1.19 can be used for any porpose
+LICENSE= cdif-license
USE_TOOLS+= perl:run
Home |
Main Index |
Thread Index |
Old Index