Update to 1.18.16. From the changelog:

* Improve sorting stability.
* Prefer mktemp over tempfile as the latter displays a deprecation
  warning since debianutils 4.10. Thanks, Luke Mlsna.
* Use "command -v" rather than "which" to detect installed programs, as
  it is more portable. Thanks, Eli Schwartz.
* Improve commit messages generated by package manager changes,
  listing packages that are responsible for the changed config files.
  Thanks to emkael for the patch.
* If gc.auto is not configured, override the default to make it gc
  ten times more frequently, to avoid wasting space with loose objects.
* update-ignore: Preserve permissions from any preexisting VCS ignore file.
  Thanks, Austin Chu.
* Removed the debian directory from the upstream source package as it's
  not being maintained; see the debian package for an up-to-date one.
* debian/changelog moved to CHANGELOG and debian/copyright to COPYRIGHT.

4 files changed, 25 insertions, 21 deletions

diff --git a/sysutils/etckeeper/Makefile b/sysutils/etckeeper/Makefile
index 6870b5c1bd9..1b13451b79e 100644
--- a/sysutils/etckeeper/Makefile
+++ b/sysutils/etckeeper/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2021/12/31 10:04:24 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2022/01/04 15:22:53 schmonz Exp $
 #
 
-DISTNAME=	etckeeper_1.18.14.orig
+DISTNAME=	etckeeper_1.18.16.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig$//}
-PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
@@ -46,7 +45,7 @@ SUBST_FILES.config+=	pre-commit.d/20warn-problem-files
 SUBST_FILES.config+=	pre-install.d/10packagelist
 SUBST_FILES.config+=	post-install.d/50vcs-commit
 SUBST_FILES.config+=	bash_completion zsh_completion
-SUBST_FILES.config+=	daily debian/cron.daily
+SUBST_FILES.config+=	daily
 SUBST_VARS.config+=	PREFIX VARBASE PKG_SYSCONFBASEDIR PKG_SYSCONFDIR EGREP
 
 do-install:
@@ -57,8 +56,6 @@ do-install:
 	  ${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${EGDIR}/$${file} ;\
 	done
 	${RM} -f ${DESTDIR}${EGDIR}/*.d/*.orig
-	${INSTALL_SCRIPT} ${WRKSRC}/debian/cron.daily \
-				${DESTDIR}${PREFIX}/libexec/etckeeper.daily
 	${INSTALL_MAN} ${WRKSRC}/etckeeper.8 \
 					${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/README.md \
diff --git a/sysutils/etckeeper/PLIST b/sysutils/etckeeper/PLIST
index 99f9b7515ab..037bb066928 100644
--- a/sysutils/etckeeper/PLIST
+++ b/sysutils/etckeeper/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2021/12/31 10:05:45 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/01/04 15:22:53 schmonz Exp $
 bin/etckeeper
-libexec/etckeeper.daily
 man/man8/etckeeper.8
 share/bash-completion.d/etckeeper
 share/doc/etckeeper/README.md
diff --git a/sysutils/etckeeper/distinfo b/sysutils/etckeeper/distinfo
index 1f067a5e8bc..a0faa87fb1c 100644
--- a/sysutils/etckeeper/distinfo
+++ b/sysutils/etckeeper/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.13 2021/12/31 10:04:24 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2022/01/04 15:22:53 schmonz Exp $
 
-BLAKE2s (etckeeper_1.18.14.orig.tar.gz) = c29e20f9c6bffe51a5c1c23add147b5cd88cc99ff35b1011bc2b56d2e8f56fc0
-SHA512 (etckeeper_1.18.14.orig.tar.gz) = 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
-Size (etckeeper_1.18.14.orig.tar.gz) = 93528 bytes
+BLAKE2s (etckeeper_1.18.16.orig.tar.gz) = ca89e6a245ee04c17ee6bb2bad310edae94b1d51028cb1232d1cc914d4e26559
+SHA512 (etckeeper_1.18.16.orig.tar.gz) = 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
+Size (etckeeper_1.18.16.orig.tar.gz) = 93638 bytes
 SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
 SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
 SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
-SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131
 SHA1 (patch-etckeeper) = 2a1224b57cbd1223b1be6f98de5ad4889bfec351
 SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
 SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0
 SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69
 SHA1 (patch-list-installed.d_50list-installed) = 70b336d70338c09db4445f22d7fc8256052e7384
-SHA1 (patch-post-install.d_50vcs-commit) = 3af5a1ec8b81e4ad9e9e251eef1c1b3bb4d30cbb
+SHA1 (patch-post-install.d_50vcs-commit) = b5ec3cc950cbcee7a47c040442446e2074fe003f
 SHA1 (patch-pre-commit.d_20warn-problem-files) = dec9579886a32abd3d6ef0320ce21026bdf439ca
 SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
 SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
diff --git a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
index 24b00e79fff..747db25a756 100644
--- a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
+++ b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
@@ -1,8 +1,8 @@
-$NetBSD: patch-post-install.d_50vcs-commit,v 1.5 2021/12/31 10:04:24 schmonz Exp $
+$NetBSD: patch-post-install.d_50vcs-commit,v 1.6 2022/01/04 15:22:53 schmonz Exp $
 
 Add SUBST_VARS token.
 
---- post-install.d/50vcs-commit.orig	2020-01-22 13:59:54.000000000 +0000
+--- post-install.d/50vcs-commit.orig	2021-01-02 15:33:42.000000000 +0000
 +++ post-install.d/50vcs-commit
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -13,7 +13,7 @@ Add SUBST_VARS token.
  
  # Parent process is etckeeper
  # (Only procps ps is currently supported, others will fail,
-@@ -16,7 +16,7 @@ fi
+@@ -53,7 +53,7 @@ get_changed_packages () {
  
  if etckeeper unclean; then
  	if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then
@@ -22,16 +22,25 @@ Add SUBST_VARS token.
  	else
  		message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
  	fi
-@@ -27,7 +27,7 @@ if etckeeper unclean; then
- 			echo "$message"
- 			echo
+@@ -66,7 +66,7 @@ if etckeeper unclean; then
+ 			get_changed_packages | sort | uniq > $pl.found-pkgs
+ 			if [ -s $pl.found-pkgs ]; then
+ 				sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs
+-				etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
++				etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
+ 				if [ -s $pl.found-packages ]; then
+ 					echo "Packages with configuration changes:"
+ 					cat $pl.found-packages || true
+@@ -74,7 +74,7 @@ if etckeeper unclean; then
+ 				fi
+ 			fi
  			echo "Package changes:"
 -			etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' || true
 +			etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' || true
  		) | etckeeper commit --stdin
  	else
  		etckeeper commit "$(printf "$message")"
-@@ -36,7 +36,8 @@ if etckeeper unclean; then
+@@ -83,7 +83,8 @@ if etckeeper unclean; then
  	set -e
  
  	if [ "$status" != 0 ]; then