diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2013-12-27 14:23:06 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2013-12-27 14:23:06 +0000 |
| commit | 8ba3edb0eef994240051ba25a7dedb90291ea481 (patch) | |
| tree | 46ad2dfa570eaeecdaef9f7ae1d9eeafd10a0484 /net-mgmt | |
| parent | - Fix build with clang (diff) | |
- Actually make nagios work with staging
- Make the index.php patch respect the possible corewindow parameter
Notes
Notes:
svn path=/head/; revision=337732
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/nagios/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/nagios/files/patch-html-index.php | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 344d0a5c20c0..910169787fde 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 3.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION} @@ -98,7 +98,7 @@ post-extract: .include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in` + @${REINPLACE_CMD} -e '/^INSTALL_OPTS=/d;/^COMMAND_OPTS=/d' `${FIND} ${WRKSRC} -name Makefile.in` .if ${PORT_OPTIONS:MUNHANDLED_HACK} @${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \ -e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php diff --git a/net-mgmt/nagios/files/patch-html-index.php b/net-mgmt/nagios/files/patch-html-index.php index 5ebff50d5498..9aabcad3923b 100644 --- a/net-mgmt/nagios/files/patch-html-index.php +++ b/net-mgmt/nagios/files/patch-html-index.php @@ -6,14 +6,8 @@ <?php +include_once(dirname(__FILE__).'/includes/utils.inc.php'); // allow specifying main window URL for permalinks, etc. - $corewindow="main.php"; +-$corewindow="main.php"; ++$corewindow=$cfg["cgi_base_url"]."/tac.cgi"; if(isset($_GET['corewindow'])){ -@@ -43,7 +44,7 @@ - - <frameset cols="180,*" style="border: 0px; framespacing: 0px"> - <frame src="side.php" name="side" frameborder="0" style=""> --<frame src="<?php echo $corewindow;?>" name="main" frameborder="0" style=""> -+<frame src="<?php echo $cfg["cgi_base_url"];?>/tac.cgi" name="main" frameborder="0"> - - <noframes> - <!-- This page requires a web browser which supports frames. --> + + // default window url may have been overridden with a permalink... |