kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pkgtools/pkg: fix installation of conf files

Browse source 
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.
This commit is contained in:
marino 2016-10-28 19:35:30 +00:00
parent 37972b4963
commit 3d7455043c
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgtools/pkg/Makefile
View file

@ -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"

7
pkgtools/pkg/PLIST
View file

@ -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