From root@ec-m.fr  Wed Nov  6 13:57:42 2013
Return-Path: <root@ec-m.fr>
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 B8429362
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Nov 2013 13:57:42 +0000 (UTC)
	(envelope-from root@ec-m.fr)
Received: from melo.ec-m.fr (melo.ec-m.fr [147.94.19.139])
	by mx1.freebsd.org (Postfix) with ESMTP id A132C215B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Nov 2013 13:57:41 +0000 (UTC)
Received: from amavis3.serv.int (amavis3.serv.int [10.3.0.47])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 0865BACB58
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Nov 2013 14:57:34 +0100 (CET)
Received: from melo.ec-m.fr ([10.3.0.13])
	by amavis3.serv.int (amavis3.serv.int [10.3.0.47]) (amavisd-new, port 10024)
	with LMTP id Wi2ihik4J-UF for <FreeBSD-gnats-submit@freebsd.org>;
	Wed,  6 Nov 2013 14:57:32 +0100 (CET)
Received: from dgeo.sysadm.ec-m.fr (dgeo.sysadm.ec-m.fr [147.94.19.169])
	by melo.ec-m.fr (GrosseBox 1743 XXL) with ESMTP id 49CE3ACB4C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Nov 2013 14:57:32 +0100 (CET)
Received: by dgeo.sysadm.ec-m.fr (Postfix, from userid 0)
	id C84611CDAF; Mon,  4 Nov 2013 17:20:15 +0100 (CET)
Message-Id: <20131104162015.C84611CDAF@dgeo.sysadm.ec-m.fr>
Date: Mon,  4 Nov 2013 17:20:15 +0100 (CET)
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] net-mgmt/netdisco: make web insterface optional
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183716
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/netdisco: make web insterface optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 06 14:00:00 UTC 2013
>Closed-Date:    Sat Nov 09 14:05:36 UTC 2013
>Last-Modified:  Sat Nov  9 14:10:00 UTC 2013
>Originator:     Geoffroy Desvernay
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 9.2-RELEASE FreeBSD 9.2-RELEASE #0: Thu Oct 24 18:38:54 CEST 2013
>Description:
 Added an option WEBUI to make web interface and dependencies to apache/mod_perl2 optional

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- netdisco-1.3.2_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 332738)
+++ Makefile	(working copy)
@@ -10,15 +10,13 @@
 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 @@
 		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 @@
 
 USES=		perl5
 USE_PGSQL=	yes
-USE_APACHE_RUN=	22+
 
 USE_RC_SUBR=	netdisco
 
@@ -76,6 +72,16 @@
 		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,15 +109,17 @@
 		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}
 
--- netdisco-1.3.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sat Nov 9 03:35:05 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183716 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat Nov 9 14:05:34 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183716 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183716: commit references a PR
Date: Sat,  9 Nov 2013 14:05:43 +0000 (UTC)

 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}
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
