[pkgsrc/trunk]: pkgsrc Updated devel/diffutils to 3.7

[schwarz <schwarz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c848e87b68ab
branches:  trunk
changeset: 397944:c848e87b68ab
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sun Jul 07 18:02:43 2019 +0000

description:
Updated devel/diffutils to 3.7

Changes: bug fixes, diff --color now produces output compatible with less -R.
(cf. https://savannah.gnu.org/forum/forum.php?forum_id=9341)

diffstat:

 devel/diffutils/Makefile                        |   6 +++---
 devel/diffutils/PLIST                           |   4 +++-
 devel/diffutils/distinfo                        |  16 ++++++++--------
 devel/diffutils/patches/patch-po_Makefile.in.in |  10 +++++-----
 devel/diffutils/patches/patch-src_Makefile.in   |   8 ++++----
 devel/diffutils/patches/patch-src_context.c     |   8 ++++----
 doc/CHANGES-2019                                |   3 ++-
 7 files changed, 29 insertions(+), 26 deletions(-)

diffs (149 lines):

diff -r f2685eeb3819 -r c848e87b68ab devel/diffutils/Makefile
--- a/devel/diffutils/Makefile  Sun Jul 07 17:57:29 2019 +0000
+++ b/devel/diffutils/Makefile  Sun Jul 07 18:02:43 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2017/09/08 09:42:34 adam Exp $
+# $NetBSD: Makefile,v 1.39 2019/07/07 18:02:43 schwarz Exp $
 
-DISTNAME=      diffutils-3.6
+DISTNAME=      diffutils-3.7
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=diffutils/}
 EXTRACT_SUFX=  .tar.xz
@@ -8,7 +8,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnu.org/software/diffutils/diffutils.html
 COMMENT=       GNU diff utilities - find the differences between files
-LICENSE=       gnu-gpl-v2
+LICENSE=       gnu-gpl-v3
 
 AUTO_MKDIRS=           yes
 INFO_FILES=            yes
diff -r f2685eeb3819 -r c848e87b68ab devel/diffutils/PLIST
--- a/devel/diffutils/PLIST     Sun Jul 07 17:57:29 2019 +0000
+++ b/devel/diffutils/PLIST     Sun Jul 07 18:02:43 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/08/09 13:35:28 mef Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/07/07 18:02:43 schwarz Exp $
 bin/gcmp
 bin/gdiff
 bin/gdiff3
@@ -16,6 +16,7 @@
 man/man1/gdiff.1
 man/man1/gdiff3.1
 man/man1/gsdiff.1
+share/locale/bg/LC_MESSAGES/diffutils.mo
 share/locale/ca/LC_MESSAGES/diffutils.mo
 share/locale/cs/LC_MESSAGES/diffutils.mo
 share/locale/da/LC_MESSAGES/diffutils.mo
@@ -38,6 +39,7 @@
 share/locale/nb/LC_MESSAGES/diffutils.mo
 share/locale/nl/LC_MESSAGES/diffutils.mo
 share/locale/pl/LC_MESSAGES/diffutils.mo
+share/locale/pt/LC_MESSAGES/diffutils.mo
 share/locale/pt_BR/LC_MESSAGES/diffutils.mo
 share/locale/ro/LC_MESSAGES/diffutils.mo
 share/locale/ru/LC_MESSAGES/diffutils.mo
diff -r f2685eeb3819 -r c848e87b68ab devel/diffutils/distinfo
--- a/devel/diffutils/distinfo  Sun Jul 07 17:57:29 2019 +0000
+++ b/devel/diffutils/distinfo  Sun Jul 07 18:02:43 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2017/09/08 09:42:34 adam Exp $
+$NetBSD: distinfo,v 1.16 2019/07/07 18:02:43 schwarz Exp $
 
-SHA1 (diffutils-3.6.tar.xz) = 1287a553868b808ebfff3790a5cdc6fdf7cb2886
-RMD160 (diffutils-3.6.tar.xz) = 28159a202787e8f4e132de81c269b7a816da34c0
-SHA512 (diffutils-3.6.tar.xz) = 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-Size (diffutils-3.6.tar.xz) = 1398296 bytes
-SHA1 (patch-po_Makefile.in.in) = 64ffbae9c85a026e89ad18320ba766db9c4e2bbd
-SHA1 (patch-src_Makefile.in) = ff0b47a8356a3feb585f0c650b1cd79cb4a6f090
-SHA1 (patch-src_context.c) = 26e3baebecfc188853acbef3321a45d4f760246e
+SHA1 (diffutils-3.7.tar.xz) = ad4e0a05ee2e7f5529db6cb84474f45e086e609b
+RMD160 (diffutils-3.7.tar.xz) = 55c286ed697eb5987eca7abfc33bdab34c3021fb
+SHA512 (diffutils-3.7.tar.xz) = 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
+Size (diffutils-3.7.tar.xz) = 1448828 bytes
+SHA1 (patch-po_Makefile.in.in) = 0e7ed6eb85613f272e43a911a35a8b9cfbfb0536
+SHA1 (patch-src_Makefile.in) = ad797a73086d177d53207312a7219f78178895e1
+SHA1 (patch-src_context.c) = 8ca9eff9d0233d1952de7b5f8e055a0a90c66c59
diff -r f2685eeb3819 -r c848e87b68ab devel/diffutils/patches/patch-po_Makefile.in.in
--- a/devel/diffutils/patches/patch-po_Makefile.in.in   Sun Jul 07 17:57:29 2019 +0000
+++ b/devel/diffutils/patches/patch-po_Makefile.in.in   Sun Jul 07 18:02:43 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-po_Makefile.in.in,v 1.2 2016/08/09 13:35:28 mef Exp $
+$NetBSD: patch-po_Makefile.in.in,v 1.3 2019/07/07 18:02:44 schwarz 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     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@
+--- po/Makefile.in.in.orig     2019-01-01 02:37:29.000000000 +0100
++++ po/Makefile.in.in  2019-07-07 00:38:43.000000000 +0200
+@@ -16,7 +16,6 @@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  
  SED = @SED@
@@ -13,7 +13,7 @@
  @SET_MAKE@
  
  srcdir = @srcdir@
-@@ -39,10 +38,10 @@ INSTALL_DATA = @INSTALL_DATA@
+@@ -40,10 +39,10 @@
  # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
  # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
  # versions, $(mkinstalldirs) and $(install_sh) are unused.
diff -r f2685eeb3819 -r c848e87b68ab devel/diffutils/patches/patch-src_Makefile.in
--- a/devel/diffutils/patches/patch-src_Makefile.in     Sun Jul 07 17:57:29 2019 +0000
+++ b/devel/diffutils/patches/patch-src_Makefile.in     Sun Jul 07 18:02:43 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2017/09/08 09:42:34 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2019/07/07 18:02:44 schwarz Exp $
 
 Let to exactly point to own diff program.
 Fixes PR 39941.
 
---- src/Makefile.in.orig       2017-05-21 20:24:50.000000000 +0000
-+++ src/Makefile.in
-@@ -1302,7 +1302,7 @@ noinst_HEADERS = \
+--- src/Makefile.in.orig       2019-01-01 02:37:29.000000000 +0100
++++ src/Makefile.in    2019-07-07 00:38:35.000000000 +0200
+@@ -1325,7 +1325,7 @@
    system.h
  
  MOSTLYCLEANFILES = paths.h paths.ht
diff -r f2685eeb3819 -r c848e87b68ab devel/diffutils/patches/patch-src_context.c
--- a/devel/diffutils/patches/patch-src_context.c       Sun Jul 07 17:57:29 2019 +0000
+++ b/devel/diffutils/patches/patch-src_context.c       Sun Jul 07 18:02:43 2019 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_context.c,v 1.1 2017/09/08 09:42:34 adam Exp $
+$NetBSD: patch-src_context.c,v 1.2 2019/07/07 18:02:44 schwarz 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
-@@ -57,8 +57,8 @@
+--- src/context.c.orig 2018-12-31 07:22:10.000000000 +0100
++++ src/context.c      2019-07-07 00:38:26.000000000 +0200
+@@ -58,8 +58,8 @@
          if (LONG_MIN <= TYPE_MINIMUM (time_t)
              && TYPE_MAXIMUM (time_t) <= LONG_MAX)
            {
diff -r f2685eeb3819 -r c848e87b68ab doc/CHANGES-2019
--- a/doc/CHANGES-2019  Sun Jul 07 17:57:29 2019 +0000
+++ b/doc/CHANGES-2019  Sun Jul 07 18:02:43 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.2809 2019/07/07 17:57:29 schwarz Exp $
+$NetBSD: CHANGES-2019,v 1.2810 2019/07/07 18:02:44 schwarz Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -4688,3 +4688,4 @@
        Added emulators/mednaffe version 0.8.8 [nia 2019-07-07]
        Added editors/neatvi version 06 [leot 2019-07-07]
        Updated net/tacas-shrubbery to F4.0.4.28 [schwarz 2019-07-07]
+       Updated devel/diffutils to 3.7 [schwarz 2019-07-07]