- Update to 3.2

PR:             110609
Submitted by:   Alex Samorukov <samm@os2.kiev.ua> (maintainer)

4 files changed, 39 insertions, 41 deletions

diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile
index c866e808324a..807a8574e589 100644
--- a/net-mgmt/flowviewer/Makefile
+++ b/net-mgmt/flowviewer/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	flowviewer
-PORTVERSION=	3.0
+PORTVERSION=	3.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://ensight.eos.nasa.gov/FlowViewer/
 DISTNAME=	FlowViewer_${DISTVERSION}
@@ -52,6 +52,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Main.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Save.cgi ${FLOWVIEWERDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Group.cgi ${FLOWVIEWERDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowViewer_Utilities.pm ${FLOWVIEWERDIR}
 	@${INSTALL_DATA} ${WRKSRC}/FlowViewer_Configuration.pm ${FLOWVIEWERDIR}/FlowViewer_Configuration.pm.dist
 	@${INSTALL_SCRIPT} ${WRKSRC}/FlowTracker_Collector ${FLOWVIEWERDIR}
@@ -59,10 +60,9 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/FlowGrapher_Colors ${FLOWVIEWERDIR}
 	@${INSTALL_DATA} ${WRKSRC}/FlowGrapher.png ${FLOWVIEWERDIR}
 	@${INSTALL_DATA} ${WRKSRC}/FlowTracker.png ${FLOWVIEWERDIR}
-	@${INSTALL_DATA} ${WRKSRC}/FlowTracker_Links.png ${FLOWVIEWERDIR}
 	@${INSTALL_DATA} ${WRKSRC}/FlowViewer.png ${FLOWVIEWERDIR}
 	@${MKDIR} ${FLOWVIEWERDIR}/tmp ${FLOWVIEWERDIR}/reports \
-	${FLOWVIEWERDIR}/graphs ${FLOWVIEWERDIR}/tracker 
+	${FLOWVIEWERDIR}/graphs ${FLOWVIEWERDIR}/tracker
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${FLOWVIEWERDIR}/tmp \
 	${FLOWVIEWERDIR}/reports ${FLOWVIEWERDIR}/graphs \
 	${FLOWVIEWERDIR}/tracker
diff --git a/net-mgmt/flowviewer/distinfo b/net-mgmt/flowviewer/distinfo
index 83377cfa33dc..c4b40bc4c8d0 100644
--- a/net-mgmt/flowviewer/distinfo
+++ b/net-mgmt/flowviewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (FlowViewer_3.0.tar) = 4b6ae0a9a85feeab827a99c1b0dc478b
-SHA256 (FlowViewer_3.0.tar) = f5af17819e9be4689a641766cbc409c466cb84876b13f9dd7a205fcc9634a657
-SIZE (FlowViewer_3.0.tar) = 225280
+MD5 (FlowViewer_3.2.tar) = 233a3237bd7c2df8e61f6aa2981e0037
+SHA256 (FlowViewer_3.2.tar) = 44926dc10215d245afde2775bdbe28c5c7f73196e93170cc9a9b048724681fb4
+SIZE (FlowViewer_3.2.tar) = 307200
diff --git a/net-mgmt/flowviewer/files/patch-config b/net-mgmt/flowviewer/files/patch-config
index 83b453fbfd73..15ebda8ff3c7 100644
--- a/net-mgmt/flowviewer/files/patch-config
+++ b/net-mgmt/flowviewer/files/patch-config
@@ -1,33 +1,31 @@
---- FlowViewer_Configuration.pm.orig	Wed Oct  4 23:19:00 2006
-+++ FlowViewer_Configuration.pm	Thu Nov  2 22:21:03 2006
-@@ -43,22 +43,26 @@
+--- FlowViewer_Configuration.pm.dist.new	Wed Mar 21 09:30:44 2007
++++ FlowViewer_Configuration.pm	Wed Mar 21 11:45:46 2007
+@@ -45,22 +45,22 @@
  
  # Directories and Files:
  
--$reports_directory       = "/htp/htdocs/FlowViewer";
--$reports_short           = "/FlowViewer";
--$graphs_directory        = "/htp/htdocs/FlowGrapher";
--$graphs_short            = "/FlowGrapher";
--$tracker_directory       = "/htp/htdocs/FlowTracker";
--$tracker_short           = "/FlowTracker";
--$cgi_bin_directory       = "/htp/cgi-bin/FlowViewer_3.0";
--$cgi_bin_short           = "/cgi-bin/FlowViewer_3.0";
+-$reports_directory       = "/htp/htdocs/FlowViewer_3.2";
+-$reports_short           = "/FlowViewer_3.2";
+-$graphs_directory        = "/htp/htdocs/FlowGrapher_3.2/";
+-$graphs_short            = "/FlowGrapher_3.2/";
+-$tracker_directory       = "/htp/htdocs/FlowTracker_3.2";
+-$tracker_short           = "/FlowTracker_3.2";
+-$cgi_bin_directory       = "/htp/cgi-bin/FlowViewer_3.2";
+-$cgi_bin_short           = "/cgi-bin/FlowViewer_3.2";
+-$work_directory          = "/htp/cgi-bin/FlowViewer_3.2/Flow_Working";
+-$names_directory         = "/htp/cgi-bin/FlowViewer_3.2/";
+-$filter_directory        = "/htp/cgi-bin/Flow_State/FlowTracker_Filters";
+-$rrdtool_directory       = "/htp/cgi-bin/Flow_State/FlowTracker_RRDtool";
 +$reports_directory       = "%%FLOWVIEWERDIR%%/reports";
 +$reports_short           = "/FlowViewer/reports";
 +$graphs_directory        = "%%FLOWVIEWERDIR%%/graphs";
 +$graphs_short            = "/FlowViewer/graphs";
 +$tracker_directory       = "%%FLOWVIEWERDIR%%/tracker";
-+$tracker_short           = "/FlowViewer/tracker";
++$tracker_short           = "/FlowViewe/tracker";
 +$cgi_bin_directory       = "%%FLOWVIEWERDIR%%";
 +$cgi_bin_short           = "/FlowViewer";
-+$reports_directory       = "%%FLOWVIEWERDIR%%/reports";
-+$reports_short           = "/FlowViewer/reports";
-+$graphs_directory        = "%%FLOWVIEWERDIR%%/graphs";
-+$graphs_short            = "/FlowViewer/graphs";
- $work_directory          = "/tmp";
- $names_directory         = "/tmp";
--$filter_directory        = "/htp/cgi-bin/Flow_Temp/FlowTracker_Filters";
--$rrdtool_directory       = "/htp/cgi-bin/Flow_Temp/FlowTracker_RRDtool";
++$work_directory          = "/tmp";
++$names_directory         = "/tmp";
 +$filter_directory        = "%%FLOWVIEWERDIR%%/tmp/filters";
 +$rrdtool_directory       = "%%FLOWVIEWERDIR%%/tmp/rrdtools";
  
@@ -38,5 +36,5 @@
 +$flow_bin_directory      = "%%PREFIX%%/bin";
 +$rrdtool_bin_directory   = "%%PREFIX%%/bin";
  
- $tracker_webpage         = "index.html";
+ $actives_webpage         = "index.html";
  $trackings_title         = "Your System Here";
diff --git a/net-mgmt/flowviewer/pkg-plist b/net-mgmt/flowviewer/pkg-plist
index cabd7b495e04..2fa5681df0be 100644
--- a/net-mgmt/flowviewer/pkg-plist
+++ b/net-mgmt/flowviewer/pkg-plist
@@ -1,23 +1,23 @@
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%FLOWVIEWERDIR%%/FlowGrapher.cgi
+%%FLOWVIEWERDIR%%/FlowGrapher.png
+%%FLOWVIEWERDIR%%/FlowGrapher_Colors
 %%FLOWVIEWERDIR%%/FlowGrapher_Main.cgi
 %%FLOWVIEWERDIR%%/FlowTracker.cgi
+%%FLOWVIEWERDIR%%/FlowTracker.png
+%%FLOWVIEWERDIR%%/FlowTracker_Collector
+%%FLOWVIEWERDIR%%/FlowTracker_Grapher
+%%FLOWVIEWERDIR%%/FlowTracker_Group.cgi
 %%FLOWVIEWERDIR%%/FlowTracker_Main.cgi
 %%FLOWVIEWERDIR%%/FlowViewer.cgi
+%%FLOWVIEWERDIR%%/FlowViewer.png
+%%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.dist
 %%FLOWVIEWERDIR%%/FlowViewer_Main.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Save.cgi
 %%FLOWVIEWERDIR%%/FlowViewer_Utilities.pm
-%%FLOWVIEWERDIR%%/FlowViewer_Configuration.pm.dist
-%%FLOWVIEWERDIR%%/FlowTracker_Collector
-%%FLOWVIEWERDIR%%/FlowTracker_Grapher
-%%FLOWVIEWERDIR%%/FlowGrapher_Colors
-%%FLOWVIEWERDIR%%/FlowGrapher.png
-%%FLOWVIEWERDIR%%/FlowTracker.png
-%%FLOWVIEWERDIR%%/FlowTracker_Links.png
-%%FLOWVIEWERDIR%%/FlowViewer.png
-%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrmtry %%FLOWVIEWERDIR%%/reports
-@dirrmtry %%FLOWVIEWERDIR%%/graphs
-@dirrmtry %%FLOWVIEWERDIR%%/tracker
-@dirrmtry %%FLOWVIEWERDIR%%/tmp
-@dirrmtry %%FLOWVIEWERDIR%%
+@dirrm %%FLOWVIEWERDIR%%/tracker
+@dirrm %%FLOWVIEWERDIR%%/tmp
+@dirrm %%FLOWVIEWERDIR%%/reports
+@dirrm %%FLOWVIEWERDIR%%/graphs
+@dirrm %%FLOWVIEWERDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%