From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 27 14:23:07 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2BE3D2BD;
 Fri, 27 Dec 2013 14:23:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F1A991333;
 Fri, 27 Dec 2013 14:23:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBREN6Gk067272;
 Fri, 27 Dec 2013 14:23:06 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBREN6WE067270;
 Fri, 27 Dec 2013 14:23:06 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201312271423.rBREN6WE067270@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 27 Dec 2013 14:23:06 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 14:23:07 -0000

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...