Index: head/net-mgmt/flowviewer/Makefile
===================================================================
--- head/net-mgmt/flowviewer/Makefile	(revision 389115)
+++ head/net-mgmt/flowviewer/Makefile	(revision 389116)
@@ -1,91 +1,98 @@
 # Created by: Alex Samorukov, samm@os2.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	flowviewer
 PORTVERSION=	4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	FlowViewer_${DISTVERSION}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Web-based user interface for the flow-tools NetFlow data
 
 RUN_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
 		rrdtool:${PORTSDIR}/databases/rrdtool
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE=	NETFLOWv
 OPTIONS_SINGLE_NETFLOWv=	NETFLOWv5 NETFLOWv9
 OPTIONS_DEFAULT=	NETFLOWv5
 NETFLOWv5_DESC=	Support for NETFLOWv5
 NETFLOWv9_DESC=	Support for IPFIX/NETFLOWv9
 NETFLOWv5_RUN_DEPENDS=	flow-cat:${PORTSDIR}/net-mgmt/flow-tools-ng
 NETFLOWv9_RUN_DEPENDS=	rwptoflow:${PORTSDIR}/security/silktools
 
 FLOWVIEWERDIR?=	${PREFIX}/www/flowviewer
 
-PLIST_SCRIPT=	FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Main.cgi \
-		FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
+FLOWVIEWERSCRIPTS=	FV.cgi FV_Relay.cgi FlowGrapher.cgi FlowGrapher_Analyze.cgi \
+		FlowGrapher_Main.cgi FlowGrapher_Replay.cgi FlowGrapher_Sort.cgi \
 		FlowMonitor.cgi FlowMonitor_Dashboard.cgi FlowMonitor_Display.cgi \
 		FlowMonitor_DisplayPublic.cgi FlowMonitor_Dumper.cgi \
 		FlowMonitor_Group.cgi FlowMonitor_Main.cgi FlowMonitor_Management.cgi \
-		FlowMonitor_Replay.cgi FlowViewer.cgi dscan.suppress.dst dscan.suppress.src \
-		FlowViewer_Main.cgi FlowViewer_Replay.cgi \
-		FlowViewer_Save.cgi FlowViewer_SaveManage.cgi FlowViewer_Sort.cgi \
-		FlowViewer_UI.pm FlowViewer_Utilities.pm FlowGrapher_Colors \
+		FlowMonitor_Replay.cgi FlowViewer.cgi FlowViewer_Main.cgi \
+		FlowViewer_Replay.cgi FlowViewer_Save.cgi FlowViewer_SaveManage.cgi \
+		FlowViewer_Sort.cgi FlowViewer_UI.pm FlowViewer_Utilities.pm \
 		FlowMonitor_Collector FlowMonitor_Grapher \
 		FlowMonitor_Recreate FlowMonitor_Thumbnail FlowViewer_CleanASCache \
 		FlowViewer_CleanFiles FlowViewer_CleanHostCache FlowViewer_CleanSiLK
-PLIST_DATA=	FG_button.png FM_button.png FV_button.png FlowViewer.css
-PLIST_TOOLS=	flowcapture_restart resize_rrdtools flowmonitor_grapher_nonlazy \
-		date_to_epoch_gm performance_check flowmonitor_restart \
-		convert_pre40_filters analyze_flowmonitor_debug flowmonitor_grapher_recent \
-		flow-capture-table.conf rsync_monitors epoch_to_date_local rwflowpack_start \
-		epoch_to_date_gm rsync_htmls flowmonitor_archive_restore \
-		date_to_epoch_local analyze_netflow_packets rsync_flows
+FLOWVIEWERDATA=	FG_button.png FM_button.png FV_button.png FlowViewer.css
+SHEBANG_TOOLS=	tools/analyze_flowmonitor_debug tools/analyze_netflow_packets \
+		tools/convert_pre40_filters tools/create_ports_file tools/date_to_epoch_gm \
+		tools/date_to_epoch_local tools/epoch_to_date_gm tools/epoch_to_date_local \
+		tools/flowmonitor_archive_restore tools/flowmonitor_grapher_nonlazy \
+		tools/flowmonitor_grapher_recent tools/performance_check tools/resize_rrdtools
+FLOWVIEWERTOOLS=	${SHEBANG_TOOLS} \
+		tools/flowcapture_restart tools/flowmonitor_restart \
+		tools/flow-capture-table.conf tools/rsync_monitors tools/rwflowpack_start \
+		tools/rsync_htmls tools/rsync_flows
+FLOWVIEWERCONFIGS=	FlowViewer_Configuration.pm \
+		FlowGrapher_Colors FlowGrapher_Ports \
+		NamedInterfaces_Devices NamedInterfaces_Exporters \
+		dscan.suppress.dst dscan.suppress.src
 
 PLIST_SUB+=	FLOWVIEWERDIR="${FLOWVIEWERDIR}" \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 SUB_LIST+=	"FLOWVIEWERDIR=${FLOWVIEWERDIR}" \
 		"PKGNAME=${PKGNAME}"
 SUB_FILES=	pkg-message
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${FLOWVIEWERSCRIPTS} ${SHEBANG_TOOLS} FlowViewer_Configuration.pm
 NO_BUILD=	yes
 
 PORTDOCS=	README
 
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e "s|%%PREFIX%%|${PREFIX}|" \
 		${WRKSRC}/FlowViewer_Configuration.pm
 	@${REINPLACE_CMD} -E \
 		-e "s|%%FLOWVIEWERDIR%%|${FLOWVIEWERDIR}|" \
 		${WRKSRC}/FlowViewer_Configuration.pm
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}
 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tools
