diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2019-01-21 15:44:20 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2019-01-21 15:44:20 +0000 |
| commit | 2194be0e1a283f22dfee3b0cdc3fd3615c0bf0ef (patch) | |
| tree | 393dba844dd1e6a49d0098226fa574d169921dd7 | |
| parent | Update to latest commit. (diff) | |
Update to 4.4.3.
While there, stop using the deprecated @unexec.
Add missing php module dependency. [1]
PR: 233530 [1]
Submitted by: dinoex [1]
| -rw-r--r-- | net-mgmt/nagios4/Makefile | 8 | ||||
| -rw-r--r-- | net-mgmt/nagios4/distinfo | 6 | ||||
| -rw-r--r-- | net-mgmt/nagios4/files/patch-html_main.php | 6 | ||||
| -rw-r--r-- | net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in | 4 | ||||
| -rw-r--r-- | net-mgmt/nagios4/pkg-plist | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile index 4c9cc906e619..9a470706b2cb 100644 --- a/net-mgmt/nagios4/Makefile +++ b/net-mgmt/nagios4/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.4.2 +PORTVERSION= 4.4.3 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/ \ @@ -18,9 +18,9 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ libpng.so:graphics/png \ libgd.so:graphics/gd -USES= cpe gmake jpeg perl5 +USES= cpe gmake jpeg perl5 php USE_PERL5= build -USE_PHP= xml +USE_PHP= xml filter USE_RC_SUBR= nagios CONFLICTS= nagios-[123].* nagios-devel-* @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-htmurl=${NAGIOSHTMURL} \ --with-cgiurl=${NAGIOSCGIURL} \ --with-lockfile=${NAGIOSDIR}/nagios.lock \ - --sbindir=${WWWDIR}/cgi-bin \ + --with-cgibindir=${WWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${WWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo index 5cb1d8925ee8..7e54a99c33c1 100644 --- a/net-mgmt/nagios4/distinfo +++ b/net-mgmt/nagios4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535968827 -SHA256 (nagios-4.4.2.tar.gz) = 3418923f326aa86dc8c84cfd0df788fa495a90d772f8071acf40fdbef0736853 -SIZE (nagios-4.4.2.tar.gz) = 11301454 +TIMESTAMP = 1548080769 +SHA256 (nagios-4.4.3.tar.gz) = bba8f0e8dc8cf72f7a7ae4e8ce9c60f5bd315629421b9ec34818a28b8da49f67 +SIZE (nagios-4.4.3.tar.gz) = 11302228 diff --git a/net-mgmt/nagios4/files/patch-html_main.php b/net-mgmt/nagios4/files/patch-html_main.php index 15413286844d..33052a32043a 100644 --- a/net-mgmt/nagios4/files/patch-html_main.php +++ b/net-mgmt/nagios4/files/patch-html_main.php @@ -1,9 +1,9 @@ ---- html/main.php.orig 2018-06-25 21:25:22 UTC +--- html/main.php.orig 2019-01-15 14:58:00 UTC +++ html/main.php -@@ -146,31 +146,6 @@ $this_year = '2018'; +@@ -146,31 +146,6 @@ $this_year = '2019'; <div class="product">Nagios<sup><span style="font-size: small;">®</span></sup> Core<sup><span style="font-size: small;">™</span></sup></div> <div class="version">Version <?php echo $this_version; ?></div> - <div class="releasedate">August 16, 2018</div> + <div class="releasedate">January 15, 2019</div> - <div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&product=nagioscore" target="_blank">Check for updates</a></div> -</div> - diff --git a/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in b/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in index 368a8cf19d40..04ef4a55619c 100644 --- a/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in +++ b/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in @@ -1,6 +1,6 @@ ---- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01 UTC +--- sample-config/nagios.cfg.in.orig 2019-01-15 14:58:00 UTC +++ sample-config/nagios.cfg.in -@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c +@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.cfg cfg_file=@sysconfdir@/objects/timeperiods.cfg cfg_file=@sysconfdir@/objects/templates.cfg diff --git a/net-mgmt/nagios4/pkg-plist b/net-mgmt/nagios4/pkg-plist index f877836ed467..ff5f39231f62 100644 --- a/net-mgmt/nagios4/pkg-plist +++ b/net-mgmt/nagios4/pkg-plist @@ -426,5 +426,5 @@ @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%% -@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi -@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi +@preunexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi +@preunexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi |