Index: head/net-mgmt/nfsen/Makefile
===================================================================
--- head/net-mgmt/nfsen/Makefile	(revision 404949)
+++ head/net-mgmt/nfsen/Makefile	(revision 404950)
@@ -1,74 +1,75 @@
 # Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
 
 PORTNAME=	nfsen
 PORTVERSION=	1.3.7
 PORTREVISION=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
 		http://nfsen.sourceforge.net/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Web based frontend to nfdump netflow collector
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/BSD-license.txt
 
 RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
 		p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6 \
 		nfdump>=0:${PORTSDIR}/net-mgmt/nfdump
 
-USES=	cpe iconv shebangfix perl5
+USES=		cpe iconv shebangfix perl5
 CPE_VENDOR=	nfsen
 CPE_PRODUCT=	nfsen
 USE_PHP=	session pcre sockets
 NO_BUILD=	yes
+NO_ARCH=	yes
 PLIST_SUB+=	PORTNAME=${PORTNAME}
 USE_RC_SUBR=	nfsen
 perl_OLD_CMD=	%%PERL%%
 SHEBANG_FILES=	bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend libexec/NfSenRRD.pm \
 		libexec/NfAlert.pm libexec/NfProfile.pm libexec/Notification.pm libexec/NfSen.pm \
 		libexec/NfConf.pm libexec/Lookup.pm libexec/AbuseWhois.pm libexec/NfSenRC.pm \
 		libexec/Nfsources.pm
 REINPLACE_ARGS=	-i ''
 REINPLACE_LIST=	bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend etc/nfsen-dist.conf libexec/NfConf.pm
 SUB_LIST+=	"CONFDIR=${PREFIX}/etc"
 SUB_LIST+=	"LIBEXECDIR=${PREFIX}/libexec/${PORTNAME}"
 SUB_LIST+=	"PORTVERSION=${PORTVERSION}"
 SUB_LIST+=	"PREFIX=${PREFIX}"
 SUB_LIST+=	"WWWDIR=${WWWDIR}"
 SUB_LIST+=	"PORTNAME=${PORTNAME}"
 
 post-patch:
 .for nfsenfile in ${REINPLACE_LIST}
 	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/${nfsenfile}
 .endfor
 .for perlfile in ${SHEBANG_FILES}
 	@${REINPLACE_CMD} "s|perl -w$$|perl|" ${WRKSRC}/${perlfile}
 .endfor
 	${CP} ${FILESDIR}/conf.php ${WRKSRC}
 	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/conf.php
 	@${REINPLACE_CMD} "s|/usr/bin/perl|${perl_CMD}|" ${WRKSRC}/libexec/Nfcomm.pm
 
 do-install:
 	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-data/live
 	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles-stat/live
 	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/profiles/live
 	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/filters
 	${INSTALL} -d ${STAGEDIR}/${PREFIX}/var/${PORTNAME}/run
 	${INSTALL} -d ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins
 	${INSTALL} -d ${STAGEDIR}/${WWWDIR}/plugins
 	(cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/bin/)
 	${INSTALL_DATA} ${WRKSRC}/etc/nfsen-dist.conf ${STAGEDIR}/${PREFIX}/etc/
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/)
 	(cd ${WRKSRC}/plugins/frontend/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/)
 	(cd ${WRKSRC}/libexec && ${INSTALL_SCRIPT} * ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/)
 	(cd ${WRKSRC}/plugins/backend && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/plugins/)
 	${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/
 	${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/
 	${INSTALL_DATA} ${WRKSRC}/conf.php ${STAGEDIR}/${WWWDIR}
 	@${ECHO_MSG} "Configure your ${LOCALBASE}/etc/nfsen.conf to have necessary sources ";
 	@${ECHO_MSG} "Then run 'nfsen reconfig' to correctly setup source, RRD, and profile files";
 
 .include <bsd.port.mk>
Index: head/net-mgmt/nfsen/pkg-plist
===================================================================
--- head/net-mgmt/nfsen/pkg-plist	(revision 404949)
+++ head/net-mgmt/nfsen/pkg-plist	(revision 404950)
@@ -1,95 +1,86 @@
+bin/testPlugin
+bin/nfsend
+bin/nfsen
+bin/RebuildHierarchy.pl
+@sample etc/nfsen-dist.conf etc/nfsen.conf
+libexec/%%PORTNAME%%/plugins/smily.jpg
+libexec/%%PORTNAME%%/plugins/demoplugin.pm
+libexec/%%PORTNAME%%/RRDconvertv1.pm
+libexec/%%PORTNAME%%/Notification.pm
+libexec/%%PORTNAME%%/Nfsync.pm
+libexec/%%PORTNAME%%/Nfsources.pm
+libexec/%%PORTNAME%%/Nfcomm.pm
+libexec/%%PORTNAME%%/NfSenSim.pm
+libexec/%%PORTNAME%%/NfSenRRD.pm
+libexec/%%PORTNAME%%/NfSenRC.pm
+libexec/%%PORTNAME%%/NfSen.pm
+libexec/%%PORTNAME%%/NfProfile.pm
+libexec/%%PORTNAME%%/NfConf.pm
+libexec/%%PORTNAME%%/NfAlert.pm
+libexec/%%PORTNAME%%/Lookup.pm
+libexec/%%PORTNAME%%/Log.pm
+libexec/%%PORTNAME%%/CopyRecursive.pm
+libexec/%%PORTNAME%%/AbuseWhois.pm
 %%WWWDIR%%/rrdgraph.php
 %%WWWDIR%%/profileadmin.php
 %%WWWDIR%%/process.php
 %%WWWDIR%%/plugins/demoplugin.php
 %%WWWDIR%%/pic.php
 %%WWWDIR%%/overview.php
 %%WWWDIR%%/nfsenutil.php
 %%WWWDIR%%/nfsen.php
 %%WWWDIR%%/navigator.php
 %%WWWDIR%%/lookup.php
 %%WWWDIR%%/js/profileadmin.js
 %%WWWDIR%%/js/menu.js
 %%WWWDIR%%/js/global.js
 %%WWWDIR%%/js/detail.js
 %%WWWDIR%%/js/alerting.js
 %%WWWDIR%%/js/ColorPicker2.js
 %%WWWDIR%%/icons/trigger.png
 %%WWWDIR%%/icons/trash.png
 %%WWWDIR%%/icons/spyglas.png
 %%WWWDIR%%/icons/space.png
 %%WWWDIR%%/icons/shadeactive.png
 %%WWWDIR%%/icons/shade.png
 %%WWWDIR%%/icons/shade.gif
 %%WWWDIR%%/icons/save.png
 %%WWWDIR%%/icons/progress.png
 %%WWWDIR%%/icons/plus.png
 %%WWWDIR%%/icons/ok.png
 %%WWWDIR%%/icons/minus.png
 %%WWWDIR%%/icons/invisible.png
 %%WWWDIR%%/icons/help.png
 %%WWWDIR%%/icons/edit.png
 %%WWWDIR%%/icons/cursor-stop.png
 %%WWWDIR%%/icons/cursor-start.png
 %%WWWDIR%%/icons/cursor-line.png
 %%WWWDIR%%/icons/close.png
 %%WWWDIR%%/icons/cancel.png
 %%WWWDIR%%/icons/arrow.yellow.right.png
 %%WWWDIR%%/icons/arrow.yellow.down.png
 %%WWWDIR%%/icons/arrow.blue.right.png
 %%WWWDIR%%/icons/arrow.blue.down.png
 %%WWWDIR%%/icons/ErrorGraph.png
 %%WWWDIR%%/icons/Error.png
 %%WWWDIR%%/icons/EmptyGraph.png
 %%WWWDIR%%/details.php
 %%WWWDIR%%/css/profileadmin.css
 %%WWWDIR%%/css/nfsen.css
 %%WWWDIR%%/css/lookup.css
 %%WWWDIR%%/css/detail.css
 %%WWWDIR%%/css/alerting.css
 %%WWWDIR%%/conf.php
 %%WWWDIR%%/colour_picker.html
 %%WWWDIR%%/colour_palette.html
 %%WWWDIR%%/alerting.php
-libexec/%%PORTNAME%%/plugins/smily.jpg
-libexec/%%PORTNAME%%/plugins/demoplugin.pm
-libexec/%%PORTNAME%%/RRDconvertv1.pm
-libexec/%%PORTNAME%%/Notification.pm
-libexec/%%PORTNAME%%/Nfsync.pm
-libexec/%%PORTNAME%%/Nfsources.pm
-libexec/%%PORTNAME%%/Nfcomm.pm
-libexec/%%PORTNAME%%/NfSenSim.pm
-libexec/%%PORTNAME%%/NfSenRRD.pm
-libexec/%%PORTNAME%%/NfSenRC.pm
-libexec/%%PORTNAME%%/NfSen.pm
-libexec/%%PORTNAME%%/NfProfile.pm
-libexec/%%PORTNAME%%/NfConf.pm
-libexec/%%PORTNAME%%/NfAlert.pm
-libexec/%%PORTNAME%%/Lookup.pm
-libexec/%%PORTNAME%%/Log.pm
-libexec/%%PORTNAME%%/CopyRecursive.pm
-libexec/%%PORTNAME%%/AbuseWhois.pm
-etc/nfsen-dist.conf
-bin/testPlugin
-bin/nfsend
-bin/nfsen
-bin/RebuildHierarchy.pl
-@unexec if cmp -s %D/etc/nfsen.conf %D/etc/nfsen-dist.conf; then rm -f %D/etc/nfsen.conf; fi
-@exec [ -f %D/etc/nfsen.conf ] || cp %D/etc/nfsen-dist.conf %D/etc/nfsen.conf
-@dirrmtry var/%%PORTNAME%%/run
-@dirrmtry var/%%PORTNAME%%/profiles-stat/live
-@dirrmtry var/%%PORTNAME%%/profiles-stat
-@dirrmtry var/%%PORTNAME%%/profiles-data/live
-@dirrmtry var/%%PORTNAME%%/profiles-data
-@dirrmtry var/%%PORTNAME%%/profiles/live
-@dirrmtry var/%%PORTNAME%%/profiles
-@dirrmtry var/%%PORTNAME%%/filters
-@dirrmtry var/%%PORTNAME%%
-@dirrmtry var
-@dirrmtry %%WWWDIR%%/plugins
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/icons
-@dirrm %%WWWDIR%%/css
-@dirrmtry %%WWWDIR%%
-@dirrmtry libexec/%%PORTNAME%%/plugins
-@dirrmtry libexec/%%PORTNAME%%
+@dir var/%%PORTNAME%%/run
+@dir var/%%PORTNAME%%/profiles-stat/live
+@dir var/%%PORTNAME%%/profiles-stat
+@dir var/%%PORTNAME%%/profiles-data/live
+@dir var/%%PORTNAME%%/profiles-data
+@dir var/%%PORTNAME%%/profiles/live
+@dir var/%%PORTNAME%%/profiles
+@dir var/%%PORTNAME%%/filters
+@dir var/%%PORTNAME%%
+@dir var