- fix work_directory statement in config file

- filter_directory and rrdtool_directory now pointed to %%FLOWDIR%%/tmp
- installation script create directories for flowviewer data with ${WWWOWN}:${WWWGRP} owner
- fixed typo in the pkg-message.in fileD (forgotten "/")
PR:		105088
Submitted by:	maintainer

4 files changed, 19 insertions, 9 deletions

diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile
index 574917aa42ee..c866e808324a 100644
--- a/net-mgmt/flowviewer/Makefile
+++ b/net-mgmt/flowviewer/Makefile
@@ -61,6 +61,12 @@ do-install:
 	@${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 
+	@${CHOWN} ${WWWOWN}:${WWWGRP} ${FLOWVIEWERDIR}/tmp \
+	${FLOWVIEWERDIR}/reports ${FLOWVIEWERDIR}/graphs \
+	${FLOWVIEWERDIR}/tracker
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/net-mgmt/flowviewer/files/patch-config b/net-mgmt/flowviewer/files/patch-config
index 1ce3cfa2be57..83b453fbfd73 100644
--- a/net-mgmt/flowviewer/files/patch-config
+++ b/net-mgmt/flowviewer/files/patch-config
@@ -1,6 +1,6 @@
---- FlowViewer_Configuration.pm.dist	Tue Oct 17 23:39:53 2006
-+++ FlowViewer_Configuration.pm	Wed Oct 18 00:19:10 2006
-@@ -43,22 +43,25 @@
+--- 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 @@
  
  # Directories and Files:
  
@@ -12,7 +12,6 @@
 -$tracker_short           = "/FlowTracker";
 -$cgi_bin_directory       = "/htp/cgi-bin/FlowViewer_3.0";
 -$cgi_bin_short           = "/cgi-bin/FlowViewer_3.0";
--$work_directory          = "/tmp";
 +$reports_directory       = "%%FLOWVIEWERDIR%%/reports";
 +$reports_short           = "/FlowViewer/reports";
 +$graphs_directory        = "%%FLOWVIEWERDIR%%/graphs";
@@ -25,11 +24,12 @@
 +$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";
-+$filter_directory        = "%%FLOWVIEWERDIR%%/tracker_filters";
-+$rrdtool_directory       = "%%FLOWVIEWERDIR%%/tracket_rrdtools";
++$filter_directory        = "%%FLOWVIEWERDIR%%/tmp/filters";
++$rrdtool_directory       = "%%FLOWVIEWERDIR%%/tmp/rrdtools";
  
 -$flow_data_directory     = "/htp/flows";
 -$flow_bin_directory      = "/usr/bin";
diff --git a/net-mgmt/flowviewer/files/pkg-message.in b/net-mgmt/flowviewer/files/pkg-message.in
index 5b7ea9dc55db..62a0df06f944 100644
--- a/net-mgmt/flowviewer/files/pkg-message.in
+++ b/net-mgmt/flowviewer/files/pkg-message.in
@@ -8,10 +8,10 @@ and edit it 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%%"
+    Alias /FlowViewer/ "%%FLOWVIEWERDIR%%/"
 
 
-    <Directory "%%FLOWVIEWERDIR%%">
+    <Directory "%%FLOWVIEWERDIR%%/">
         Options +ExecCGI
         AddHandler cgi-script .cgi
         Order allow,deny
diff --git a/net-mgmt/flowviewer/pkg-plist b/net-mgmt/flowviewer/pkg-plist
index a498c3a15345..cabd7b495e04 100644
--- a/net-mgmt/flowviewer/pkg-plist
+++ b/net-mgmt/flowviewer/pkg-plist
@@ -15,5 +15,9 @@
 %%FLOWVIEWERDIR%%/FlowTracker_Links.png
 %%FLOWVIEWERDIR%%/FlowViewer.png
 %%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%FLOWVIEWERDIR%%
+@dirrmtry %%FLOWVIEWERDIR%%/reports
+@dirrmtry %%FLOWVIEWERDIR%%/graphs
+@dirrmtry %%FLOWVIEWERDIR%%/tracker
+@dirrmtry %%FLOWVIEWERDIR%%/tmp
+@dirrmtry %%FLOWVIEWERDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%