[pkgsrc/trunk]: pkgsrc/sysutils/etckeeper Fix a missing EGREP subst. While he...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65ca9775d0d3
branches:  trunk
changeset: 372142:65ca9775d0d3
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jan 20 13:53:13 2022 +0000

description:
Fix a missing EGREP subst. While here, subst PERL5 too. Bump PKGREVISION.

diffstat:

 sysutils/etckeeper/Makefile                                    |   8 ++++-
 sysutils/etckeeper/distinfo                                    |   5 ++-
 sysutils/etckeeper/patches/patch-etckeeper                     |  13 +++++++-
 sysutils/etckeeper/patches/patch-pre-commit.d_30store-metadata |  15 ++++++++++
 4 files changed, 35 insertions(+), 6 deletions(-)

diffs (105 lines):

diff -r ae32467e8df5 -r 65ca9775d0d3 sysutils/etckeeper/Makefile
--- a/sysutils/etckeeper/Makefile       Thu Jan 20 13:07:50 2022 +0000
+++ b/sysutils/etckeeper/Makefile       Thu Jan 20 13:53:13 2022 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2022/01/04 15:22:53 schmonz Exp $
+# $NetBSD: Makefile,v 1.24 2022/01/20 13:53:13 schmonz Exp $
 #
 
 DISTNAME=      etckeeper_1.18.16.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig$//}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
@@ -41,12 +42,15 @@
 SUBST_CLASSES+=                config
 SUBST_STAGE.config=    do-configure
 SUBST_FILES.config+=   etckeeper etckeeper.8
+SUBST_FILES.config+=   list-installed.d/50list-installed
 SUBST_FILES.config+=   pre-commit.d/20warn-problem-files
+SUBST_FILES.config+=   pre-commit.d/30store-metadata
 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
-SUBST_VARS.config+=    PREFIX VARBASE PKG_SYSCONFBASEDIR PKG_SYSCONFDIR EGREP
+SUBST_VARS.config+=    PREFIX VARBASE EGREP PERL5
+SUBST_VARS.config+=    PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/etckeeper ${DESTDIR}${PREFIX}/bin
diff -r ae32467e8df5 -r 65ca9775d0d3 sysutils/etckeeper/distinfo
--- a/sysutils/etckeeper/distinfo       Thu Jan 20 13:07:50 2022 +0000
+++ b/sysutils/etckeeper/distinfo       Thu Jan 20 13:53:13 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2022/01/04 15:22:53 schmonz Exp $
+$NetBSD: distinfo,v 1.15 2022/01/20 13:53:13 schmonz Exp $
 
 BLAKE2s (etckeeper_1.18.16.orig.tar.gz) = ca89e6a245ee04c17ee6bb2bad310edae94b1d51028cb1232d1cc914d4e26559
 SHA512 (etckeeper_1.18.16.orig.tar.gz) = 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
@@ -6,13 +6,14 @@
 SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
 SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
 SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
-SHA1 (patch-etckeeper) = 2a1224b57cbd1223b1be6f98de5ad4889bfec351
+SHA1 (patch-etckeeper) = 1b152e2111a31ff3500b5fb457f0036d7cc0372f
 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) = b5ec3cc950cbcee7a47c040442446e2074fe003f
 SHA1 (patch-pre-commit.d_20warn-problem-files) = dec9579886a32abd3d6ef0320ce21026bdf439ca
+SHA1 (patch-pre-commit.d_30store-metadata) = 2de44634a2ea5c4cac7e895e98d9396c1bc62df1
 SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
 SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
 SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
diff -r ae32467e8df5 -r 65ca9775d0d3 sysutils/etckeeper/patches/patch-etckeeper
--- a/sysutils/etckeeper/patches/patch-etckeeper        Thu Jan 20 13:07:50 2022 +0000
+++ b/sysutils/etckeeper/patches/patch-etckeeper        Thu Jan 20 13:53:13 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-etckeeper,v 1.2 2021/12/31 10:04:24 schmonz Exp $
+$NetBSD: patch-etckeeper,v 1.3 2022/01/20 13:53:13 schmonz Exp $
 
 Add SUBST_VARS tokens.
 
---- etckeeper.orig     2020-01-22 13:59:54.000000000 +0000
+--- etckeeper.orig     2021-01-02 15:33:42.000000000 +0000
 +++ etckeeper
 @@ -2,7 +2,7 @@
  set -e
@@ -31,6 +31,15 @@
  fi
  cd "$ETCKEEPER_DIR"
  export ETCKEEPER_DIR
+@@ -127,7 +127,7 @@ export VCS
+ 
+ if command -v perl >/dev/null; then
+       lsscripts() {
+-              LANG=C perl -e '
++              LANG=C @PERL5@ -e '
+                       $dir=shift;
+                       print join "\n", grep { ! -d $_ && -x $_ }
+                               grep /^\Q$dir\/\E[-a-zA-Z0-9]+$/,
 @@ -142,7 +142,7 @@ else
        # fallback if perl isn't present
        for script in $ETCKEEPER_CONF_DIR/$command.d/*; do
diff -r ae32467e8df5 -r 65ca9775d0d3 sysutils/etckeeper/patches/patch-pre-commit.d_30store-metadata
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/etckeeper/patches/patch-pre-commit.d_30store-metadata    Thu Jan 20 13:53:13 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-pre-commit.d_30store-metadata,v 1.1 2022/01/20 13:53:13 schmonz Exp $
+
+Add SUBST_VARS token.
+
+--- pre-commit.d/30store-metadata.orig 2021-01-02 15:33:42.000000000 +0000
++++ pre-commit.d/30store-metadata
+@@ -83,7 +83,7 @@ generate_metadata() {
+ 
+ maybe_chmod_chown() {
+       if command -v perl >/dev/null; then
+-              perl -ne '
++              @PERL5@ -ne '
+                       BEGIN { $q=chr(39) }
+                       sub uidname {
+                               my $want=shift;