From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 30 14:20:09 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 46009245;
 Mon, 30 Dec 2013 14:20:09 +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 320F41FAA;
 Mon, 30 Dec 2013 14:20:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBUEK9Gk058325;
 Mon, 30 Dec 2013 14:20:09 GMT (envelope-from lme@svn.freebsd.org)
Received: (from lme@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBUEK9cT058324;
 Mon, 30 Dec 2013 14:20:09 GMT (envelope-from lme@svn.freebsd.org)
Message-Id: <201312301420.rBUEK9cT058324@svn.freebsd.org>
From: Lars Engels <lme@FreeBSD.org>
Date: Mon, 30 Dec 2013 14:20:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338116 - head/net-mgmt/icinga
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: Mon, 30 Dec 2013 14:20:09 -0000

Author: lme
Date: Mon Dec 30 14:20:08 2013
New Revision: 338116
URL: http://svnweb.freebsd.org/changeset/ports/338116

Log:
  - Resurrect ICINGAHTMURL and ICINGACGIURL so you can override the defaults
  - Bump PORTREVISION
  
  Noticed by:	Markus Mann

Modified:
  head/net-mgmt/icinga/Makefile

Modified: head/net-mgmt/icinga/Makefile
==============================================================================
--- head/net-mgmt/icinga/Makefile	Mon Dec 30 13:58:27 2013	(r338115)
+++ head/net-mgmt/icinga/Makefile	Mon Dec 30 14:20:08 2013	(r338116)
@@ -3,6 +3,7 @@
 
 PORTNAME=	icinga
 PORTVERSION=	1.10.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
@@ -28,6 +29,8 @@ ICINGADIR?=	/var/spool/icinga
 ICINGALOGDIR?=	/var/log/icinga
 
 ICINGAWWWDIR?=	www/icinga
+ICINGAHTMURL?=	/icinga
+ICINGACGIURL?=	${ICINGAHTMURL}/cgi-bin
 
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 CFLAGS+=	${CPPFLAGS}
@@ -36,6 +39,8 @@ CONFIGURE_ARGS=	--with-command-user=${IC
 		--with-command-group=${WWWGRP} \
 		--with-icinga-user=${ICINGAUSER} \
 		--with-icinga-group=${ICINGAGROUP} \
+		--with-htmurl=${ICINGAHTMURL} \
+		--with-cgiurl=${ICINGACGIURL} \
 		--sbindir=${PREFIX}/${ICINGAWWWDIR}/cgi-bin \
 		--datarootdir=${PREFIX}/${ICINGAWWWDIR} \
 		--datadir=${PREFIX}/${ICINGAWWWDIR} \
@@ -59,6 +64,7 @@ PLIST_SUB=	ICINGADIR=${ICINGADIR} \
 		ICINGAWWWDIR=${ICINGAWWWDIR} \
 		ICINGAUSER=${ICINGAUSER} \
 		ICINGAGROUP=${ICINGAGROUP} \
+		ICINGAHTMURL=${ICINGAHTMURL} \
 		ICINGACGIURL=${ICINGACGIURL} \
 		WWWGRP=${WWWGRP}