CVS commit: pkgsrc/pkgtools/pkg

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Fri Oct 28 19:35:30 UTC 2016

Modified Files:
        pkgsrc/pkgtools/pkg: Makefile PLIST

Log Message:
pkgtools/pkg: fix installation of conf files

The CONF_FILES are never installed if their target directories don't
already exist due to other previous installation.  This adds several
@pkgdir entries to ensure the CONF_FILES installation can always succeed.

While here, simplify the post-install target.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/pkgtools/pkg/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/pkg/PLIST

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

Modified files:

Index: pkgsrc/pkgtools/pkg/Makefile
diff -u pkgsrc/pkgtools/pkg/Makefile:1.10 pkgsrc/pkgtools/pkg/Makefile:1.11
--- pkgsrc/pkgtools/pkg/Makefile:1.10   Fri Oct 28 15:35:08 2016
+++ pkgsrc/pkgtools/pkg/Makefile        Fri Oct 28 19:35:30 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2016/10/28 15:35:08 marino Exp $
+# $NetBSD: Makefile,v 1.11 2016/10/28 19:35:30 marino Exp $
 
 DISTNAME=      pkg-1.8.7
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    pkgtools
 MASTER_SITES=  http://files.etoilebsd.net/pkg/
 EXTRACT_SUFX=  .tar.xz
@@ -99,24 +99,13 @@ post-patch:
 
 post-install:
        ${RM} ${DESTDIR}${PREFIX}/sbin/pkg2ng
-       ${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d/_pkg.bash \
-               ${DESTDIR}${EGDIR}/bash_completion.d/_pkg.bash
-       ${RMDIR} ${DESTDIR}${PREFIX}/etc/bash_completion.d
-       ${MV} ${DESTDIR}${PREFIX}/etc/periodic/daily/411.pkg-backup \
-               ${DESTDIR}${EGDIR}/periodic/daily/411.pkg-backup
-       ${MV} ${DESTDIR}${PREFIX}/etc/periodic/daily/490.status-pkg-changes \
-               ${DESTDIR}${EGDIR}/periodic/daily/490.status-pkg-changes
-       ${RMDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily
-       ${MV} ${DESTDIR}${PREFIX}/etc/periodic/security/410.pkg-audit \
-               ${DESTDIR}${EGDIR}/periodic/security/410.pkg-audit
-       ${MV} ${DESTDIR}${PREFIX}/etc/periodic/security/460.pkg-checksum \
-               ${DESTDIR}${EGDIR}/periodic/security/460.pkg-checksum
-       ${RMDIR} ${DESTDIR}${PREFIX}/etc/periodic/security
-       ${MV} ${DESTDIR}${PREFIX}/etc/periodic/weekly/400.status-pkg \
-               ${DESTDIR}${EGDIR}/periodic/weekly/400.status-pkg
-       ${RMDIR} ${DESTDIR}${PREFIX}/etc/periodic/weekly
+       ${RM} -rf ${DESTDIR}${EGDIR}/periodic
+       ${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d \
+               ${DESTDIR}${EGDIR}/
+       ${MV} ${DESTDIR}${PREFIX}/etc/periodic \
+               ${DESTDIR}${EGDIR}/
        ${MV} ${DESTDIR}${PREFIX}/etc/pkg.conf.sample \
-               ${DESTDIR}${EGDIR}/pkg.conf.sample
+               ${DESTDIR}${EGDIR}/
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly" && ${OPSYS} != "NetBSD"

Index: pkgsrc/pkgtools/pkg/PLIST
diff -u pkgsrc/pkgtools/pkg/PLIST:1.5 pkgsrc/pkgtools/pkg/PLIST:1.6
--- pkgsrc/pkgtools/pkg/PLIST:1.5       Thu Oct 27 00:24:58 2016
+++ pkgsrc/pkgtools/pkg/PLIST   Fri Oct 28 19:35:30 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/10/27 00:24:58 khorben Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/10/28 19:35:30 marino Exp $
 include/pkg.h
 lib/libpkg.la
 lib/libpkg_static.la
@@ -52,4 +52,7 @@ share/examples/pkg/periodic/security/460
 share/examples/pkg/periodic/weekly/400.status-pkg
 share/examples/pkg/pkg.conf.sample
 share/zsh/site-functions/_pkg
-@pkgdir etc/periodic
+@pkgdir etc/bash_completion.d
+@pkgdir etc/periodic/daily
+@pkgdir etc/periodic/security
+@pkgdir etc/periodic/weekly