Unbreak on Apache24 and overhaul net-mgmt/netdisco

PR:		193284
Submitted by:	maintainer: dgeo (centrale-marseille.fr)
Overhaul:	marino

There were numerous issues still existing even after provided patch
was applied.  I ended up completely overhauling the port.  It's been
tested with poudriere testport.

2 files changed, 142 insertions, 168 deletions

diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index 25b168199848..b609d74beec3 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -3,17 +3,14 @@
 
 PORTNAME=	netdisco
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF
 
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Web-based network management tool for moderate to large networks
 
-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)
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 		p5-SNMP-Info>=3.01:${PORTSDIR}/net-mgmt/p5-SNMP-Info \
@@ -25,32 +22,50 @@ RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
 
-USES=		perl5 shebangfix
-USE_PERL5=	run build fixpacklist
-USE_PGSQL=	yes
+OPTIONS_DEFINE=	DOCS GRAPHVIZ MIBS WEBUI
+OPTIONS_DEFAULT=DOCS GRAPHVIZ MIBS WEBUI
+OPTIONS_SUB=	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)
+
+GRAPHVIZ_RUN_DEPENDS+=	p5-Graph>=0:${PORTSDIR}/math/p5-Graph	\
+			p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+WEBUI_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
+WEBUI_USE=		APACHE_RUN=22+
+
+USES=		perl5 pgsql shebangfix
+SHEBANG_FILES=	bin/parse_kismet_ap netdisco
+USE_PERL5=	run build
 
 USE_RC_SUBR=	netdisco
 
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 NETDISCO_USER=	netdisco
 NETDISCO_GROUP=	netdisco
 NETDISCO_RUNDIR=/var/run
 NETDISCO_DBDIR=	/var/db/netdisco
 
-SUB_FILES=	pkg-message
-#SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${NETDISCO_USER} NETDISCO_GROUP=${NETDISCO_GROUP}
-PLIST_SUB=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${NETDISCO_USER}
-SHEBANG_FILES=	bin/parse_kismet_ap netdisco
+USERS=		${NETDISCO_USER}
+GROUPS=		${NETDISCO_GROUP}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+SUB_FILES=	pkg-message
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
+		NETDISCO_USER=${NETDISCO_USER} \
+		NETDISCO_GROUP=${NETDISCO_GROUP}
+SUB_LIST=	NETDISCO_USER=${NETDISCO_USER} \
+		NETDISCO_GROUP=${NETDISCO_GROUP} \
+		NETDISCO_DBDIR=${NETDISCO_DBDIR}
 
 ALTER_FILES=	netdisco netdisco.conf netdisco_apache.conf \
 		netdisco_apache_dir.conf netdisco.crontab sql/pg
-
 CONFIG_FILES=	netdisco.conf netdisco.crontab netdisco-topology.txt \
 		netdisco_apache.conf netdisco_apache_dir.conf
