CVS commit: pkgsrc/net/nagios-base

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Mon Aug  7 09:09:29 UTC 2017

Modified Files:
        pkgsrc/net/nagios-base: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/net/nagios-base/Makefile

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

Modified files:

Index: pkgsrc/net/nagios-base/Makefile
diff -u pkgsrc/net/nagios-base/Makefile:1.70 pkgsrc/net/nagios-base/Makefile:1.71
--- pkgsrc/net/nagios-base/Makefile:1.70        Thu Jul  6 09:24:30 2017
+++ pkgsrc/net/nagios-base/Makefile     Mon Aug  7 09:09:28 2017
@@ -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/
 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 ${
 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"