Thu Dec 22 13:40:10 2022 UTC ()
Update to 1.18.18. From the changelog:

1.18.18:
- Replace deprecated egrep with grep -E. Thanks, Sam James
- Added support for Void Linux's xbps package manager. Thanks,
  Zev Weiss.

1.18.17:
- Fix committing of files with spaces in name when perl is not
  available. Thanks, Henrik Riomar
- Ignore udev's FHS violating large binary cache file /etc/udev/hwdb.bin
- Avoid warning messages from grep about binary files when there are
  filenames in /etc that do not correspond to the current locale
  settings. Thanks, thm

pkgsrc changes:
- Adjust installed bash-completion location to match other packages
- Use MAKE_DIRS instead of OWN_DIRS so unchanged files are uninstalled
- Take MAINTAINER


(schmonz)
diff -r1.26 -r1.27 pkgsrc/sysutils/etckeeper/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/etckeeper/PLIST
diff -r1.15 -r1.16 pkgsrc/sysutils/etckeeper/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper
diff -r1.4 -r1.5 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf
diff -r1.4 -r1.5 pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed
diff -r1.6 -r1.7 pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
diff -r1.1 -r1.2 pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files
cvs diff -r1.26 -r1.27 pkgsrc/sysutils/etckeeper/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/Makefile 2022/12/22 13:17:20 1.26
+++ pkgsrc/sysutils/etckeeper/Makefile 2022/12/22 13:40:09 1.27
@@ -1,42 +1,41 @@ @@ -1,42 +1,41 @@
1# $NetBSD: Makefile,v 1.26 2022/12/22 13:17:20 schmonz Exp $ 1# $NetBSD: Makefile,v 1.27 2022/12/22 13:40:09 schmonz Exp $
2# 2#
3 3
4DISTNAME= etckeeper_1.18.16.orig 4DISTNAME= etckeeper_1.18.18.orig
5PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//} 5PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//}
6PKGREVISION= 2 
7CATEGORIES= sysutils 6CATEGORIES= sysutils
8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= https://etckeeper.branchable.com/ 10HOMEPAGE= https://etckeeper.branchable.com/
12COMMENT= Store /etc in git, mercurial, bzr or darcs 11COMMENT= Store /etc in git, mercurial, bzr or darcs
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.1$//} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
16USE_LANGUAGES= # none 15USE_LANGUAGES= # none
17USE_TOOLS+= gawk perl:run 16USE_TOOLS+= gawk perl:run
18 17
19NO_BUILD= yes 18NO_BUILD= yes
20AUTO_MKDIRS= yes 19AUTO_MKDIRS= yes
21 20
22BUILD_DEFS+= VARBASE 21BUILD_DEFS+= VARBASE
23 22
24.include "cf-files.mk" 23.include "cf-files.mk"
25 24
26PKG_SYSCONFSUBDIR= etckeeper 25PKG_SYSCONFSUBDIR= etckeeper
27OWN_DIRS+= ${VARBASE}/cache/etckeeper 26MAKE_DIRS+= ${VARBASE}/cache/etckeeper
28OWN_DIRS+= ${PKG_SYSCONFDIR} 27MAKE_DIRS+= ${PKG_SYSCONFDIR}
29OWN_DIRS+= ${CF_FILES:H:O:u:S@^@${PKG_SYSCONFDIR}/@} 28MAKE_DIRS+= ${CF_FILES:H:O:u:S@^@${PKG_SYSCONFDIR}/@}
30 29
31EGDIR= ${PREFIX}/share/examples/etckeeper 30EGDIR= ${PREFIX}/share/examples/etckeeper
32 31
33CONF_FILES+= ${EGDIR}/etckeeper.conf ${PKG_SYSCONFDIR}/etckeeper.conf 32CONF_FILES+= ${EGDIR}/etckeeper.conf ${PKG_SYSCONFDIR}/etckeeper.conf
34.for file in ${CF_FILES:M*/README} 33.for file in ${CF_FILES:M*/README}
35CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} 34CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
36.endfor 35.endfor
37.for file in ${CF_FILES:N*/README} 36.for file in ${CF_FILES:N*/README}
38CONF_FILES_PERMS+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} \ 37CONF_FILES_PERMS+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} \
39 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 38 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
40.endfor 39.endfor
41 40
42SUBST_CLASSES+= config 41SUBST_CLASSES+= config
@@ -55,26 +54,26 @@ SUBST_VARS.config+= PKG_SYSCONFBASEDIR P @@ -55,26 +54,26 @@ SUBST_VARS.config+= PKG_SYSCONFBASEDIR P
55do-install: 54do-install:
56 ${INSTALL_SCRIPT} ${WRKSRC}/etckeeper ${DESTDIR}${PREFIX}/bin 55 ${INSTALL_SCRIPT} ${WRKSRC}/etckeeper ${DESTDIR}${PREFIX}/bin
57 ${INSTALL_DATA} ${WRKSRC}/etckeeper.conf ${DESTDIR}${EGDIR} 56 ${INSTALL_DATA} ${WRKSRC}/etckeeper.conf ${DESTDIR}${EGDIR}
58 ${INSTALL_SCRIPT} ${WRKSRC}/daily ${DESTDIR}${EGDIR} 57 ${INSTALL_SCRIPT} ${WRKSRC}/daily ${DESTDIR}${EGDIR}
59 for file in ${CF_FILES}; do \ 58 for file in ${CF_FILES}; do \
60 ${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${EGDIR}/$${file} ;\ 59 ${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${EGDIR}/$${file} ;\
61 done 60 done
62 ${RM} -f ${DESTDIR}${EGDIR}/*.d/*.orig 61 ${RM} -f ${DESTDIR}${EGDIR}/*.d/*.orig
63 ${INSTALL_MAN} ${WRKSRC}/etckeeper.8 \ 62 ${INSTALL_MAN} ${WRKSRC}/etckeeper.8 \
64 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 63 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
65 ${INSTALL_DATA} ${WRKSRC}/README.md \ 64 ${INSTALL_DATA} ${WRKSRC}/README.md \
66 ${DESTDIR}${PREFIX}/share/doc/etckeeper/README.md 65 ${DESTDIR}${PREFIX}/share/doc/etckeeper/README.md
67 ${INSTALL_DATA} ${WRKSRC}/bash_completion \ 66 ${INSTALL_DATA} ${WRKSRC}/bash_completion \
68 ${DESTDIR}${PREFIX}/share/bash-completion.d/etckeeper 67 ${DESTDIR}${PREFIX}/share/bash-completion/completions/etckeeper
69 ${INSTALL_DATA} ${WRKSRC}/zsh_completion \ 68 ${INSTALL_DATA} ${WRKSRC}/zsh_completion \
70 ${DESTDIR}${PREFIX}/share/zsh/site-functions/_etckeeper 69 ${DESTDIR}${PREFIX}/share/zsh/site-functions/_etckeeper
71 70
72gen-cf-files: .PHONY 71gen-cf-files: .PHONY
73 { \ 72 { \
74 ${ECHO} '# $$''NetBSD$$'; \ 73 ${ECHO} '# $$''NetBSD$$'; \
75 ${ECHO} '#'; \ 74 ${ECHO} '#'; \
76 (cd ${WRKSRC} && ${LS} -1 *.d/*) \ 75 (cd ${WRKSRC} && ${LS} -1 *.d/*) \
77 | ${AWK} '!/\.orig$$/ { print "CF_FILES+=\t" $$0 }'; \ 76 | ${AWK} '!/\.orig$$/ { print "CF_FILES+=\t" $$0 }'; \
78 } >cf-files.mk 77 } >cf-files.mk
79 78
80.include "../../mk/bsd.pkg.mk" 79.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/etckeeper/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/PLIST 2022/01/04 15:22:53 1.7
+++ pkgsrc/sysutils/etckeeper/PLIST 2022/12/22 13:40:09 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1@comment $NetBSD: PLIST,v 1.7 2022/01/04 15:22:53 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.8 2022/12/22 13:40:09 schmonz Exp $
2bin/etckeeper 2bin/etckeeper
3man/man8/etckeeper.8 3man/man8/etckeeper.8
4share/bash-completion.d/etckeeper 4share/bash-completion/completions/etckeeper
5share/doc/etckeeper/README.md 5share/doc/etckeeper/README.md
6share/examples/etckeeper/commit.d/10vcs-test 6share/examples/etckeeper/commit.d/10vcs-test
7share/examples/etckeeper/commit.d/20store-metadata 7share/examples/etckeeper/commit.d/20store-metadata
8share/examples/etckeeper/commit.d/30bzr-add 8share/examples/etckeeper/commit.d/30bzr-add
9share/examples/etckeeper/commit.d/30darcs-add 9share/examples/etckeeper/commit.d/30darcs-add
10share/examples/etckeeper/commit.d/30git-add 10share/examples/etckeeper/commit.d/30git-add
11share/examples/etckeeper/commit.d/30hg-addremove 11share/examples/etckeeper/commit.d/30hg-addremove
12share/examples/etckeeper/commit.d/50vcs-commit 12share/examples/etckeeper/commit.d/50vcs-commit
13share/examples/etckeeper/commit.d/99push 13share/examples/etckeeper/commit.d/99push
14share/examples/etckeeper/commit.d/README 14share/examples/etckeeper/commit.d/README
15share/examples/etckeeper/daily 15share/examples/etckeeper/daily
16share/examples/etckeeper/etckeeper.conf 16share/examples/etckeeper/etckeeper.conf
17share/examples/etckeeper/init.d/10restore-metadata 17share/examples/etckeeper/init.d/10restore-metadata
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/etckeeper/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/distinfo 2022/01/20 13:53:13 1.15
+++ pkgsrc/sysutils/etckeeper/distinfo 2022/12/22 13:40:09 1.16
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.15 2022/01/20 13:53:13 schmonz Exp $ 1$NetBSD: distinfo,v 1.16 2022/12/22 13:40:09 schmonz Exp $
2 2
3BLAKE2s (etckeeper_1.18.16.orig.tar.gz) = ca89e6a245ee04c17ee6bb2bad310edae94b1d51028cb1232d1cc914d4e26559 3BLAKE2s (etckeeper_1.18.18.orig.tar.gz) = b157ebb36cfc0474002243b9eb7fbf40fe2ac9b0080d3a2182dac657d327acb1
4SHA512 (etckeeper_1.18.16.orig.tar.gz) = 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 4SHA512 (etckeeper_1.18.18.orig.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
5Size (etckeeper_1.18.16.orig.tar.gz) = 93638 bytes 5Size (etckeeper_1.18.18.orig.tar.gz) = 101845 bytes
6SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 6SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
7SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6 7SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
8SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d 8SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
9SHA1 (patch-etckeeper) = 1b152e2111a31ff3500b5fb457f0036d7cc0372f 9SHA1 (patch-etckeeper) = 816cff7f09a7add7fba72a06807dfe1d11d2b8f8
10SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 10SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
11SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0 11SHA1 (patch-etckeeper.conf) = f726f2f1bb51184268ee7211f6dd055584877573
12SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69 12SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69
13SHA1 (patch-list-installed.d_50list-installed) = 70b336d70338c09db4445f22d7fc8256052e7384 13SHA1 (patch-list-installed.d_50list-installed) = c11c40e6853beab31790b84053f75b1e32bbe0c7
14SHA1 (patch-post-install.d_50vcs-commit) = b5ec3cc950cbcee7a47c040442446e2074fe003f 14SHA1 (patch-post-install.d_50vcs-commit) = 12e0a94e6ca86578146b8173f03886069aff90c5
15SHA1 (patch-pre-commit.d_20warn-problem-files) = dec9579886a32abd3d6ef0320ce21026bdf439ca 15SHA1 (patch-pre-commit.d_20warn-problem-files) = e4173da68d7dd7b5d89f03af1285665b23da65d1
16SHA1 (patch-pre-commit.d_30store-metadata) = 2de44634a2ea5c4cac7e895e98d9396c1bc62df1 16SHA1 (patch-pre-commit.d_30store-metadata) = 2de44634a2ea5c4cac7e895e98d9396c1bc62df1
17SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a 17SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
18SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d 18SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
19SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee 19SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
20SHA1 (patch-zsh__completion) = 9acd2ce833bdb5df2e6bdb7397d0dffbc281a320 20SHA1 (patch-zsh__completion) = 9acd2ce833bdb5df2e6bdb7397d0dffbc281a320
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-etckeeper 2022/01/20 13:53:13 1.3
+++ pkgsrc/sysutils/etckeeper/patches/patch-etckeeper 2022/12/22 13:40:10 1.4
@@ -1,51 +1,51 @@ @@ -1,51 +1,51 @@
1$NetBSD: patch-etckeeper,v 1.3 2022/01/20 13:53:13 schmonz Exp $ 1$NetBSD: patch-etckeeper,v 1.4 2022/12/22 13:40:10 schmonz Exp $
2 2
3Add SUBST_VARS tokens. 3Add SUBST_VARS tokens.
4 4
5--- etckeeper.orig 2021-01-02 15:33:42.000000000 +0000 5--- etckeeper.orig 2022-09-08 16:13:15.000000000 +0000
6+++ etckeeper 6+++ etckeeper
7@@ -2,7 +2,7 @@ 7@@ -2,7 +2,7 @@
8 set -e 8 set -e
9  9
10 if [ -z "$ETCKEEPER_CONF_DIR" ]; then 10 if [ -z "$ETCKEEPER_CONF_DIR" ]; then
11- ETCKEEPER_CONF_DIR=/etc/etckeeper 11- ETCKEEPER_CONF_DIR=/etc/etckeeper
12+ ETCKEEPER_CONF_DIR=@PKG_SYSCONFDIR@ 12+ ETCKEEPER_CONF_DIR=@PKG_SYSCONFDIR@
13 fi 13 fi
14  14
15 conf="$ETCKEEPER_CONF_DIR/etckeeper.conf" 15 conf="$ETCKEEPER_CONF_DIR/etckeeper.conf"
16@@ -84,7 +84,7 @@ elif [ "$command" = "pre-apt" ]; then 16@@ -84,7 +84,7 @@ elif [ "$command" = "pre-apt" ]; then
17 command=pre-install 17 command=pre-install
18 fi 18 fi
19  19
20-if echo "$command" | LANG=C egrep -q '[^-a-z_]'; then 20-if echo "$command" | LANG=C grep -E -q '[^-a-z_]'; then
21+if echo "$command" | LANG=C @EGREP@ -q '[^-a-z_]'; then 21+if echo "$command" | LANG=C @EGREP@ -q '[^-a-z_]'; then
22 echo "etckeeper: invalid command $command" >&2 22 echo "etckeeper: invalid command $command" >&2
23 exit 1 23 exit 1
24 fi 24 fi
25@@ -104,7 +104,7 @@ if [ "x$1" = "x-d" ]; then 25@@ -104,7 +104,7 @@ if [ "x$1" = "x-d" ]; then
26 fi 26 fi
27  27
28 if [ -z "$ETCKEEPER_DIR" ]; then 28 if [ -z "$ETCKEEPER_DIR" ]; then
29- ETCKEEPER_DIR=/etc 29- ETCKEEPER_DIR=/etc
30+ ETCKEEPER_DIR=@PKG_SYSCONFBASEDIR@ 30+ ETCKEEPER_DIR=@PKG_SYSCONFBASEDIR@
31 fi 31 fi
32 cd "$ETCKEEPER_DIR" 32 cd "$ETCKEEPER_DIR"
33 export ETCKEEPER_DIR 33 export ETCKEEPER_DIR
34@@ -127,7 +127,7 @@ export VCS 34@@ -127,7 +127,7 @@ export VCS
35  35
36 if command -v perl >/dev/null; then 36 if command -v perl >/dev/null; then
37 lsscripts() { 37 lsscripts() {
38- LANG=C perl -e ' 38- LANG=C perl -e '
39+ LANG=C @PERL5@ -e ' 39+ LANG=C @PERL5@ -e '
40 $dir=shift; 40 $dir=shift;
41 print join "\n", grep { ! -d $_ && -x $_ } 41 print join "\n", grep { ! -d $_ && -x $_ }
42 grep /^\Q$dir\/\E[-a-zA-Z0-9]+$/, 42 grep /^\Q$dir\/\E[-a-zA-Z0-9]+$/,
43@@ -142,7 +142,7 @@ else 43@@ -142,7 +142,7 @@ else
44 # fallback if perl isn't present 44 # fallback if perl isn't present
45 for script in $ETCKEEPER_CONF_DIR/$command.d/*; do 45 for script in $ETCKEEPER_CONF_DIR/$command.d/*; do
46 if [ ! -d "$script" -a -x "$script" ]; then 46 if [ ! -d "$script" -a -x "$script" ]; then
47- echo "$script" | egrep -q "/[-a-zA-Z0-9]+$" 47- echo "$script" | grep -E -q "/[-a-zA-Z0-9]+$"
48+ echo "$script" | @EGREP@ -q "/[-a-zA-Z0-9]+$" 48+ echo "$script" | @EGREP@ -q "/[-a-zA-Z0-9]+$"
49 [ $? -eq 0 ] && "$script" "$@" 49 [ $? -eq 0 ] && "$script" "$@"
50 fi 50 fi
51 done 51 done
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf 2018/10/07 10:52:40 1.4
+++ pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf 2022/12/22 13:40:10 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-etckeeper.conf,v 1.4 2018/10/07 10:52:40 schmonz Exp $ 1$NetBSD: patch-etckeeper.conf,v 1.5 2022/12/22 13:40:10 schmonz Exp $
2 2
3Make pkg_install the package manager. 3Make pkg_install the package manager.
4 4
5--- etckeeper.conf.orig 2018-06-05 20:04:03.000000000 +0000 5--- etckeeper.conf.orig 2022-09-08 16:13:15.000000000 +0000
6+++ etckeeper.conf 6+++ etckeeper.conf
7@@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a" 7@@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a"
8  8
9 # The high-level package manager that's being used. 9 # The high-level package manager that's being used.
10 # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc) 10 # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc)
11-HIGHLEVEL_PACKAGE_MANAGER=apt 11-HIGHLEVEL_PACKAGE_MANAGER=apt
12+HIGHLEVEL_PACKAGE_MANAGER=pkg_add 12+HIGHLEVEL_PACKAGE_MANAGER=pkg_add
13  13
14 # The low-level package manager that's being used. 14 # The low-level package manager that's being used.
15 # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc) 15 # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc)
16-LOWLEVEL_PACKAGE_MANAGER=dpkg 16-LOWLEVEL_PACKAGE_MANAGER=dpkg
17+LOWLEVEL_PACKAGE_MANAGER=pkg_install 17+LOWLEVEL_PACKAGE_MANAGER=pkg_install
18  18
19 # To push each commit to a remote, put the name of the remote here. 19 # To push each commit to a remote, put the name of the remote here.
20 # (eg, "origin" for git). Space-separated lists of multiple remotes 20 # (eg, "origin" for git). Space-separated lists of multiple remotes
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed 2021/12/31 10:04:24 1.4
+++ pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed 2022/12/22 13:40:10 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-list-installed.d_50list-installed,v 1.4 2021/12/31 10:04:24 schmonz Exp $ 1$NetBSD: patch-list-installed.d_50list-installed,v 1.5 2022/12/22 13:40:10 schmonz Exp $
2 2
3Add pkg_install support. 3Add pkg_install support.
4 4
5--- list-installed.d/50list-installed.orig 2020-01-22 13:59:54.000000000 +0000 5--- list-installed.d/50list-installed.orig 2022-09-08 16:13:15.000000000 +0000
6+++ list-installed.d/50list-installed 6+++ list-installed.d/50list-installed
7@@ -10,9 +10,11 @@ else 7@@ -15,9 +15,11 @@ else
8 # Output to stdout a *sorted* list of all currently installed  8 # Output to stdout a *sorted* list of all currently installed
9 # (or removed but still with config-files) packages, in the 9 # (or removed but still with config-files) packages, in the
10 # format "package version\n" (or something similar). 10 # format "package version\n" (or something similar).
11- if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then 11- if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
12+ if [ "$LOWLEVEL_PACKAGE_MANAGER" = pkg_install ]; then 12+ if [ "$LOWLEVEL_PACKAGE_MANAGER" = pkg_install ]; then
13+ pkg_info -a -I | awk '{print $1}' | sed -e 's|\(.*\)-|\1 |' | sort 13+ pkg_info -a -I | awk '{print $1}' | sed -e 's|\(.*\)-|\1 |' | sort
14+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then 14+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
15 dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \ 15 dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \
16- egrep '(ok installed|ok config-files)' | cut -f2,3 16- grep -E '(ok installed|ok config-files)' | cut -f2,3
17+ @EGREP@ '(ok installed|ok config-files)' | cut -f2,3 17+ @EGREP@ '(ok installed|ok config-files)' | cut -f2,3
18 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then 18 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
19 rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort 19 rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
20 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then 20 elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit 2022/01/04 15:22:53 1.6
+++ pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit 2022/12/22 13:40:10 1.7
@@ -1,52 +1,52 @@ @@ -1,52 +1,52 @@
1$NetBSD: patch-post-install.d_50vcs-commit,v 1.6 2022/01/04 15:22:53 schmonz Exp $ 1$NetBSD: patch-post-install.d_50vcs-commit,v 1.7 2022/12/22 13:40:10 schmonz Exp $
2 2
3Add SUBST_VARS token. 3Add SUBST_VARS token.
4 4
5--- post-install.d/50vcs-commit.orig 2021-01-02 15:33:42.000000000 +0000 5--- post-install.d/50vcs-commit.orig 2022-09-08 16:13:15.000000000 +0000
6+++ post-install.d/50vcs-commit 6+++ post-install.d/50vcs-commit
7@@ -1,7 +1,7 @@ 7@@ -1,7 +1,7 @@
8 #!/bin/sh 8 #!/bin/sh
9 set -e 9 set -e
10  10
11-pl="/var/cache/etckeeper/packagelist" 11-pl="/var/cache/etckeeper/packagelist"
12+pl="@VARBASE@/cache/etckeeper/packagelist" 12+pl="@VARBASE@/cache/etckeeper/packagelist"
13  13
14 # Parent process is etckeeper 14 # Parent process is etckeeper
15 # (Only procps ps is currently supported, others will fail, 15 # (Only procps ps is currently supported, others will fail,
16@@ -53,7 +53,7 @@ get_changed_packages () { 16@@ -56,7 +56,7 @@ get_changed_packages () {
17  17
18 if etckeeper unclean; then 18 if etckeeper unclean; then
19 if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then 19 if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then
20- message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" 20- message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run"
21+ message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run" 21+ message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run"
22 else 22 else
23 message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\"" 23 message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
24 fi 24 fi
25@@ -66,7 +66,7 @@ if etckeeper unclean; then 25@@ -69,7 +69,7 @@ if etckeeper unclean; then
26 get_changed_packages | sort | uniq > $pl.found-pkgs 26 get_changed_packages | sort | uniq > $pl.found-pkgs
27 if [ -s $pl.found-pkgs ]; then 27 if [ -s $pl.found-pkgs ]; then
28 sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs 28 sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs
29- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages 29- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
30+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages 30+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages
31 if [ -s $pl.found-packages ]; then 31 if [ -s $pl.found-packages ]; then
32 echo "Packages with configuration changes:" 32 echo "Packages with configuration changes:"
33 cat $pl.found-packages || true 33 cat $pl.found-packages || true
34@@ -74,7 +74,7 @@ if etckeeper unclean; then 34@@ -77,7 +77,7 @@ if etckeeper unclean; then
35 fi 35 fi
36 fi 36 fi
37 echo "Package changes:" 37 echo "Package changes:"
38- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' || true 38- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' || true
39+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' || true 39+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' || true
40 ) | etckeeper commit --stdin 40 ) | etckeeper commit --stdin
41 else 41 else
42 etckeeper commit "$(printf "$message")" 42 etckeeper commit "$(printf "$message")"
43@@ -83,7 +83,8 @@ if etckeeper unclean; then 43@@ -86,7 +86,8 @@ if etckeeper unclean; then
44 set -e 44 set -e
45  45
46 if [ "$status" != 0 ]; then 46 if [ "$status" != 0 ]; then
47- echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2 47- echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2
48+ echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2 48+ echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2
49+ 49+
50 fi 50 fi
51 fi 51 fi
52  52
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files 2021/12/31 10:04:24 1.1
+++ pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files 2022/12/22 13:40:10 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-pre-commit.d_20warn-problem-files,v 1.1 2021/12/31 10:04:24 schmonz Exp $ 1$NetBSD: patch-pre-commit.d_20warn-problem-files,v 1.2 2022/12/22 13:40:10 schmonz Exp $
2 2
3Add SUBST_VARS tokens. 3Add SUBST_VARS tokens.
4 4
5--- pre-commit.d/20warn-problem-files.orig 2020-01-22 13:59:54.000000000 +0000 5--- pre-commit.d/20warn-problem-files.orig 2022-09-08 16:13:15.000000000 +0000
6+++ pre-commit.d/20warn-problem-files 6+++ pre-commit.d/20warn-problem-files
7@@ -2,7 +2,7 @@ 7@@ -2,7 +2,7 @@
8 set -e 8 set -e
9  9
10 exclude_internal () { 10 exclude_internal () {
11- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' 11- grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
12+ @EGREP@ -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' 12+ @EGREP@ -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
13 } 13 }
14  14
15 if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then 15 if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then