diff options
| author | marino <marino@pkgsrc.org> | 2016-10-28 19:35:30 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2016-10-28 19:35:30 +0000 |
| commit | 53389445dc359ee8bbf30288f97f8c68e37aada8 (patch) | |
| tree | ceb0300ec3c12f62cbe595e36958c1d931b0abb4 /pkgtools | |
| parent | fe1e549fe644e1bfaace9d6dbd0420acd17a22b9 (diff) | |
| download | pkgsrc-53389445dc359ee8bbf30288f97f8c68e37aada8.tar.gz | |
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.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg/Makefile | 27 | ||||
| -rw-r--r-- | pkgtools/pkg/PLIST | 7 |
2 files changed, 13 insertions, 21 deletions
diff --git a/pkgtools/pkg/Makefile b/pkgtools/pkg/Makefile index 869e58390c9..9fe1a306f68 100644 --- a/pkgtools/pkg/Makefile +++ b/pkgtools/pkg/Makefile @@ -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" diff --git a/pkgtools/pkg/PLIST b/pkgtools/pkg/PLIST index 202cde62557..bb9ea70860a 100644 --- a/pkgtools/pkg/PLIST +++ b/pkgtools/pkg/PLIST @@ -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.pkg-checksum 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 |