-
 DOCFILES=	ChangeLog doc/*.pod INSTALL README* UPGRADE
 
 .include <bsd.port.options.mk>
@@ -66,97 +81,54 @@ MIBINCLUDES:=${MIBINCLUDES:S/ /:/g:S/"//g}
 MIBINCLUDES="#please add here mibs dirs list (at least snmp and rfc ones)"
 .endif
 
-REINPLACE_EXPR=	-e 's!%%PREFIX%%!${PREFIX}!g' -e 's!%%DATADIR%%!${DATADIR}!g' \
-	-e 's!%%DOCSDIR%%!${DOCSDIR}!g' -e 's!%%NETDISCO_RUNDIR%%!${NETDISCO_RUNDIR}!g' \
-	-e 's!%%NETDISCO_USER%%!${NETDISCO_USER}!g' -e 's!%%NETDISCO_GROUP%%!${NETDISCO_GROUP}!g' \
-	-e 's!%%NETDISCO_DBDIR%%!${NETDISCO_DBDIR}!g' -e 's!%%ETCDIR%%!${ETCDIR}!g' \
-	-e 's!%%SITE_PERL%%!${SITE_PERL}!g' -e 's!%%MIBINCLUDES%%!${MIBINCLUDES}!g'
-
-.if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	p5-Graph>=0:${PORTSDIR}/math/p5-Graph	\
-		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
-REINPLACE_EXPR+=	-e 's!%%APACHEMODDIR%%!${APACHEMODDIR}!g' -e 's!%%APACHEETCDIR%%!${APACHEETCDIR}!g' \
-		-e 's!%%WWWDIR%%!${WWWDIR}!g' 
-PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} WEBUI=""
-.else
-PLIST_SUB+=     WWWOWN="@comment " \
-		WWWGRP="@comment " \
-		WWWDIR="@comment " \
-		WEBUI="@comment "
-.endif
-
-USERS+=		${NETDISCO_USER}
-GROUPS+=		${NETDISCO_GROUP}
-
-pre-install:
-.	for i in ${ALTER_FILES}
-		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
-.	endfor
-
-	cd ${WRKSRC} && \
-	${REINPLACE_CMD} ${REINPLACE_EXPR} ${ALTER_FILES}
+post-patch:
+	@(cd ${WRKSRC} && ${REINPLACE_CMD} \
+		-e 's#%%WWWDIR%%#${WWWDIR}#g'		\
+		-e 's#%%PREFIX%%#${PREFIX}#g'		\
+		-e 's#%%DATADIR%%#${DATADIR}#g'		\
+		-e 's#%%DOCSDIR%%#${DOCSDIR}#g'		\
+		-e 's#%%NETDISCO_RUNDIR%%#${NETDISCO_RUNDIR}#g'	\
+		-e 's#%%NETDISCO_USER%%#${USERS}#g'		\
+		-e 's#%%NETDISCO_GROUP%%#${GROUPS}#g'		\
+		-e 's#%%NETDISCO_DBDIR%%#${NETDISCO_DBDIR}#g'	\
+		-e 's#%%ETCDIR%%#${ETCDIR}#g'		\
+		-e 's#%%SITE_PERL%%#${SITE_PERL}#g'	\
+		-e 's#%%APACHEMODDIR%%#${APACHEMODDIR}#g'	\
+		-e 's#%%APACHEETCDIR%%#${APACHEETCDIR}#g'	\
+		-e 's#%%MIBINCLUDES%%#${MIBINCLUDES}#g'	\
+		${ALTER_FILES})
 
 do-install:
-.	for i in netdisco bin/parse_mac bin/port_control bin/parse_kismet_ap
-		cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${STAGEDIR}${PREFIX}/bin
-.	endfor
-
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} \
+		${STAGEDIR}${DATADIR}/sql \
+		${STAGEDIR}${DOCSDIR} \
+		${STAGEDIR}${ETCDIR}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} netdisco bin/parse_mac \
+		bin/port_control bin/parse_kismet_ap ${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_DATA} ${WRKSRC}/netdisco.pm \
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 .	if ${PORT_OPTIONS:MWEBUI}
-		${MKDIR} ${STAGEDIR}${WWWDIR}
-		cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${STAGEDIR}${WWWDIR}
-
-		${MKDIR} ${STAGEDIR}${WWWDIR}/doc
-		cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${STAGEDIR}${WWWDIR}/doc
+		@${MKDIR} ${STAGEDIR}${WWWDIR}/mason
+		(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+		(cd ${STAGEDIR}${WWWDIR} && ${RM} -r doc/autohandler svg)
 .	endif
-
-	${MKDIR} -m 755 -p ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
-
-	${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
-	${INSTALL} -d -m 750 ${STAGEDIR}${ETCDIR}
-
-	${INSTALL} -d ${STAGEDIR}${DATADIR}/sql
-
-	cd ${WRKSRC}/sql && \
-	   ${INSTALL_DATA} *.sql pg ${STAGEDIR}${DATADIR}/sql
-
-	${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${DATADIR}
-
 .	for i in ${CONFIG_FILES}
-		${INSTALL} -m 640 ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
+	    ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
 .	endfor
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/sql && \
+		${INSTALL_DATA} *.sql pg ${STAGEDIR}${DATADIR}/sql)
+	${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${INSTALL_MAN} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
-.	if ${PORT_OPTIONS:MWEBUI}
-		${ECHO_CMD} "@unexec ${RM} -rf ${WWWDIR}/mason" >> ${TMPPLIST}
-		${ECHO_CMD} "@exec ${MKDIR} -m 750 ${WWWDIR}/mason" >> ${TMPPLIST}
-		${ECHO_CMD} "@exec ${CHOWN} -R ${WWWOWN} ${WWWDIR}/mason" >> ${TMPPLIST}
-		${ECHO_CMD} "@exec ${CHOWN} ${NETDISCO_USER} ${WWWDIR}" >> ${TMPPLIST}
-.	endif
-	${ECHO_CMD} "@exec ${CHOWN} -R ${NETDISCO_USER}:${NETDISCO_GROUP} ${ETCDIR}"
-.	if !defined(PACKAGE_BUILDING)
-		@(if [ -d ${PREFIX}/${APACHEETCDIR}/Includes ] ; then							\
-			${ECHO_MSG} "===> Adding config in ${PREFIX}/${APACHEETCDIR}/Includes...";					\
-			test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf || \
-				${LN} -s ${ETCDIR}/netdisco_apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf; \
-			test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf || \
-				${LN} -s ${ETCDIR}/netdisco_apache_dir.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf;\
-		fi)
-.	endif
-.	for i in ${CONFIG_FILES}
-		cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${ETCDIR}/${i}.sample
-		@(if [ ! -f ${STAGEDIR}${ETCDIR}/${i} ]; then	\
-			${INSTALL} -m 640 ${STAGEDIR}${ETCDIR}/${i}.sample ${STAGEDIR}${ETCDIR}/${i};	\
-		fi)
-.	endfor
+
+#	This violates STAGEDIR, comment out the entire block
+#.	if !defined(PACKAGE_BUILDING)
+#		@(if [ -d ${PREFIX}/${APACHEETCDIR}/Includes ] ; then \
+#			${ECHO_MSG} "===> Adding config in ${PREFIX}/${APACHEETCDIR}/Includes..."; \
+#			test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf || \
+#				${LN} -s ${ETCDIR}/netdisco_apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf; \
+#			test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf || \
+#				${LN} -s ${ETCDIR}/netdisco_apache_dir.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf; \
+#		fi)
+#.	endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netdisco/pkg-plist b/net-mgmt/netdisco/pkg-plist
index 5cbb6250bfa8..226341d7d744 100644
--- a/net-mgmt/netdisco/pkg-plist
+++ b/net-mgmt/netdisco/pkg-plist
@@ -39,68 +39,73 @@ bin/port_control
 %%DATADIR%%/sql/user_log.sql
 %%DATADIR%%/sql/users.sql
 %%DATADIR%%/Makefile
-%%WWWDIR%%/admin.html
-%%WWWDIR%%/admin_chimp.gif
-%%WWWDIR%%/admin_dev.html
-%%WWWDIR%%/admin_plug.gif
-%%WWWDIR%%/admin_reconfig.html
-%%WWWDIR%%/admin_user.html
-%%WWWDIR%%/apache_login.html
-%%WWWDIR%%/autohandler
-%%WWWDIR%%/bullet.gif
-%%WWWDIR%%/change_pw.html
-%%WWWDIR%%/corner-bl.png
-%%WWWDIR%%/corner-br.png
-%%WWWDIR%%/corner-tl.png
-%%WWWDIR%%/corner-tr.png
-%%WWWDIR%%/device.html
-%%WWWDIR%%/device_inv.html
-%%WWWDIR%%/device_module.html
-%%WWWDIR%%/device_module_search.html
-%%WWWDIR%%/device_search.html
-%%WWWDIR%%/discoball2.gif
-%%WWWDIR%%/doc/index.html
-%%WWWDIR%%/doc/netdisco-api-backend.html
-%%WWWDIR%%/doc/netdisco-api-shared.html
-%%WWWDIR%%/duplex.html
-%%WWWDIR%%/frontpanel.html
-%%WWWDIR%%/icon_down.gif
-%%WWWDIR%%/icon_info.gif
-%%WWWDIR%%/icon_lock.gif
-%%WWWDIR%%/icon_note.gif
-%%WWWDIR%%/icon_up.gif
-%%WWWDIR%%/icon_v.gif
-%%WWWDIR%%/index.html
-%%WWWDIR%%/ip_search.html
-%%WWWDIR%%/jack_search.html
-%%WWWDIR%%/log.html
-%%WWWDIR%%/login.html
-%%WWWDIR%%/logout.html
-%%WWWDIR%%/minus.gif
-%%WWWDIR%%/mktree.css
-%%WWWDIR%%/mktree.js
-%%WWWDIR%%/netdisco.css
-%%WWWDIR%%/netdisco.ico
-%%WWWDIR%%/netdiscoball.gif
-%%WWWDIR%%/netmap.html
-%%WWWDIR%%/node.html
-%%WWWDIR%%/plus.gif
-%%WWWDIR%%/port_info.html
-%%WWWDIR%%/port_report.html
-%%WWWDIR%%/portcontrol.html
-%%WWWDIR%%/powered_by_mason.jpg
-%%WWWDIR%%/public_debugging.html
-%%WWWDIR%%/reports.html
-%%WWWDIR%%/search.html
-%%WWWDIR%%/sidebar.html
-%%WWWDIR%%/stats.html
-%%WWWDIR%%/traceroute.html
-%%WWWDIR%%/valid-html401.png
-%%WWWDIR%%/vcss.gif
-%%WWWDIR%%/port_usage.html
-%%WWWDIR%%/traffic.png
-%%WWWDIR%%/graphs_sample.mas
-%%WWWDIR%%/port_search.html
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
+%%WEBUI%%%%WWWDIR%%/admin.html
+%%WEBUI%%%%WWWDIR%%/admin_chimp.gif
+%%WEBUI%%%%WWWDIR%%/admin_dev.html
+%%WEBUI%%%%WWWDIR%%/admin_plug.gif
+%%WEBUI%%%%WWWDIR%%/admin_reconfig.html
+%%WEBUI%%%%WWWDIR%%/admin_user.html
+%%WEBUI%%%%WWWDIR%%/apache_login.html
+%%WEBUI%%%%WWWDIR%%/autohandler
+%%WEBUI%%%%WWWDIR%%/bullet.gif
+%%WEBUI%%%%WWWDIR%%/change_pw.html
+%%WEBUI%%%%WWWDIR%%/corner-bl.png
+%%WEBUI%%%%WWWDIR%%/corner-br.png
+%%WEBUI%%%%WWWDIR%%/corner-tl.png
+%%WEBUI%%%%WWWDIR%%/corner-tr.png
+%%WEBUI%%%%WWWDIR%%/device.html
+%%WEBUI%%%%WWWDIR%%/device_inv.html
+%%WEBUI%%%%WWWDIR%%/device_module.html
+%%WEBUI%%%%WWWDIR%%/device_module_search.html
+%%WEBUI%%%%WWWDIR%%/device_search.html
+%%WEBUI%%%%WWWDIR%%/discoball2.gif
+%%WEBUI%%%%WWWDIR%%/doc/index.html
+%%WEBUI%%%%WWWDIR%%/doc/netdisco-api-backend.html
+%%WEBUI%%%%WWWDIR%%/doc/netdisco-api-shared.html
+%%WEBUI%%%%WWWDIR%%/duplex.html
+%%WEBUI%%%%WWWDIR%%/frontpanel.html
+%%WEBUI%%%%WWWDIR%%/icon_down.gif
+%%WEBUI%%%%WWWDIR%%/icon_info.gif
+%%WEBUI%%%%WWWDIR%%/icon_lock.gif
+%%WEBUI%%%%WWWDIR%%/icon_note.gif
+%%WEBUI%%%%WWWDIR%%/icon_up.gif
+%%WEBUI%%%%WWWDIR%%/icon_v.gif
+%%WEBUI%%%%WWWDIR%%/index.html
+%%WEBUI%%%%WWWDIR%%/ip_search.html
+%%WEBUI%%%%WWWDIR%%/jack_search.html
+%%WEBUI%%%%WWWDIR%%/log.html
+%%WEBUI%%%%WWWDIR%%/login.html
+%%WEBUI%%%%WWWDIR%%/logout.html
+%%WEBUI%%%%WWWDIR%%/minus.gif
+%%WEBUI%%%%WWWDIR%%/mktree.css
+%%WEBUI%%%%WWWDIR%%/mktree.js
+%%WEBUI%%%%WWWDIR%%/netdisco.css
+%%WEBUI%%%%WWWDIR%%/netdisco.ico
+%%WEBUI%%%%WWWDIR%%/netdiscoball.gif
+%%WEBUI%%%%WWWDIR%%/netmap.html
+%%WEBUI%%%%WWWDIR%%/node.html
+%%WEBUI%%%%WWWDIR%%/plus.gif
+%%WEBUI%%%%WWWDIR%%/port_info.html
+%%WEBUI%%%%WWWDIR%%/port_report.html
+%%WEBUI%%%%WWWDIR%%/portcontrol.html
+%%WEBUI%%%%WWWDIR%%/powered_by_mason.jpg
+%%WEBUI%%%%WWWDIR%%/public_debugging.html
+%%WEBUI%%%%WWWDIR%%/reports.html
+%%WEBUI%%%%WWWDIR%%/search.html
+%%WEBUI%%%%WWWDIR%%/sidebar.html
+%%WEBUI%%%%WWWDIR%%/stats.html
+%%WEBUI%%%%WWWDIR%%/traceroute.html
+%%WEBUI%%%%WWWDIR%%/valid-html401.png
+%%WEBUI%%%%WWWDIR%%/vcss.gif
+%%WEBUI%%%%WWWDIR%%/port_usage.html
+%%WEBUI%%%%WWWDIR%%/traffic.png
+%%WEBUI%%%%WWWDIR%%/graphs_sample.mas
+%%WEBUI%%%%WWWDIR%%/port_search.html
+%%WEBUI%%@dir %%WWWDIR%%/mason
+@owner
+@group
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/DiscoveryDatabase.pod
 %%DOCSDIR%%/INSTALL.pod
@@ -113,6 +118,7 @@ bin/port_control
 %%DOCSDIR%%/README-API-BACKEND
 %%DOCSDIR%%/README-API-SHARED
 %%DOCSDIR%%/UPGRADE
+@owner %%NETDISCO_USER%%
 @group %%NETDISCO_GROUP%%
 @sample %%ETCDIR%%/netdisco.conf.sample
 @sample %%ETCDIR%%/netdisco-topology.txt.sample
@@ -121,9 +127,5 @@ bin/port_control
 @sample %%ETCDIR%%/netdisco_apache_dir.conf.sample
 @unexec if [ -L %%APACHEETCDIR%%/Includes/netdisco_apache_dir.conf ] ; then rm %%APACHEETCDIR%%/Includes/netdisco_apache_dir.conf; fi
 @unexec if [ -L %%APACHEETCDIR%%/Includes/netdisco_apache.conf ] ; then rm %%APACHEETCDIR%%/Includes/netdisco_apache.conf; fi
-%%WEBUI%%@dirrm %%WWWDIR%%/doc
-%%WEBUI%%@dirrmtry %%WWWDIR%%
-@dirrm %%DATADIR%%/sql
-@dirrmtry %%DATADIR%%
-@dirrmtry %%ETCDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@owner
+@group