diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-07 09:09:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-07 09:09:28 +0000 |
| commit | c2a0498d864dcd937db4583324f9b0f23e2bc249 (patch) | |
| tree | ef1ece7c61464ff81bbd1d7971a64c6022657116 /net/nagios-base | |
| parent | 0bdf73a8851fd9b6505bd98579eebe20d2cd7c2b (diff) | |
| download | pkgsrc-c2a0498d864dcd937db4583324f9b0f23e2bc249.tar.gz | |
Fix the mk/pkginstall variables used in net/nagios-base.
* Ensure that ${PKG_SYSCONFDIR}/objects is created at package
installation time by adding it to OWN_DIRS.
* Don't explicitly add ${DESTDIR} to files listed in SPECIAL_PERMS
since it is automatically added by the pkgsrc infrastructure if
needed.
* It's "${DESTDIR}${PREFIX}", not "${DESTDIR}/${PREFIX}" -- avoid
having double slashes in pathnames for correctness.
Bump the PKGREVISION due to fixes in the package install scripts.
-------------------------------------------------------------------
Diffstat (limited to 'net/nagios-base')
| -rw-r--r-- | net/nagios-base/Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile index b1122b04083..e56cbb30924 100644 --- a/net/nagios-base/Makefile +++ b/net/nagios-base/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.70 2017/07/06 09:24:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.71 2017/08/07 09:09:28 jlam Exp $ # DISTNAME= nagios-4.3.2 PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 1 -#PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net sysutils DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} @@ -67,8 +66,7 @@ EGFILES+= objects/contacts.cfg objects/timeperiods.cfg EGFILES+= objects/localhost.cfg objects/windows.cfg EGFILES+= objects/printer.cfg objects/switch.cfg -INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/objects - +OWN_DIRS= ${PKG_SYSCONFDIR}/objects .for files in ${EGFILES} CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files} .endfor @@ -79,8 +77,8 @@ OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 -SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644 -SPECIAL_PERMS+= ${DESTDIR}/${PREFIX}/share/nagios/rss-newsfeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644 +SPECIAL_PERMS+= share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644 +SPECIAL_PERMS+= share/nagios/rss-newsfeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644 SUBST_CLASSES+= files SUBST_STAGE.files= post-build @@ -92,15 +90,15 @@ pre-build: ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist post-install: - ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${DESTDIR}/${EGDIR}/nagios.conf + ${INSTALL_DATA} ${WRKSRC}/nagios.conf.dist ${DESTDIR}${EGDIR}/nagios.conf ${INSTALL_DATA} ${WRKDIR}/netbsd40.gd2 \ - ${DESTDIR}/${PREFIX}/share/nagios/images/logos/ + ${DESTDIR}${PREFIX}/share/nagios/images/logos/ ${INSTALL_DATA} ${WRKDIR}/netbsd40.gif \ - ${DESTDIR}/${PREFIX}/share/nagios/images/logos/ + ${DESTDIR}${PREFIX}/share/nagios/images/logos/ ${INSTALL_DATA} ${WRKDIR}/netbsd40.jpg \ - ${DESTDIR}/${PREFIX}/share/nagios/images/logos/ + ${DESTDIR}${PREFIX}/share/nagios/images/logos/ ${INSTALL_DATA} ${WRKDIR}/netbsd40.png \ - ${DESTDIR}/${PREFIX}/share/nagios/images/logos/ + ${DESTDIR}${PREFIX}/share/nagios/images/logos/ ${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/jsonquery.html .include "../../mk/dlopen.buildlink3.mk" |