[pkgsrc/trunk]: pkgsrc/sysutils/etckeeper etckeeper: Fix pkglint warnings, fi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf76aab9b3f4
branches:  trunk
changeset: 373671:bf76aab9b3f4
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 07 23:04:45 2018 +0000

description:
etckeeper: Fix pkglint warnings, fix "grep" typo from 2013, bump revision

Plus, the file commit.d/20store-metadata had not been included in the
package, probably by accident. Regenerating cf-files.mk restored it.

diffstat:

 sysutils/etckeeper/Makefile    |  25 +++++++------
 sysutils/etckeeper/cf-files.mk |  73 +++++++++++++++++++++--------------------
 2 files changed, 50 insertions(+), 48 deletions(-)

diffs (134 lines):

diff -r c434a2c17842 -r bf76aab9b3f4 sysutils/etckeeper/Makefile
--- a/sysutils/etckeeper/Makefile       Sun Jan 07 22:36:54 2018 +0000
+++ b/sysutils/etckeeper/Makefile       Sun Jan 07 23:04:45 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2017/06/29 17:19:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/07 23:04:45 rillig Exp $
 #
 
 DISTNAME=      etckeeper_1.18.5.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig$/.1/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
@@ -14,7 +14,7 @@
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
 USE_LANGUAGES= # none
-USE_TOOLS+=    sed perl:run
+USE_TOOLS+=    gawk perl:run
 
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
@@ -22,9 +22,9 @@
 
 BUILD_DEFS+=   VARBASE
 
-ETCKEEPER_PATCH=etckeeper_1.18.5-1.diff.gz
-PATCHFILES+=   ${ETCKEEPER_PATCH}
-SITES.${ETCKEEPER_PATCH}=      ${MASTER_SITES}
+ETCKEEPER_PATCH=                       etckeeper_1.18.5-1.diff.gz
+PATCHFILES+=                           ${ETCKEEPER_PATCH}
+SITES.${ETCKEEPER_PATCH}=              ${MASTER_SITES}
 PATCH_DIST_STRIP.${ETCKEEPER_PATCH}=   -p1
 
 .include "cf-files.mk"
@@ -74,11 +74,12 @@
        ${INSTALL_DATA} ${WRKSRC}/bash_completion \
                        ${DESTDIR}${PREFIX}/share/bash-completion.d/etckeeper
 
-.PHONY:gen-cf-files
-gen-cf-files:
-       grep '[$$]NetBSD' >cf-files.mk
-       ${ECHO} '#'             >>cf-files.mk
-       ${SH} -c 'cd ${WRKSRC} && ${LS} -1 *.d/*' |                     \
-       ${SED} -e'/\.orig$$/d' -e's@^@CF_FILES+= @' >>cf-files.mk
+gen-cf-files: .PHONY
+       { \
+       ${ECHO} '# $$''NetBSD$$'; \
+       ${ECHO} '#'; \
+       (cd ${WRKSRC} && ${LS} -1 *.d/*) \
+       | ${AWK} '!/\.orig$$/ { print "CF_FILES+=\t" $$0 }'; \
+       } >cf-files.mk
 
 .include "../../mk/bsd.pkg.mk"
diff -r c434a2c17842 -r bf76aab9b3f4 sysutils/etckeeper/cf-files.mk
--- a/sysutils/etckeeper/cf-files.mk    Sun Jan 07 22:36:54 2018 +0000
+++ b/sysutils/etckeeper/cf-files.mk    Sun Jan 07 23:04:45 2018 +0000
@@ -1,37 +1,38 @@
-# $NetBSD: cf-files.mk,v 1.1 2013/05/27 08:36:00 sbd Exp $
+# $NetBSD: cf-files.mk,v 1.2 2018/01/07 23:04:45 rillig Exp $
 #
-CF_FILES+= commit.d/10vcs-test
-CF_FILES+= commit.d/30bzr-add
-CF_FILES+= commit.d/30darcs-add
-CF_FILES+= commit.d/30git-add
-CF_FILES+= commit.d/30hg-addremove
-CF_FILES+= commit.d/50vcs-commit
-CF_FILES+= commit.d/99push
-CF_FILES+= commit.d/README
-CF_FILES+= init.d/10restore-metadata
-CF_FILES+= init.d/20restore-etckeeper
-CF_FILES+= init.d/40vcs-init
-CF_FILES+= init.d/50vcs-ignore
-CF_FILES+= init.d/50vcs-perm
-CF_FILES+= init.d/50vcs-pre-commit-hook
-CF_FILES+= init.d/60darcs-deleted-symlinks
-CF_FILES+= init.d/70vcs-add
-CF_FILES+= init.d/README
-CF_FILES+= list-installed.d/50list-installed
-CF_FILES+= post-install.d/50vcs-commit
-CF_FILES+= post-install.d/README
-CF_FILES+= pre-commit.d/20warn-problem-files
-CF_FILES+= pre-commit.d/30store-metadata
-CF_FILES+= pre-commit.d/README
-CF_FILES+= pre-install.d/10packagelist
-CF_FILES+= pre-install.d/50uncommitted-changes
-CF_FILES+= pre-install.d/README
-CF_FILES+= unclean.d/50test
-CF_FILES+= unclean.d/README
-CF_FILES+= uninit.d/01prompt
-CF_FILES+= uninit.d/50remove-metadata
-CF_FILES+= uninit.d/50vcs-uninit
-CF_FILES+= uninit.d/README
-CF_FILES+= update-ignore.d/01update-ignore
-CF_FILES+= update-ignore.d/README
-CF_FILES+= vcs.d/50vcs-cmd
+CF_FILES+=     commit.d/10vcs-test
+CF_FILES+=     commit.d/20store-metadata
+CF_FILES+=     commit.d/30bzr-add
+CF_FILES+=     commit.d/30darcs-add
+CF_FILES+=     commit.d/30git-add
+CF_FILES+=     commit.d/30hg-addremove
+CF_FILES+=     commit.d/50vcs-commit
+CF_FILES+=     commit.d/99push
+CF_FILES+=     commit.d/README
+CF_FILES+=     init.d/10restore-metadata
+CF_FILES+=     init.d/20restore-etckeeper
+CF_FILES+=     init.d/40vcs-init
+CF_FILES+=     init.d/50vcs-ignore
+CF_FILES+=     init.d/50vcs-perm
+CF_FILES+=     init.d/50vcs-pre-commit-hook
+CF_FILES+=     init.d/60darcs-deleted-symlinks
+CF_FILES+=     init.d/70vcs-add
+CF_FILES+=     init.d/README
+CF_FILES+=     list-installed.d/50list-installed
+CF_FILES+=     post-install.d/50vcs-commit
+CF_FILES+=     post-install.d/README
+CF_FILES+=     pre-commit.d/20warn-problem-files
+CF_FILES+=     pre-commit.d/30store-metadata
+CF_FILES+=     pre-commit.d/README
+CF_FILES+=     pre-install.d/10packagelist
+CF_FILES+=     pre-install.d/50uncommitted-changes
+CF_FILES+=     pre-install.d/README
+CF_FILES+=     unclean.d/50test
+CF_FILES+=     unclean.d/README
+CF_FILES+=     uninit.d/01prompt
+CF_FILES+=     uninit.d/50remove-metadata
+CF_FILES+=     uninit.d/50vcs-uninit
+CF_FILES+=     uninit.d/README
+CF_FILES+=     update-ignore.d/01update-ignore
+CF_FILES+=     update-ignore.d/README
+CF_FILES+=     vcs.d/50vcs-cmd