Updated devel/diffutils to 3.4
------------------------------ * Noteworthy changes in release 3.4 (2016-08-08) [stable] ** New features diff accepts two new options --color and --palette to generate and configure colored output. --color takes an optional argument specifying when to colorize a line: --color=always, --color=auto, --color=never. --palette is used to configure which colors are used. ** Bug fixes When binary files differ, diff now exits with status 1 as POSIX requires. Formerly it exited with status 2. Unless the --ignore-file-name-case option is used, diff now considers file names to be equal only if they are byte-for-byte equivalent. This fixes a bug where diff in an English locale might consider two Asian file names to be the same merely because they contain no English characters. diff -B no longer generates incorrect output if the two inputs each end with a one-byte incomplete line. diff --brief no longer reports a difference for unusual identical files. For example, when comparing a file like /proc/cmdline (for which the linux kernel reports st_size of 0 even though it is not an empty file) to a copy of that file's contents residing on a "normal" file system: $ f=/proc/cmdline; cp $f k; diff --brief $f k Files /proc/cmdline and k differ ** Performance changes diff's default algorithm has been adjusted to output higher-quality results at somewhat greater computational cost, as CPUs have gotten faster since the algorithm was last tweaked in diffutils-2.6 (1993). (pkgsrc changes) - Add comments on patches, picking from (old) cvs log
This commit is contained in:
parent
4dc1eb0c7a
commit
ba1e16aa0e
6 changed files with 27 additions and 18 deletions
|
@ -1,7 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.35 2016/02/25 12:12:47 jperkin Exp $
|
||||
# $NetBSD: Makefile,v 1.36 2016/08/09 13:35:28 mef Exp $
|
||||
#
|
||||
|
||||
DISTNAME= diffutils-3.3
|
||||
DISTNAME= diffutils-3.4
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.13 2013/05/22 09:12:27 jperkin Exp $
|
||||
@comment $NetBSD: PLIST,v 1.14 2016/08/09 13:35:28 mef Exp $
|
||||
bin/gcmp
|
||||
bin/gdiff
|
||||
bin/gdiff3
|
||||
|
@ -35,6 +35,7 @@ share/locale/it/LC_MESSAGES/diffutils.mo
|
|||
share/locale/ja/LC_MESSAGES/diffutils.mo
|
||||
share/locale/lv/LC_MESSAGES/diffutils.mo
|
||||
share/locale/ms/LC_MESSAGES/diffutils.mo
|
||||
share/locale/nb/LC_MESSAGES/diffutils.mo
|
||||
share/locale/nl/LC_MESSAGES/diffutils.mo
|
||||
share/locale/pl/LC_MESSAGES/diffutils.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/diffutils.mo
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.12 2015/11/03 03:27:23 agc Exp $
|
||||
$NetBSD: distinfo,v 1.13 2016/08/09 13:35:28 mef Exp $
|
||||
|
||||
SHA1 (diffutils-3.3.tar.xz) = 6463cce7d3eb73489996baefd0e4425928ecd61e
|
||||
RMD160 (diffutils-3.3.tar.xz) = 5785f14f89923ad115957b88c0bb4766cd4ededc
|
||||
SHA512 (diffutils-3.3.tar.xz) = b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
|
||||
Size (diffutils-3.3.tar.xz) = 1197832 bytes
|
||||
SHA1 (patch-aa) = 20e262ca71fe9ca36933e96f790f553130efcd88
|
||||
SHA1 (patch-ab) = f875decfb827c10aee02da58012a735a40f3d682
|
||||
SHA1 (patch-po_Makefile.in.in) = 311daf695a5f84ff703e1659bfc9468ed0c42236
|
||||
SHA1 (diffutils-3.4.tar.xz) = a31084c387d6e5fc8e39fdddc6764720cf4b7479
|
||||
RMD160 (diffutils-3.4.tar.xz) = d88508102f7c2e4bdf802e066f8db14665ca8d3e
|
||||
SHA512 (diffutils-3.4.tar.xz) = 0fc273007e35e67e217116e776956c6a24421f298d3e6fe60aa1d4250938a65bb8e685cd815517317b5637f5c412c1550d7c1994a9e0283ebbcae9bde24a260d
|
||||
Size (diffutils-3.4.tar.xz) = 1358392 bytes
|
||||
SHA1 (patch-aa) = 8eb95b462bc59130fca771d9273c6ae0c784520e
|
||||
SHA1 (patch-ab) = 9a332a371114d79587286fec9d42d96ecea699b1
|
||||
SHA1 (patch-po_Makefile.in.in) = 64ffbae9c85a026e89ad18320ba766db9c4e2bbd
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
$NetBSD: patch-aa,v 1.2 2012/04/07 16:30:05 schwarz Exp $
|
||||
$NetBSD: patch-aa,v 1.3 2016/08/09 13:35:28 mef Exp $
|
||||
|
||||
Let to exactly point to own diff program.
|
||||
Fixes PR 39941.
|
||||
|
||||
--- src/Makefile.in.orig 2012-04-07 01:21:43.000000000 +0200
|
||||
+++ src/Makefile.in 2012-04-07 01:22:34.000000000 +0200
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
$NetBSD: patch-ab,v 1.2 2012/04/07 16:30:05 schwarz Exp $
|
||||
$NetBSD: patch-ab,v 1.3 2016/08/09 13:35:28 mef Exp $
|
||||
|
||||
date: 2009-03-10 23:06:06 +0900; author: apb; state: Exp;
|
||||
Fix a build failure on platforms where time_t is larger than long, by
|
||||
using long long instead. (Not using time_t, because there's no easy and
|
||||
portable printf format for time_t.)
|
||||
|
||||
--- src/context.c.orig 2012-04-07 01:25:21.000000000 +0200
|
||||
+++ src/context.c 2012-04-07 01:27:52.000000000 +0200
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
$NetBSD: patch-po_Makefile.in.in,v 1.1 2013/08/21 14:08:08 richard Exp $
|
||||
$NetBSD: patch-po_Makefile.in.in,v 1.2 2016/08/09 13:35:28 mef Exp $
|
||||
|
||||
some misc fixes in order to get over the automake deprecated
|
||||
`@mkdir_p@` as well as adverse effects of SHELL in this file.
|
||||
|
||||
--- po/Makefile.in.in.orig 2013-03-23 14:51:10.000000000 +0000
|
||||
+++ po/Makefile.in.in
|
||||
@@ -15,7 +15,6 @@ PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
--- po/Makefile.in.in.orig 2016-08-05 08:38:01.000000000 +0900
|
||||
+++ po/Makefile.in.in 2016-08-09 22:19:28.000000000 +0900
|
||||
@@ -16,7 +16,6 @@ VERSION = @VERSION@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
||||
SED = @SED@
|
||||
-SHELL = /bin/sh
|
||||
@SET_MAKE@
|
||||
|
||||
|
|
Loading…
Reference in a new issue