From 822bfa86e5be7bbf033b8d2650999b13a43b00fa Mon Sep 17 00:00:00 2001
From: leot <leot@pkgsrc.org>
Date: Thu, 13 Jan 2022 11:49:41 +0000
Subject: moreutils: Update to 0.67
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes:
0.67
----
 - README: Formalize that I am not adding new tools to moreutils, and
   have not for a long while. This package needs someone new to take over
   editorial responsibility.
 - Makefile: Install man pages without executable bit. Thanks, meator
 - ifne.1: Improve example that pipes to mail to avoid escape sequences.

0.66
----
 - vipe: When no output is piped into vipe, and stdin is connected to
   the terminal, don't read from stdin before opening the editor. This
   allows eg: vipe | command Thanks, Florian Pensec
 - chronic: With -v, flush stdout after printing "STDERR" header. Thanks,
   Adam Sjøgren
---
 misc/moreutils/Makefile               |  5 ++---
 misc/moreutils/distinfo               | 10 +++++-----
 misc/moreutils/patches/patch-Makefile | 12 ++++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/misc/moreutils/Makefile b/misc/moreutils/Makefile
index 79e5ab82966..93b72893c6b 100644
--- a/misc/moreutils/Makefile
+++ b/misc/moreutils/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2021/05/24 19:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/01/13 11:49:41 leot Exp $
 
-DISTNAME=	moreutils-0.65
-PKGREVISION=	1
+DISTNAME=	moreutils-0.67
 CATEGORIES=	misc
 MASTER_SITES=	https://git.joeyh.name/index.cgi/moreutils.git/snapshot/
 
diff --git a/misc/moreutils/distinfo b/misc/moreutils/distinfo
index e02fd259b58..052ce536721 100644
--- a/misc/moreutils/distinfo
+++ b/misc/moreutils/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:59:15 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/01/13 11:49:41 leot Exp $
 
-BLAKE2s (moreutils-0.65.tar.gz) = 8746b94bf55e30beccb451abbae344925900822e8264a320a9e984e9d3612fd3
-SHA512 (moreutils-0.65.tar.gz) = dcad2a3b6d9621da6d2f860f39acb04c80d42cc2123e12a6ec84524f6a1fc7f5ae4bd5d00e698fe14d4c5e7d491d790970ce4370c9abd1f63318d1c512f596b9
-Size (moreutils-0.65.tar.gz) = 93180 bytes
-SHA1 (patch-Makefile) = 80fb38e584db12f344ed66da76c8bee0127d17cc
+BLAKE2s (moreutils-0.67.tar.gz) = 9315bfaef4efbabf0fc9cd6eecf6e28fab89b2cd8c22021d6ad6950575f3985b
+SHA512 (moreutils-0.67.tar.gz) = 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75
+Size (moreutils-0.67.tar.gz) = 93627 bytes
+SHA1 (patch-Makefile) = ff3ecd6260600063628e142c5ba59829b0bfc4bb
 SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
 SHA1 (patch-pee.c) = 0c2cf167e7038fadd818ea3262686a1b4ed5aa7e
 SHA1 (patch-sponge.c) = 3ba941bcc1d6595c8fb6aa59b1636e86dadfdf32
diff --git a/misc/moreutils/patches/patch-Makefile b/misc/moreutils/patches/patch-Makefile
index 64cf10fbbb5..30c23521539 100644
--- a/misc/moreutils/patches/patch-Makefile
+++ b/misc/moreutils/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.2 2017/09/07 08:18:44 leot Exp $
+$NetBSD: patch-Makefile,v 1.3 2022/01/13 11:49:41 leot Exp $
 
 - Instruct Makefile to properly handle also man pages and scripts via
   corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
 - Introduce MANDIR in order to ease the installation of man pages
 
---- Makefile.orig	2016-08-13 13:58:21.000000000 +0000
+--- Makefile.orig	2021-12-21 19:39:00.000000000 +0000
 +++ Makefile
 @@ -3,7 +3,10 @@ PERLSCRIPTS=vidir vipe ts combine zrun c
  MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1
@@ -17,7 +17,7 @@ $NetBSD: patch-Makefile,v 1.2 2017/09/07 08:18:44 leot Exp $
  
  ifneq (,$(findstring CYGWIN,$(shell uname)))
  	DOCBOOKXSL?=/usr/share/sgml/docbook/xsl-stylesheets
-@@ -25,10 +28,10 @@ isutf8: is_utf8/*.c is_utf8/*.h
+@@ -26,10 +29,10 @@ isutf8: is_utf8/*.c is_utf8/*.h
  install:
  	mkdir -p $(DESTDIR)$(PREFIX)/bin
  	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
@@ -25,9 +25,9 @@ $NetBSD: patch-Makefile,v 1.2 2017/09/07 08:18:44 leot Exp $
 +	$(INSTALL_SCRIPT) $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
  
 -	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
--	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 644 $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
 +	mkdir -p $(DESTDIR)$(MANDIR)/man1
 +	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(MANDIR)/man1
  
- check: isutf8
- 	./is_utf8/test.sh
+ uninstall:
+ 	for i in $(BINS) $(PERLSCRIPTS); do rm -f $(DESTDIR)$(PREFIX)/bin/$$i; done
-- 
cgit v1.2.3