CVS commit: pkgsrc/archivers/zutils

["Marcin Gondek" <drixter%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   drixter
Date:           Sun Jul 12 20:18:33 UTC 2026

Modified Files:
        pkgsrc/archivers/zutils: Makefile PLIST distinfo

Log Message:
zutils: Update to 1.16

2026-02-07  Antonio Diaz Diaz  <antonio%gnu.org@localhost>

        * Version 1.16 released.
        * zcmp.cc (getnum): Accept underscore separators ('_').
          Print large numbers with underscore separators ('_').
        * zgrep.cc: Assign short option name '-?' to '--help'.
        * *.cc: (show_help): Print "*Exit status*" for section in man page.
        * Makefile.in (install-bin): Warn of changes in /etc/zutils.conf.

2025-05-27  Antonio Diaz Diaz  <antonio%gnu.org@localhost>

        * Version 1.15 released.
        * zcat, ztest, zupdate: New option '-x, --exclude'.
        * zgrep: New option '--exclude'.
        * zgrep.cc: Exit with status 2 if write error on stdout.

2025-01-05  Antonio Diaz Diaz  <antonio%gnu.org@localhost>

        * Version 1.14 released.
        * zupdate.cc: '-r -d' now keeps last component of dir arguments.
        * zutils.texi: New chapter 'Syntax of command-line arguments'.
        * check.sh: Use 'cp' instead of 'cat'.

2024-01-23  Antonio Diaz Diaz  <antonio%gnu.org@localhost>

        * Version 1.13 released.
        * zutils.cc (test_format): Fix detection of bzip2 with no blocks.
        * rc.h (format_order): Put fmt_gz before fmt_bz2.
        * zcmpdiff.cc (open_other_instream): Try also other compressed formats.
        * zcmp.cc (cmp): Report EOF on empty file like GNU cmp.
        * zupdate.cc: Reformat file diagnostics as 'PROGRAM: FILE: MESSAGE'.
        * Replace 'verify' with 'check'.
        * configure, Makefile.in: New variable 'MAKEINFO'.

2023-01-07  Antonio Diaz Diaz  <antonio%gnu.org@localhost>

        * Version 1.12 released.
        * zutilsrc: Rename to zutils.conf. Search for it in $XDG_CONFIG_HOME.
          (Suggested by Adam Tuja).
        * Allow '-O, --force-format' force also uncompressed format.
        * zcmp.cc: New option '-H, --hexadecimal'.
          Change long name of option '-s' to '--script'.
          (Following a similar change made to GNU ed).
          Assign short name '-q' to options '--quiet' and '--silent'.
          Separate option '-l, --list' from '-v, --verbose'.
          (cmp): Print byte and line in EOF message like GNU cmp.
        * zgrep.cc: New options '-G, --basic-regexp', '--label=<label>',
          '--line-buffered', '-P, --perl-regexp', '--silent',
          '-T, --initial-tab', '-U, --binary'. (Reported by Chris Jamboretz).
          New option '-Z, --null'. (Reported by Leah Neukirchen).
        * ztest.cc: Exit with status 2 if a file has wrong extension.
        * zupdate.cc: New options '-d, --destdir', '-e, --expand-extensions',
          '-i, --ignore-errors'. ('-i' suggested by Antoni Sawicki).
          (zupdate_file): Pass '-q -s' to zcmp if verbosity < 0.
        * Support compress'd (.Z) files through gzip in all utilities.
        * rc.cc (show_version): Print the versions of the compressors used.
          (show_option_error): New function showing argument and option name.
        * zutils.texi: Document that format is detected by its magic bytes.
        * check.sh: Test tarlz (if available) as compressor for zupdate.

2022-01-25  Antonio Diaz Diaz  <antonio%gnu.org@localhost>

        * Version 1.11 released.
        * zcmp.cc, zdiff.cc (main): Fix race returning 1 instead of 2 when a
          compressor is not found or when the wrong format is forced.
        * zcmp.cc (getnum): Show option name and valid range if error.
        * All utilities: Show option name if error in option argument.
        * Add support for zstd format to all utilities.
        * 'zdiff -v -V' now prints the version of the diff program used.
        * 'zgrep --verbose -V' now prints the version of the grep program used.
        * zutils.texi: Document recompression of read-only files by linking.
        * zutils.texi: Change GNU Texinfo category to 'Compression'.
          (Reported by Alfred M. Szmidt).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/zutils/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/zutils/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/archivers/zutils/distinfo

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

Modified files:

Index: pkgsrc/archivers/zutils/Makefile
diff -u pkgsrc/archivers/zutils/Makefile:1.13 pkgsrc/archivers/zutils/Makefile:1.14
--- pkgsrc/archivers/zutils/Makefile:1.13       Fri Feb 12 07:27:48 2021
+++ pkgsrc/archivers/zutils/Makefile    Sun Jul 12 20:18:33 2026
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2021/02/12 07:27:48 nia Exp $
-#
+# $NetBSD: Makefile,v 1.14 2026/07/12 20:18:33 drixter Exp $
 
-DISTNAME=      zutils-1.10
+DISTNAME=      zutils-1.16
 CATEGORIES=    archivers
-MASTER_SITES=  https://download.savannah.gnu.org/releases/zutils/
+MASTER_SITES=  http://download-mirror.savannah.gnu.org/releases/zutils/
 EXTRACT_SUFX=  .tar.lz
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    drixter%e-utp.net@localhost
 HOMEPAGE=      https://www.nongnu.org/zutils/zutils.html
 COMMENT=       Utilities for any combination of compressed and non-compressed files
 LICENSE=       gnu-gpl-v3
@@ -19,21 +18,16 @@ CONFIGURE_ARGS+=    --mandir=${PREFIX}/${PK
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/${PKGINFODIR}
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/etc
 USE_LANGUAGES=         c++
-AUTO_MKDIRS=           yes
+USE_TOOLS+=            gmake
 
 INFO_FILES=            yes
-EGDIR=                 ${PREFIX}/share/examples/zutils
-CONF_FILES=            ${EGDIR}/zutilsrc ${PREFIX}/etc/zutilsrc
 
-SUBST_CLASSES+=                        sysconfdir
-SUBST_STAGE.sysconfdir=                pre-configure
-SUBST_FILES.sysconfdir=                zutilsrc
-SUBST_MESSAGE.sysconfdir=      path of sysconfdir in example (zutilsrc)
-SUBST_SED.sysconfdir=          -e '/sysconfdir/s,$${sysconfdir},${PREFIX}/etc,'
+CONF_FILES+=   ${PREFIX}/share/examples/zutils/zutils.conf ${PKG_SYSCONFDIR}/zutils.conf
 
-TEST_TARGET=   check
+EGDIR=                 ${PREFIX}/share/examples/zutils
+INSTALLATION_DIRS=     ${EGDIR}
 
 post-install:
-       ${MV}   ${DESTDIR}${PREFIX}/etc/zutilsrc ${DESTDIR}${EGDIR}
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/zutils.conf ${DESTDIR}${EGDIR}/zutils.conf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/zutils/PLIST
diff -u pkgsrc/archivers/zutils/PLIST:1.2 pkgsrc/archivers/zutils/PLIST:1.3
--- pkgsrc/archivers/zutils/PLIST:1.2   Wed Dec 31 01:25:22 2014
+++ pkgsrc/archivers/zutils/PLIST       Sun Jul 12 20:18:33 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/12/31 01:25:22 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/07/12 20:18:33 drixter Exp $
 bin/zcat
 bin/zcmp
 bin/zdiff
@@ -14,4 +14,4 @@ man/man1/zdiff.1
 man/man1/zgrep.1
 man/man1/ztest.1
 man/man1/zupdate.1
-share/examples/zutils/zutilsrc
+share/examples/zutils/zutils.conf

Index: pkgsrc/archivers/zutils/distinfo
diff -u pkgsrc/archivers/zutils/distinfo:1.9 pkgsrc/archivers/zutils/distinfo:1.10
--- pkgsrc/archivers/zutils/distinfo:1.9        Tue Oct 26 09:57:20 2021
+++ pkgsrc/archivers/zutils/distinfo    Sun Jul 12 20:18:33 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 09:57:20 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/07/12 20:18:33 drixter Exp $
 
-BLAKE2s (zutils-1.10.tar.lz) = 526ec96b766c61c204c328f9904a61ca460f8227bca315edf6df12ced651c558
-SHA512 (zutils-1.10.tar.lz) = 9ee2dd8dbfcaff2129c5d78fe0ec7c71c601dd298fa84448c1e3835db06a017809384dcdba537c9016b05e448f8cc9ab21332616dee5bb680de151bdffb815f3
-Size (zutils-1.10.tar.lz) = 55080 bytes
+BLAKE2s (zutils-1.16.tar.lz) = fd19b00d0d76b57e866c650de0dd35ab3b9a8a66e15fe6c750f8dff4cbde7e03
+SHA512 (zutils-1.16.tar.lz) = 2f89a6366c107bf3e316bc79a1d7e02a39b4efc74bad81951a153076f4e0b0b1f4f7e8bd239c8f43a9ccda9d721238d6877e19cce231c27f0ddb43852a8da1d8
+Size (zutils-1.16.tar.lz) = 66011 bytes