Date: Fri, 27 Dec 2013 14:23:06 +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: r337732 - in head/net-mgmt/nagios: . files Message-ID: <201312271423.rBREN6WE067270@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Dec 27 14:23:06 2013 New Revision: 337732 URL: http://svnweb.freebsd.org/changeset/ports/337732 Log: - Actually make nagios work with staging - Make the index.php patch respect the possible corewindow parameter Modified: head/net-mgmt/nagios/Makefile head/net-mgmt/nagios/files/patch-html-index.php Modified: head/net-mgmt/nagios/Makefile ============================================================================== --- head/net-mgmt/nagios/Makefile Fri Dec 27 14:05:59 2013 (r337731) +++ head/net-mgmt/nagios/Makefile Fri Dec 27 14:23:06 2013 (r337732) @@ -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 Modified: head/net-mgmt/nagios/files/patch-html-index.php ============================================================================== --- head/net-mgmt/nagios/files/patch-html-index.php Fri Dec 27 14:05:59 2013 (r337731) +++ head/net-mgmt/nagios/files/patch-html-index.php Fri Dec 27 14:23:06 2013 (r337732) @@ -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...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312271423.rBREN6WE067270>