Index: Makefile
===================================================================
--- Makefile	(revision 367211)
+++ Makefile	(working copy)
@@ -9,6 +9,8 @@
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Web-based network management tool for moderate to large networks
 
+LICENSE=	BSD
+
 OPTIONS_DEFINE=	DOCS GRAPHVIZ MIBS WEBUI
 OPTIONS_DEFAULT=DOCS GRAPHVIZ MIBS WEBUI
 MIBS_DESC=	Depend on net-mgmt/netdisco-mibs
@@ -25,6 +27,9 @@
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
 
+USERS=		netdisco
+GROUPS=		netdisco
+
 USES=		perl5 shebangfix
 USE_PERL5=	run build fixpacklist
 USE_PGSQL=	yes
@@ -42,6 +47,7 @@
 #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
+SHEBANG_FILES=	bin/parse_kismet_ap netdisco
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -82,9 +88,9 @@
 		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
+USE_APACHE_RUN=	22+
 REINPLACE_EXPR+=	-e 's!%%APACHEMODDIR%%!${APACHEMODDIR}!g' -e 's!%%APACHEETCDIR%%!${APACHEETCDIR}!g' \
-		-e 's!%%WWWDIR%%!${WWWDIR}!g' 
+		-e 's!%%WWWDIR%%!${WWWDIR}!g'
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} WEBUI=""
 .else
 PLIST_SUB+=     WWWOWN="@comment " \
@@ -102,7 +108,20 @@
 .	endfor
 
 	cd ${WRKSRC} && \
-	${REINPLACE_CMD} ${REINPLACE_EXPR} ${ALTER_FILES}
+	${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
@@ -115,6 +134,10 @@
 
 		${MKDIR} ${STAGEDIR}${WWWDIR}/doc
 		cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${STAGEDIR}${WWWDIR}/doc
+
+		${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+
+		${MKDIR} ${STAGEDIR}${WWWDIR}/mason
 .	endif
 
 	${MKDIR} -m 755 -p ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
@@ -122,6 +145,13 @@
 	${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	${INSTALL} -d -m 750 ${STAGEDIR}${ETCDIR}
 
+.	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
+
 	${INSTALL} -d ${STAGEDIR}${DATADIR}/sql
 
 	cd ${WRKSRC}/sql && \
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 367211)
+++ pkg-plist	(working copy)
@@ -114,6 +114,7 @@
 %%DOCSDIR%%/README-API-SHARED
 %%DOCSDIR%%/UPGRADE
 @group %%NETDISCO_GROUP%%
+@umask 002
 @sample %%ETCDIR%%/netdisco.conf.sample
 @sample %%ETCDIR%%/netdisco-topology.txt.sample
 @sample %%ETCDIR%%/netdisco.crontab.sample
--- netdisco-1.3.3.patch ends here ---