sarg - first release

3 files changed, 40 insertions, 12 deletions

diff --git a/config/sarg/sarg_about.php b/config/sarg/sarg_about.php
index 81a4fa8b..ee415f07 100755
--- a/config/sarg/sarg_about.php
+++ b/config/sarg/sarg_about.php
@@ -71,16 +71,8 @@ include("head.inc");
 						<td colspan="2" valign="top" class="listtopic"><?=gettext("Help docs"); ?></td>
 						</tr>
 						<tr>
-                        <td width="22%" valign="top" class="vncell"><?=gettext("Copyright");?></td>
-						<td width="78%" class="vtable"><?=gettext("<a target=_new href='http://dansguardian.org/?page=copyright2'>Copyright and licensing for Dansguardian 2</a><br><br>");?>
-                        </tr>
-						<tr>
-                        <td width="22%" valign="top" class="vncell"><?=gettext("Blacklists");?></td>
-						<td width="78%" class="vtable"><?=gettext("<a target=_new href='http://www.squidguard.org/blacklists.html'>Dansguardian Blacklists</a><br><br>");?>
-                        </tr>
-						<tr>
-                        <td width="22%" valign="top" class="vncell"><?=gettext("Whatis");?></td>
-						<td width="78%" class="vtable"><?=gettext("<a target=_new href='http://dansguardian.org/?page=whatisdg'>What is Dansguardian</a><br><br>");?>
+                        <td width="22%" valign="top" class="vncell"><?=gettext("Sarg Site");?></td>
+						<td width="78%" class="vtable"><?=gettext("<a target=_new href='http://sarg.sourceforge.net/welcome.php'>Squid Analysis Report Generator</a><br><br>");?>
                         </tr>
                         <tr>
 						<td colspan="2" valign="top" class="listtopic"><?=gettext("About sarg package"); ?></td>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 62fbdbae..b91f119d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -446,10 +446,10 @@
 		<config_file>http://www.pfsense.com/packages/config/dansguardian/dansguardian.xml</config_file>
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,43786.0.html</pkginfolink>
 		<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>dansguardian-2.12.0.0_1.tbz</depends_on_package>
+		<depends_on_package>dansguardian-2.12.0.0.tbz</depends_on_package>
 		<depends_on_package>clamav-0.97.3_1.tbz</depends_on_package>
 		<depends_on_package>ca_root_nss-3.13.3.tbz</depends_on_package>
-		<version>2.12.0.0_1 pkg v.0.1.5.2</version>
+		<version>2.12.0.0 pkg v.0.1.5.2</version>
 		<status>beta</status>
 		<required_version>2.0</required_version>
 		<configurationfile>dansguardian.xml</configurationfile>
@@ -543,6 +543,24 @@
 		<noembedded>true</noembedded>
 	</package>
 	<package>
+		<name>Sarg</name>
+		<website>http://www.dansguardian.org/</website>
+		<descr><![CDATA[Sarg - Squid Analysis Report Generator is a tool that allow you to view "where" your users are going to on the Internet.<br>
+						Sarg provides many informations about Proxy(squid,squidguard or dansguardian) users activities: times, bytes, sites, etc...]]></descr>
+		<category>Network Report</category>
+		<config_file>http://www.pfsense.com/packages/config/sarg/sarg.xml</config_file>
+		<pkginfolink>http://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink>
+		<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/8/All/</depends_on_package_base_url>
+		<depends_on_package>sarg-2.3.2.tbz</depends_on_package>
+		<version>2.3.2 pkg v.0.1</version>
+		<status>beta</status>
+		<required_version>2.0</required_version>
+		<configurationfile>sarg.xml</configurationfile>
+		<build_port_path>/usr/ports/www/sarg</build_port_path>
+		<build_options>WITHOUT_GD=false WITHOUT_PHP=true</build_options>
+		<after_install_info>Please visit sarg settings on Status Menu to configure sarg.</after_install_info>
+	</package>
+	<package>
 		<name>Varnish</name>
 		<descr><![CDATA[Varnish is a state-of-the-art, high-performance HTTP accelerator.<br>
 						It uses the advanced features in FreeBSD 6/7/8 to achieve its high performance.]]></descr>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 4cf437ef..88eb45d1 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -633,6 +633,24 @@
 		<noembedded>true</noembedded>
 	</package>
 	<package>
+		<name>Sarg</name>
+		<website>http://www.dansguardian.org/</website>
+		<descr><![CDATA[Sarg - Squid Analysis Report Generator is a tool that allow you to view "where" your users are going to on the Internet.<br>
+						Sarg provides many informations about Proxy(squid,squidguard or dansguardian) users activities: times, bytes, sites, etc...]]></descr>
+		<category>Network Report</category>
+		<config_file>http://www.pfsense.com/packages/config/sarg/sarg.xml</config_file>
+		<pkginfolink>http://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink>
+		<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/amd64/8/All/</depends_on_package_base_url>
+		<depends_on_package>sarg-2.3.2.tbz</depends_on_package>
+		<version>2.3.2 pkg v.0.1</version>
+		<status>beta</status>
+		<required_version>2.0</required_version>
+		<configurationfile>sarg.xml</configurationfile>
+		<build_port_path>/usr/ports/www/sarg</build_port_path>
+		<build_options>WITHOUT_GD=false WITHOUT_PHP=true</build_options>
+		<after_install_info>Please visit sarg settings on Status Menu to configure sarg.</after_install_info>
+	</package>
+	<package>
 		<name>vnstat2</name>
 		<website>http://humdi.net/vnstat/</website>
 		<descr>A console-based network traffic monitor + vnstat PHP frontend</descr>