CVS commit: pkgsrc/sysutils/etckeeper

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  7 23:04:45 UTC 2018

Modified Files:
        pkgsrc/sysutils/etckeeper: Makefile cf-files.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/etckeeper/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/etckeeper/cf-files.mk

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

Modified files:

Index: pkgsrc/sysutils/etckeeper/Makefile
diff -u pkgsrc/sysutils/etckeeper/Makefile:1.10 pkgsrc/sysutils/etckeeper/Makefile:1.11
--- pkgsrc/sysutils/etckeeper/Makefile:1.10     Thu Jun 29 17:19:13 2017
+++ pkgsrc/sysutils/etckeeper/Makefile  Sun Jan  7 23:04:45 2018
@@ -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 @@ LICENSE=      gnu-gpl-v2
 
 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 @@ AUTO_MKDIRS=  yes
 
 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 @@ do-install:
        ${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"

Index: pkgsrc/sysutils/etckeeper/cf-files.mk
diff -u pkgsrc/sysutils/etckeeper/cf-files.mk:1.1 pkgsrc/sysutils/etckeeper/cf-files.mk:1.2
--- pkgsrc/sysutils/etckeeper/cf-files.mk:1.1   Mon May 27 08:36:00 2013
+++ pkgsrc/sysutils/etckeeper/cf-files.mk       Sun Jan  7 23:04:45 2018
@@ -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