CVS commit: pkgsrc/misc/moreutils

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Dec  2 19:57:28 UTC 2023

Modified Files:
        pkgsrc/misc/moreutils: Makefile distinfo
Added Files:
        pkgsrc/misc/moreutils/patches: patch-is__utf8_Makefile

Log Message:
moreutils: update to 0.68. From the changelog:

* popen: Use pclose, fixing compile warning.
  Thanks, Mikel Olasagasti Uranga
* vidir: Zero pad line numbers to work better when used with
  a small tab size such as 2.
  Thanks, Johan Grande


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/moreutils/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/moreutils/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/misc/moreutils/patches/patch-is__utf8_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/moreutils/Makefile
diff -u pkgsrc/misc/moreutils/Makefile:1.16 pkgsrc/misc/moreutils/Makefile:1.17
--- pkgsrc/misc/moreutils/Makefile:1.16 Tue Jun  6 12:41:57 2023
+++ pkgsrc/misc/moreutils/Makefile      Sat Dec  2 19:57:28 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2023/06/06 12:41:57 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2023/12/02 19:57:28 schmonz Exp $
 
-DISTNAME=      moreutils-0.67
-PKGREVISION=   1
+DISTNAME=      moreutils-0.68
 CATEGORIES=    misc
 MASTER_SITES=  https://git.joeyh.name/index.cgi/moreutils.git/snapshot/
 
@@ -18,7 +17,7 @@ TOOL_DEPENDS+=        libxslt-[0-9]*:../../text
 
 DEPENDS+=      p5-IPC-Run-[0-9]*:../../devel/p5-IPC-Run
 
-USE_LANGUAGES= c99
+USE_CC_FEATURES=       c99
 
 REPLACE_PERL+= chronic
 REPLACE_PERL+= combine

Index: pkgsrc/misc/moreutils/distinfo
diff -u pkgsrc/misc/moreutils/distinfo:1.10 pkgsrc/misc/moreutils/distinfo:1.11
--- pkgsrc/misc/moreutils/distinfo:1.10 Thu Jan 13 11:49:41 2022
+++ pkgsrc/misc/moreutils/distinfo      Sat Dec  2 19:57:28 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2022/01/13 11:49:41 leot Exp $
+$NetBSD: distinfo,v 1.11 2023/12/02 19:57:28 schmonz Exp $
 
-BLAKE2s (moreutils-0.67.tar.gz) = 9315bfaef4efbabf0fc9cd6eecf6e28fab89b2cd8c22021d6ad6950575f3985b
-SHA512 (moreutils-0.67.tar.gz) = 3a395fa80c1c1d769ec078cbf9455952201a364d8264796c6443a397ed7fa4f08250ecd140f047cf2e9533d6fc5310b3a579a7c083a5bc4cb4672d39c35dab75
-Size (moreutils-0.67.tar.gz) = 93627 bytes
+BLAKE2s (moreutils-0.68.tar.gz) = 66ab1699f6abfbd534a937e3ae3549ccb79b95d0cb7af7db6241fae956c3af0d
+SHA512 (moreutils-0.68.tar.gz) = 8d2ee4ab1e2409a4adde018c558884ff6c642c7426b1d07d5d15bf89ba42ea5aec279c01d7d80815a825adc527ceddf0de8db9c05b0392fccc8e76bcae032558
+Size (moreutils-0.68.tar.gz) = 93732 bytes
 SHA1 (patch-Makefile) = ff3ecd6260600063628e142c5ba59829b0bfc4bb
 SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
+SHA1 (patch-is__utf8_Makefile) = 4959888851a1652b6e22082b20bf9fdd58ee9555
 SHA1 (patch-pee.c) = 0c2cf167e7038fadd818ea3262686a1b4ed5aa7e
 SHA1 (patch-sponge.c) = 3ba941bcc1d6595c8fb6aa59b1636e86dadfdf32

Added files:

Index: pkgsrc/misc/moreutils/patches/patch-is__utf8_Makefile
diff -u /dev/null pkgsrc/misc/moreutils/patches/patch-is__utf8_Makefile:1.3
--- /dev/null   Sat Dec  2 19:57:28 2023
+++ pkgsrc/misc/moreutils/patches/patch-is__utf8_Makefile       Sat Dec  2 19:57:28 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-is__utf8_Makefile,v 1.3 2023/12/02 19:57:28 schmonz Exp $
+
+Don't forcibly override CC.
+
+--- is_utf8/Makefile.orig      2023-12-02 19:55:52.485584012 +0000
++++ is_utf8/Makefile
+@@ -37,7 +37,7 @@ LINKERNAME = lib$(NAME).so
+ SONAME = $(LINKERNAME).$(VERSION)
+ REALNAME = $(SONAME).$(MINOR).$(RELEASE)
+ 
+-CC = gcc
++CC ?= gcc
+ CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
+ 
+ $(NAME): $(OBJ)