-	${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.sample
-	${INSTALL_DATA} ${WRKSRC}/NamedInterfaces_Devices ${STAGEDIR}${FLOWVIEWERDIR}/NamedInterfaces_Devices.sample
-	${INSTALL_DATA} ${WRKSRC}/NamedInterfaces_Exporters ${STAGEDIR}${FLOWVIEWERDIR}/NamedInterfaces_Exporters.sample
 	${MKDIR} ${STAGEDIR}${FLOWVIEWERDIR}/tmp ${STAGEDIR}${FLOWVIEWERDIR}/reports ${STAGEDIR}${FLOWVIEWERDIR}/graphs \
 	${STAGEDIR}${FLOWVIEWERDIR}/monitor ${STAGEDIR}${FLOWVIEWERDIR}/working ${STAGEDIR}${FLOWVIEWERDIR}/saves \
 	${STAGEDIR}${FLOWVIEWERDIR}/names ${STAGEDIR}${FLOWVIEWERDIR}/ipsets ${STAGEDIR}${FLOWVIEWERDIR}/filters \
 	${STAGEDIR}${FLOWVIEWERDIR}/rrdtools ${STAGEDIR}${FLOWVIEWERDIR}/FlowViewer_Dashboard
-.for i in ${PLIST_SCRIPT}
+.for i in ${FLOWVIEWERCONFIGS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}/${i}.sample
+.endfor
+.for i in ${FLOWVIEWERSCRIPTS}
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}
 .endfor
-.for i in ${PLIST_TOOLS}
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/${i} ${STAGEDIR}${FLOWVIEWERDIR}/tools
+.for i in ${FLOWVIEWERTOOLS}
+	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}/tools
 .endfor
-.for i in ${PLIST_DATA}
+.for i in ${FLOWVIEWERDATA}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FLOWVIEWERDIR}/reports
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net-mgmt/flowviewer/files/pkg-message.in
===================================================================
--- head/net-mgmt/flowviewer/files/pkg-message.in	(revision 389115)
+++ head/net-mgmt/flowviewer/files/pkg-message.in	(revision 389116)
@@ -1,26 +1,23 @@
 %%PKGNAME%% has been installed into:
 
     %%FLOWVIEWERDIR%%
 
-Please copy FlowViewer_Configuration.pm.sample to FlowViewer_Configuration.pm,
-NamedInterfaces_Devices.sample to NamedInterfaces_Devices,
-NamedInterfaces_Exporters.sample to NamedInterfaces_Exporters
-and edit them to suit your needs.
+Please edit at least FlowViewer_Configuration.pm to suit your needs.
 
 To make FlowViewer available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
     Alias /FlowViewer/ "%%FLOWVIEWERDIR%%/"
 
 
     <Directory "%%FLOWVIEWERDIR%%/">
         Options +ExecCGI
         AddHandler cgi-script .cgi
         Order allow,deny
 	Allow from 127.0.0.1 .example.com
 	Deny from all
     </Directory>
 
 Then point your browser to 'http://myserver.domain.org/FlowViewer/FV.cgi'
 
 You can find additional information in the %%DOCSDIR%%/README file
Index: head/net-mgmt/flowviewer/pkg-plist
===================================================================
--- head/net-mgmt/flowviewer/pkg-plist	(revision 389115)
+++ head/net-mgmt/flowviewer/pkg-plist	(revision 389116)
@@ -1,72 +1,75 @@
 %%FLOWVIEWERDIR%%/FV.cgi
 %%FLOWVIEWERDIR%%/FV_Relay.cgi
 %%FLOWVIEWERDIR%%/FlowGrapher.cgi
