From owner-svn-ports-head@FreeBSD.ORG Sat Nov 9 14:05:31 2013 Return-Path: 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 ESMTP id 232736B1; Sat, 9 Nov 2013 14:05:31 +0000 (UTC) (envelope-from wg@FreeBSD.org) 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 107DB2EF8; Sat, 9 Nov 2013 14:05:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9E5Uqj095900; Sat, 9 Nov 2013 14:05:30 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9E5UAn095899; Sat, 9 Nov 2013 14:05:30 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311091405.rA9E5UAn095899@svn.freebsd.org> From: William Grzybowski Date: Sat, 9 Nov 2013 14:05:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333292 - head/net-mgmt/netdisco 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 14:05:31 -0000 Author: wg Date: Sat Nov 9 14:05:30 2013 New Revision: 333292 URL: http://svnweb.freebsd.org/changeset/ports/333292 Log: net-mgmt/netdisco: make web insterface optional PR: ports/183716 Submitted by: maintainer Modified: head/net-mgmt/netdisco/Makefile Modified: head/net-mgmt/netdisco/Makefile ============================================================================== --- head/net-mgmt/netdisco/Makefile Sat Nov 9 13:45:42 2013 (r333291) +++ head/net-mgmt/netdisco/Makefile Sat Nov 9 14:05:30 2013 (r333292) @@ -10,15 +10,13 @@ MASTER_SITES= SF MAINTAINER= dgeo@centrale-marseille.fr COMMENT= Web-based network management tool for moderate to large networks -OPTIONS_DEFINE= DOCS GRAPHVIZ MIBS -OPTIONS_DEFAULT=DOCS GRAPHVIZ MIBS +OPTIONS_DEFINE= DOCS GRAPHVIZ MIBS WEBUI +OPTIONS_DEFAULT=DOCS GRAPHVIZ MIBS WEBUI MIBS_DESC= Depend on net-mgmt/netdisco-mibs GRAPHVIZ_DESC= Install GraphViz for network map support +WEBUI_DESC= With web interface (mod_perl2+apache22) -RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \ - p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI \ - p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \ - p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ +RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \ p5-SNMP-Info>=3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \ p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason \ p5-DB_File-Lock>=0:${PORTSDIR}/devel/p5-DB_File-Lock \ @@ -26,7 +24,6 @@ RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod p5-Net-NBName>=0:${PORTSDIR}/net/p5-Net-NBName \ p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \ - p5-MasonX-Request-WithApacheSession>=0:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession \ p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager USERS= netdisco @@ -34,7 +31,6 @@ GROUPS= netdisco USES= perl5 USE_PGSQL= yes -USE_APACHE_RUN= 22+ USE_RC_SUBR= netdisco @@ -64,7 +60,7 @@ MIBSDIR= ${PREFIX}/share/netdisco-mibs .if ${PORT_OPTIONS:MMIBS} RUN_DEPENDS+= ${MIBSDIR}/mib_index.txt:${PORTSDIR}/net-mgmt/netdisco-mibs BUILD_DEPENDS+= ${MIBSDIR}/mib_index.txt:${PORTSDIR}/net-mgmt/netdisco-mibs -. include "${.CURDIR}/../netdisco-mibs/bsd.port.netdisco.mk" +. include "${.CURDIR}/../netdisco-mibs/bsd.port.netdisco.mk" MIBINCLUDES!=${ECHO} \"${MIBDIRS:S/^/${MIBSDIR}\//}\" MIBINCLUDES:=${MIBINCLUDES:S/ /:/g:S/"//g} .else @@ -76,6 +72,16 @@ RUN_DEPENDS+= p5-Graph>=0:${PORTSDIR}/ma p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz .endif +.if ${PORT_OPTIONS:MWEBUI} +RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \ + p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI \ + p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \ + p5-MasonX-Request-WithApacheSession>=0:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession +USE_APACHE_RUN= 22 +.else +WWWDIR= "@comment " +.endif + pre-install: . for i in ${ALTER_FILES} @(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE}) @@ -103,18 +109,19 @@ do-install: cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${PREFIX}/bin . endfor - ${MKDIR} ${WWWDIR} - cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${WWWDIR} +. if ${PORT_OPTIONS:MWEBUI} + ${MKDIR} ${WWWDIR} + cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${WWWDIR} - ${MKDIR} ${WWWDIR}/doc - cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${WWWDIR}/doc + ${MKDIR} ${WWWDIR}/doc + cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${WWWDIR}/doc - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - ${MKDIR} ${WWWDIR}/mason + ${MKDIR} ${WWWDIR}/mason +. endif ${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${SITE_PERL} - ${INSTALL} -d -m 750 -o ${USERS} -g ${GROUPS} ${ETCDIR} . for i in ${CONFIG_FILES}