diff options
author | mat <mat@FreeBSD.org> | 2014-12-04 00:10:52 +0800 |
---|---|---|
committer | mat <mat@FreeBSD.org> | 2014-12-04 00:10:52 +0800 |
commit | e1a82f7c2254263006e70d01f9a6afc17353a276 (patch) | |
tree | 5f35693ddee5f546c7a7b8603ec5b6d32969fa64 /net-mgmt | |
parent | aba5d761d1fc65a18fa62abab8ecc9e609e04cc2 (diff) | |
download | freebsd-ports-gnome-e1a82f7c2254263006e70d01f9a6afc17353a276.tar.gz freebsd-ports-gnome-e1a82f7c2254263006e70d01f9a6afc17353a276.tar.zst freebsd-ports-gnome-e1a82f7c2254263006e70d01f9a6afc17353a276.zip |
Pet check-plist.
PR: 195572
Submitted by: ohauer
Sponsored by: Absolight
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/nagios/Makefile | 4 | ||||
-rw-r--r-- | net-mgmt/nagios/files/patch-html__Makefile.in | 14 | ||||
-rw-r--r-- | net-mgmt/nagios/pkg-plist | 1 | ||||
-rw-r--r-- | net-mgmt/nagios4/Makefile | 2 | ||||
-rw-r--r-- | net-mgmt/nagios4/files/patch-html__Makefile.in | 8 | ||||
-rw-r--r-- | net-mgmt/nagios4/pkg-plist | 1 |
6 files changed, 16 insertions, 14 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 268078ccbd34..68e0e66ef0d0 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -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 diff --git a/net-mgmt/nagios/files/patch-html__Makefile.in b/net-mgmt/nagios/files/patch-html__Makefile.in index c52e2a4c2379..53ef4d83bf6e 100644 --- a/net-mgmt/nagios/files/patch-html__Makefile.in +++ b/net-mgmt/nagios/files/patch-html__Makefile.in @@ -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 diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index 03d87a25ac36..cc15d8d5166d 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -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 diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile index 3ba85cecb714..f43b8a394e13 100644 --- a/net-mgmt/nagios4/Makefile +++ b/net-mgmt/nagios4/Makefile @@ -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 diff --git a/net-mgmt/nagios4/files/patch-html__Makefile.in b/net-mgmt/nagios4/files/patch-html__Makefile.in index afc9dcdc78f7..ea99a6df842e 100644 --- a/net-mgmt/nagios4/files/patch-html__Makefile.in +++ b/net-mgmt/nagios4/files/patch-html__Makefile.in @@ -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 diff --git a/net-mgmt/nagios4/pkg-plist b/net-mgmt/nagios4/pkg-plist index b3710e5cac12..0dd610be32dc 100644 --- a/net-mgmt/nagios4/pkg-plist +++ b/net-mgmt/nagios4/pkg-plist @@ -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 |