Date: Wed, 3 Dec 2014 16:10:52 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373840 - in head/net-mgmt: nagios nagios/files nagios4 nagios4/files Message-ID: <201412031610.sB3GAqQr071099@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Dec 3 16:10:52 2014 New Revision: 373840 URL: https://svnweb.freebsd.org/changeset/ports/373840 QAT: https://qat.redports.org/buildarchive/r373840/ Log: Pet check-plist. PR: 195572 Submitted by: ohauer Sponsored by: Absolight Modified: head/net-mgmt/nagios/Makefile head/net-mgmt/nagios/files/patch-html__Makefile.in head/net-mgmt/nagios/pkg-plist head/net-mgmt/nagios4/Makefile head/net-mgmt/nagios4/files/patch-html__Makefile.in head/net-mgmt/nagios4/pkg-plist Modified: head/net-mgmt/nagios/Makefile ============================================================================== --- head/net-mgmt/nagios/Makefile Wed Dec 3 15:31:21 2014 (r373839) +++ head/net-mgmt/nagios/Makefile Wed Dec 3 16:10:52 2014 (r373840) @@ -52,14 +52,14 @@ PLIST_SUB= NAGIOSDIR=${NAGIOSDIR} \ NAGIOSWWWDIR=${NAGIOSWWWDIR} \ NAGIOSUSER=${NAGIOSUSER} \ NAGIOSGROUP=${NAGIOSGROUP} \ - NAGIOSHTMURL=${NAGIOSHTMURL} \ - NAGIOSCGIURL=${NAGIOSCGIURL} \ WWWGRP=${WWWGRP} SUB_FILES= pkg-message # XXX: Don't remove PREFIX from SUB_LIST here. SUB_LIST= PREFIX=${PREFIX} \ + NAGIOSHTMURL=${NAGIOSHTMURL} \ + NAGIOSCGIURL=${NAGIOSCGIURL} \ ${PLIST_SUB} NAGIOSUSER?= nagios Modified: head/net-mgmt/nagios/files/patch-html__Makefile.in ============================================================================== --- head/net-mgmt/nagios/files/patch-html__Makefile.in Wed Dec 3 15:31:21 2014 (r373839) +++ head/net-mgmt/nagios/files/patch-html__Makefile.in Wed Dec 3 16:10:52 2014 (r373840) @@ -1,6 +1,6 @@ ---- ./html/Makefile.in.orig 2013-08-30 19:46:14.000000000 +0200 -+++ ./html/Makefile.in 2014-01-14 13:57:06.000000000 +0100 -@@ -10,8 +10,6 @@ +--- html/Makefile.in.orig 2013-08-30 17:46:14 UTC ++++ html/Makefile.in +@@ -10,8 +10,6 @@ BINDIR=@bindir@ CGIDIR=@sbindir@ HTMLDIR=@datadir@ INSTALL=@INSTALL@ @@ -9,7 +9,7 @@ CP=@CP@ -@@ -34,55 +32,55 @@ +@@ -34,55 +32,55 @@ distclean: clean devclean: distclean install: @@ -29,11 +29,11 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media ++# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images ++# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs ++# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos Modified: head/net-mgmt/nagios/pkg-plist ============================================================================== --- head/net-mgmt/nagios/pkg-plist Wed Dec 3 15:31:21 2014 (r373839) +++ head/net-mgmt/nagios/pkg-plist Wed Dec 3 16:10:52 2014 (r373840) @@ -373,6 +373,7 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/stylesheets/summary.css %%NAGIOSWWWDIR%%/stylesheets/tac.css %%NAGIOSWWWDIR%%/stylesheets/trends.css +@dir libexec/nagios @dir %%NAGIOSWWWDIR%%/ssi @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/checkresults Modified: head/net-mgmt/nagios4/Makefile ============================================================================== --- head/net-mgmt/nagios4/Makefile Wed Dec 3 15:31:21 2014 (r373839) +++ head/net-mgmt/nagios4/Makefile Wed Dec 3 16:10:52 2014 (r373840) @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 4.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 Modified: head/net-mgmt/nagios4/files/patch-html__Makefile.in ============================================================================== --- head/net-mgmt/nagios4/files/patch-html__Makefile.in Wed Dec 3 15:31:21 2014 (r373839) +++ head/net-mgmt/nagios4/files/patch-html__Makefile.in Wed Dec 3 16:10:52 2014 (r373840) @@ -1,6 +1,6 @@ --- html/Makefile.in.orig 2014-08-12 15:00:01 UTC +++ html/Makefile.in -@@ -35,58 +35,58 @@ +@@ -35,58 +35,58 @@ distclean: clean devclean: distclean install: @@ -20,11 +20,11 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media ++# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs -+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images ++# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs ++# $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Wed Dec 3 15:31:21 2014 (r373839) +++ head/net-mgmt/nagios4/pkg-plist Wed Dec 3 16:10:52 2014 (r373840) @@ -381,6 +381,7 @@ bin/nagiostats %%NAGIOSWWWDIR%%/stylesheets/summary.css %%NAGIOSWWWDIR%%/stylesheets/tac.css %%NAGIOSWWWDIR%%/stylesheets/trends.css +@dir libexec/nagios @dir %%NAGIOSWWWDIR%%/ssi @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412031610.sB3GAqQr071099>