-%%FLOWVIEWERDIR%%/FlowGrapher_Colors
+%%FLOWVIEWERDIR%%/FlowGrapher_Analyze.cgi
+@sample %%FLOWVIEWERDIR%%/FlowGrapher_Colors.sample
 %%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
+@sample %%FLOWVIEWERDIR%%/FlowGrapher_Ports.sample
 %%FLOWVIEWERDIR%%/FlowGrapher_Replay.cgi
 %%FLOWVIEWERDIR%%/FlowGrapher_Sort.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Collector
 %%FLOWVIEWERDIR%%/FlowMonitor_Dashboard.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Display.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_DisplayPublic.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Dumper.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Grapher
 %%FLOWVIEWERDIR%%/FlowMonitor_Group.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Main.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Management.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Recreate
 %%FLOWVIEWERDIR%%/FlowMonitor_Replay.cgi
 %%FLOWVIEWERDIR%%/FlowMonitor_Thumbnail
 %%FLOWVIEWERDIR%%/FlowViewer.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_CleanASCache
 %%FLOWVIEWERDIR%%/FlowViewer_CleanFiles
 %%FLOWVIEWERDIR%%/FlowViewer_CleanHostCache
 %%FLOWVIEWERDIR%%/FlowViewer_CleanSiLK
-%%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.sample
+@sample %%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.sample
 %%FLOWVIEWERDIR%%/FlowViewer_Main.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Replay.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_SaveManage.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Sort.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_UI.pm
 %%FLOWVIEWERDIR%%/FlowViewer_Utilities.pm
-%%FLOWVIEWERDIR%%/NamedInterfaces_Devices.sample
-%%FLOWVIEWERDIR%%/NamedInterfaces_Exporters.sample
-%%FLOWVIEWERDIR%%/dscan.suppress.dst
-%%FLOWVIEWERDIR%%/dscan.suppress.src
+@sample %%FLOWVIEWERDIR%%/NamedInterfaces_Devices.sample
+@sample %%FLOWVIEWERDIR%%/NamedInterfaces_Exporters.sample
+@sample %%FLOWVIEWERDIR%%/dscan.suppress.dst.sample
+@sample %%FLOWVIEWERDIR%%/dscan.suppress.src.sample
 %%FLOWVIEWERDIR%%/tools/analyze_flowmonitor_debug
 %%FLOWVIEWERDIR%%/tools/analyze_netflow_packets
 %%FLOWVIEWERDIR%%/tools/convert_pre40_filters
+%%FLOWVIEWERDIR%%/tools/create_ports_file
 %%FLOWVIEWERDIR%%/tools/date_to_epoch_gm
 %%FLOWVIEWERDIR%%/tools/date_to_epoch_local
 %%FLOWVIEWERDIR%%/tools/epoch_to_date_gm
 %%FLOWVIEWERDIR%%/tools/epoch_to_date_local
 %%FLOWVIEWERDIR%%/tools/flow-capture-table.conf
 %%FLOWVIEWERDIR%%/tools/flowcapture_restart
 %%FLOWVIEWERDIR%%/tools/flowmonitor_archive_restore
 %%FLOWVIEWERDIR%%/tools/flowmonitor_grapher_nonlazy
 %%FLOWVIEWERDIR%%/tools/flowmonitor_grapher_recent
 %%FLOWVIEWERDIR%%/tools/flowmonitor_restart
 %%FLOWVIEWERDIR%%/tools/performance_check
 %%FLOWVIEWERDIR%%/tools/resize_rrdtools
 %%FLOWVIEWERDIR%%/tools/rsync_flows
 %%FLOWVIEWERDIR%%/tools/rsync_htmls
 %%FLOWVIEWERDIR%%/tools/rsync_monitors
 %%FLOWVIEWERDIR%%/tools/rwflowpack_start
 %%FLOWVIEWERDIR%%/reports/FG_button.png
 %%FLOWVIEWERDIR%%/reports/FM_button.png
 %%FLOWVIEWERDIR%%/reports/FV_button.png
 %%FLOWVIEWERDIR%%/reports/FlowViewer.css
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/FlowViewer_Dashboard
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/filters
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/graphs
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/ipsets
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/monitor
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/names
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/reports
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/rrdtools
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/saves
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/tmp
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/tools
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%FLOWVIEWERDIR%%/working