From owner-svn-ports-all@freebsd.org  Mon Jul 18 15:26:44 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ABB79B9DA82;
 Mon, 18 Jul 2016 15:26:44 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FBCE1ABE;
 Mon, 18 Jul 2016 15:26:44 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6IFQhW0096850;
 Mon, 18 Jul 2016 15:26:43 GMT (envelope-from adamw@FreeBSD.org)
Received: (from adamw@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6IFQhUb096844;
 Mon, 18 Jul 2016 15:26:43 GMT (envelope-from adamw@FreeBSD.org)
Message-Id: <201607181526.u6IFQhUb096844@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adamw set sender to
 adamw@FreeBSD.org using -f
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 18 Jul 2016 15:26:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418707 - in head: . www/awstats www/awstats/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jul 2016 15:26:44 -0000

Author: adamw
Date: Mon Jul 18 15:26:42 2016
New Revision: 418707
URL: https://svnweb.freebsd.org/changeset/ports/418707

Log:
  Update to 7.5. While here, completely rewrite the Makefile. Use sed
  instead of hard patches to minimize maintainership, and drastically
  simplify the installation process. Add some OPTIONS to handle
  dependencies on country lookups.
  
  Previously, the path to the icons was being manually changed from
  ".../icon" to ".../icons". With this update, the port now installs
  into the default location (.../icon). The awstatsicons alias will
  need to be manually updated for existing installations; this is
  explained in UPDATING.
  
  Also, I am taking this port from the previous maintainer. It has
  been over two years since he responded to a PR, and this is the
  third in a row that has had no response. Under section 5.5 of the
  PHB, I am considering this port to be abandoned. I'd like to thank
  Alex for all the time that he did spend maintaining this port.
  
  PR:		210821
  Approved by:	maintainer timeout (2 weeks)

Deleted:
  head/www/awstats/files/patch-tools-awstats_buildstaticpages.pl
  head/www/awstats/files/patch-tools-awstats_updateall.pl
  head/www/awstats/files/patch-wwwroot_cgi-bin_awstats.pl
Modified:
  head/UPDATING
  head/www/awstats/Makefile
  head/www/awstats/distinfo
  head/www/awstats/files/patch-tools-awstats_configure.pl
  head/www/awstats/files/pkg-message.in
  head/www/awstats/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Jul 18 14:52:11 2016	(r418706)
+++ head/UPDATING	Mon Jul 18 15:26:42 2016	(r418707)
@@ -6,6 +6,16 @@ You should get into the habit of checkin
 you update your ports collection, before attempting any port upgrades.
 
 
+20160718:
+  AFFECTS: users of www/awstats
+  AUTHOR: adamw@FreeBSD.org
+
+  The directory containing icons has changed from ".../icons" to ".../icon".
+  awstats has, in its suggested configuration file, contained an alias
+  from /awstatsicons. After applying the awstats-7.5 update, you must
+  update that alias to point to /usr/local/www/awstats/icon (just remove
+  the "s" at the end).
+
 20160708:
   AFFECTS: users of sysutils/screen
   AUTHOR: cy@FreeBSD.org

Modified: head/www/awstats/Makefile
==============================================================================
--- head/www/awstats/Makefile	Mon Jul 18 14:52:11 2016	(r418706)
+++ head/www/awstats/Makefile	Mon Jul 18 15:26:42 2016	(r418707)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	awstats
-PORTVERSION=	7.4
+PORTVERSION=	7.5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/AWStats/${PORTVERSION}
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
 LICENSE=	GPLv3
@@ -19,78 +19,62 @@ USES=		cpe dos2unix perl5 shebangfix
 CPE_VENDOR=	laurent_destailleur
 
 SHEBANG_FILES=	tools/*.pl wwwroot/cgi-bin/*.pl wwwroot/cgi-bin/plugins/*.pm
+DOS2UNIX_GLOB=	*.xml *.pm
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_PERL5=	run
-DOS2UNIX_GLOB=	tools/*.pl \
-		wwwroot/cgi-bin/awstats.model.conf \
-		wwwroot/cgi-bin/*.pl \
-		wwwroot/cgi-bin/lang/tooltips_f/*.txt \
-		wwwroot/cgi-bin/lang/tooltips_m/*.txt \
-		wwwroot/cgi-bin/lang/tooltips_w/*.txt \
-		wwwroot/cgi-bin/lang/*.txt \
-		wwwroot/cgi-bin/lib/* \
-		wwwroot/cgi-bin/plugins/*.pm \
-		wwwroot/cgi-bin/plugins/example/* \
-		wwwroot/css/* \
-		wwwroot/js/*
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS IPV6
+OPTIONS_RADIO=	GEO
 
+OPTIONS_RADIO_GEO=	GEOIP GEOIPFREE
+GEO_DESC=	Identify country of source IPs
+GEOIP_DESC=	Country lookups via Geo::IP
+GEOIPFREE_DESC=	Country lookups via Geo::IPfree
+
+GEOIP_RUN_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP
+GEOIPFREE_RUN_DEPENDS=	p5-Geo-IPfree>=0:net/p5-Geo-IPfree
 IPV6_RUN_DEPENDS=	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
 			p5-Net-DNS>=0:dns/p5-Net-DNS
 
+pre-patch:
+# This file is so messed up, not even dos2unix can fix it
+	@fixme="${WRKSRC}/wwwroot/cgi-bin/plugins/export_to_csv.pm" && \
+		${TR} '\r' '\n' < $$fixme > $$fixme.new && \
+		${MV} $$fixme.new $$fixme
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/tools/awstats_buildstaticpages.pl \
-		${WRKSRC}/tools/awstats_configure.pl \
-		${WRKSRC}/tools/awstats_updateall.pl \
-		${WRKSRC}/wwwroot/cgi-bin/awstats.pl
+	@${REINPLACE_CMD} -E -e 's|/usr/local/etc/awstats|${ETCDIR}|' \
+			-e 's|/etc/awstats/(awstats.model.conf)|${ETCDIR}/\1|' \
+			-e 's,/usr/(local|share)/awstats/wwwroot,${WWWDIR},' \
+		${WRKSRC}/tools/*.pl \
+		${WRKSRC}/tools/httpd_conf \
+		${WRKSRC}/tools/nginx/* \
+		${WRKSRC}/wwwroot/cgi-bin/*.pl \
+		${WRKSRC}/wwwroot/cgi-bin/*.conf
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+			-e 's|%%WWWDIR%%|${WWWDIR}|' \
+			-e 's|AWSTATS_PATH/wwwroot|AWSTATS_PATH|' \
+		${WRKSRC}/tools/awstats_configure.pl
+
+pre-install:
+.for f in dolibarr httpd_conf nginx webmin
+	@${MV} ${WRKSRC}/tools/$f ${WRKSRC}/docs
+.endfor
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/tools/webmin
-	(cd ${WRKSRC}/tools && ${INSTALL_SCRIPT} awstats_buildstaticpages.pl \
-		awstats_configure.pl awstats_exportlib.pl awstats_updateall.pl \
-		logresolvemerge.pl maillogconvert.pl urlaliasbuilder.pl \
-		${STAGEDIR}${WWWDIR}/tools)
-	(cd ${WRKSRC}/tools && ${COPYTREE_SHARE} xslt ${STAGEDIR}${WWWDIR}/tools)
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin
-	(cd ${WRKSRC}/wwwroot/cgi-bin && ${INSTALL_SCRIPT} awredir.pl awstats.pl \
-		awstats.model.conf ${STAGEDIR}${WWWDIR}/cgi-bin)
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/lang/tooltips_f
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_f/*.txt \
-		${STAGEDIR}${WWWDIR}/cgi-bin/lang/tooltips_f
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/lang/tooltips_m
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_m/*.txt \
-		${STAGEDIR}${WWWDIR}/cgi-bin/lang/tooltips_m
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/lang/tooltips_w
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_w/*.txt \
-		${STAGEDIR}${WWWDIR}/cgi-bin/lang/tooltips_w
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/*.txt \
-		${STAGEDIR}${WWWDIR}/cgi-bin/lang
-	(cd ${WRKSRC}/wwwroot/cgi-bin && ${COPYTREE_SHARE} lib \
-		${STAGEDIR}${WWWDIR}/cgi-bin)
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/cgi-bin/plugins
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm \
-		${STAGEDIR}${WWWDIR}/cgi-bin/plugins
-	(cd ${WRKSRC}/wwwroot/cgi-bin/plugins && ${COPYTREE_SHARE} example \
-		${STAGEDIR}${WWWDIR}/cgi-bin/plugins)
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} tools ${STAGEDIR}${WWWDIR})
+	(cd ${WRKSRC}/wwwroot && ${COPYTREE_SHARE} "cgi-bin css icon js" ${STAGEDIR}${WWWDIR})
+
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/classes
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/classes/awgraphapplet.jar \
-		${STAGEDIR}${WWWDIR}/classes
-	(cd ${WRKSRC}/wwwroot && ${COPYTREE_SHARE} "js css" ${STAGEDIR}${WWWDIR})
-	(cd ${WRKSRC}/wwwroot/icon && ${COPYTREE_SHARE} "browser clock cpu \
-		flags mime os other" ${STAGEDIR}${WWWDIR}/icons)
-
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "* Use ${WWWDIR}/tools/awstats_configure.pl to setup your hosts."
-	@${ECHO_CMD} ""
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/classes/awgraphapplet.jar ${STAGEDIR}${WWWDIR}/classes
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR})
-	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/www/awstats/distinfo
==============================================================================
--- head/www/awstats/distinfo	Mon Jul 18 14:52:11 2016	(r418706)
+++ head/www/awstats/distinfo	Mon Jul 18 15:26:42 2016	(r418707)
@@ -1,2 +1,3 @@
-SHA256 (awstats-7.4.tar.gz) = 43abfe7341c2be64f55bb89557347475640ca7ba4473ff30412a3d44358dab55
-SIZE (awstats-7.4.tar.gz) = 2936102
+TIMESTAMP = 1467647076
+SHA256 (awstats-7.5.tar.gz) = 83c34bdeab9c277c14bea348c2d320f4a1e808388264139821c6bd6dfd1394f8
+SIZE (awstats-7.5.tar.gz) = 2936644

Modified: head/www/awstats/files/patch-tools-awstats_configure.pl
==============================================================================
--- head/www/awstats/files/patch-tools-awstats_configure.pl	Mon Jul 18 14:52:11 2016	(r418706)
+++ head/www/awstats/files/patch-tools-awstats_configure.pl	Mon Jul 18 15:26:42 2016	(r418707)
@@ -1,88 +1,38 @@
---- tools/awstats_configure.pl.orig	2015-07-21 07:55:55 UTC
+--- tools/awstats_configure.pl.orig	2016-07-17 17:51:11 UTC
 +++ tools/awstats_configure.pl
-@@ -27,12 +27,13 @@
+@@ -27,7 +27,7 @@ $AWSTATS_CGI_PATH
  $AWSTATS_MODEL_CONFIG
  $AWSTATS_DIRDATA_PATH
  /;
 -$AWSTATS_PATH='';
--$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
--$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
--$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
--$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
--$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf';		# Used only when configure ran on linux
-+$AWSTATS_PATH='%%PREFIX%%/www/awstats';
-+$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon';
-+$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css';
-+$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes';
-+$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin';
-+$AWSTATS_MODEL_CONFIG='%%PREFIX%%/etc/awstats/awstats.model.conf';		
-+# Used only when configure ran on linux
- $AWSTATS_DIRDATA_PATH='/var/lib/awstats';						# Used only when configure ran on linux
- 
- 
-@@ -63,6 +64,7 @@
++$AWSTATS_PATH='%%WWWDIR%%';
+ $AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
+ $AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
+ $AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
+@@ -63,6 +63,9 @@ use vars qw/
  '/etc/httpd/httpd.conf',
  '/usr/local/apache/conf/httpd.conf',
  '/usr/local/apache2/conf/httpd.conf',
-+'%%PREFIX%%/etc/apache(13/22)/httpd.conf',
++'%%LOCALBASE%%/etc/apache13/httpd.conf',
++'%%LOCALBASE%%/etc/apache22/httpd.conf',
++'%%LOCALBASE%%/etc/apache24/httpd.conf'
  );
  
  use vars qw/
-@@ -308,7 +310,8 @@
+@@ -308,7 +311,7 @@ if ($OS eq 'linux') {
  	$AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//;
  	$AWSTATS_PATH=~s/tools[\\\/]?$//;
  	$AWSTATS_PATH=~s/[\\\/]$//;
 -	if ($AWSTATS_PATH ne '/usr/local/awstats') {
-+#freebsd default %%PREFIX%%/www/awstats
-+	if ($AWSTATS_PATH ne '%%PREFIX%%/www/awstats') {
++	if ($AWSTATS_PATH ne '%%WWWDIR%%') {
  		print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n";
  		print "If you want to use standard directory, you should first move all content\n";
  		print "of AWStats distribution from current directory:\n";
-@@ -323,10 +326,10 @@
- 			print "configure.pl aborted.\n";
- 			exit 1;
- 		}
--		$AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon";
--		$AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css";
--		$AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes";
--		$AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin";
-+		$AWSTATS_ICON_PATH="$AWSTATS_PATH/icon";
-+		$AWSTATS_CSS_PATH="$AWSTATS_PATH/css";
-+		$AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
-+		$AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
- 	}
- }
- elsif ($OS eq 'macosx') {
-@@ -419,6 +422,7 @@
+@@ -419,6 +422,7 @@ if (! scalar keys %ApacheConfPath) {
  
  		print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
  		print "Example: /etc/httpd/httpd.conf\n";
-+		print "Example: %%PREFIX%%/etc/apache(22/24)/httpd.conf";
++		print "Example: %%LOCALBASE%%/etc/apache24/httpd.conf\n";
  		print "Example: /usr/local/apache2/conf/httpd.conf\n";
  		print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
  		$bidon='';
-@@ -526,7 +530,7 @@
- #
- # This is to permit URL access to scripts/files in AWStats directory.
- #
--<Directory "$AWSTATS_PATH/wwwroot">
-+<Directory "$AWSTATS_PATH/">
-     Options None
-     AllowOverride None
-     Order allow,deny
-@@ -545,12 +549,12 @@
- # -----------------------------
- my $modelfile='';
- if ($OS eq 'linux') 		{ 
--	if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") {
--		$modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
-+	if (-f "$AWSTATS_PATH/cgi-bin/awstats.model.conf") {
-+		$modelfile="$AWSTATS_PATH/cgi-bin/awstats.model.conf";
- 	}
- 	else {
- 		$modelfile="$AWSTATS_MODEL_CONFIG";
--		if (! -s $modelfile || ! -w $modelfile) { $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf"; }
-+		if (! -s $modelfile || ! -w $modelfile) { $modelfile="$AWSTATS_PATH/cgi-bin/awstats.model.conf"; }
- 	}
- }
- elsif ($OS eq "macosx") 		{ 

Modified: head/www/awstats/files/pkg-message.in
==============================================================================
--- head/www/awstats/files/pkg-message.in	Mon Jul 18 14:52:11 2016	(r418706)
+++ head/www/awstats/files/pkg-message.in	Mon Jul 18 15:26:42 2016	(r418707)
@@ -1,32 +1,10 @@
-*****************************************************************
-Please add the following to your apache config, and restart.
+*********************************************************************
 
-#
-# Directives to allow use of AWStats as a CGI
-#
-Alias /awstatsclasses "%%PREFIX%%/www/awstats/classes/"
-Alias /awstatscss "%%PREFIX%%/www/awstats/css/"
-Alias /awstatsicons "%%PREFIX%%/www/awstats/icons/"
-ScriptAlias /awstats/ "%%PREFIX%%/www/awstats/cgi-bin/"
+Use %%PREFIX%%/www/awstats/tools/awstats_configure.pl to set up your
+hosts.
 
-#
-# This is to permit URL access to scripts/files in AWStats directory.
-#
-<Directory "%%PREFIX%%/www/awstats/">
-    Options None
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
+To activate awstats in your webserver, see the example files for
+apache: %%DOCSDIR%%/httpd_conf
+nginx:  %%DOCSDIR%%/nginx/
 
-*****************************************************************
-
-If you are upgrading from AWStats 6.4 or older, please note the following:
-
-If you used the geoip plugin, you must edit your AWStats config file
-to change the line
- LoadPlugin="geoip GEOIP_STANDARD"
-into
- LoadPlugin="geoip GEOIP_STANDARD /pathto/GeoIP.dat"
-
-*****************************************************************
+*********************************************************************

Modified: head/www/awstats/pkg-plist
==============================================================================
--- head/www/awstats/pkg-plist	Mon Jul 18 14:52:11 2016	(r418706)
+++ head/www/awstats/pkg-plist	Mon Jul 18 15:26:42 2016	(r418707)
@@ -20,7 +20,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/awstats_upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/awstats_webmin.html
 %%PORTDOCS%%%%DOCSDIR%%/awstats_what.html
+%%PORTDOCS%%%%DOCSDIR%%/dolibarr/README.md
+%%PORTDOCS%%%%DOCSDIR%%/httpd_conf
+%%PORTDOCS%%%%DOCSDIR%%/images/awstats.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/awstats.ico
+%%PORTDOCS%%%%DOCSDIR%%/images/awstats.png
 %%PORTDOCS%%%%DOCSDIR%%/images/awstats.svg
 %%PORTDOCS%%%%DOCSDIR%%/images/awstats_250x250.png
 %%PORTDOCS%%%%DOCSDIR%%/images/awstats_ban_460x270.jpg
@@ -56,14 +60,30 @@
 %%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_4.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/screen_shot_large_5.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/star.png
-%%PORTDOCS%%%%DOCSDIR%%/images/awstats.png
-%%PORTDOCS%%%%DOCSDIR%%/images/awstats.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/nginx/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/nginx/awstats-fcgi.php
+%%PORTDOCS%%%%DOCSDIR%%/nginx/awstats-nginx.conf
 %%PORTDOCS%%%%DOCSDIR%%/pad_awstats.xml
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-apollo.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-css.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-hs.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-lisp.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-lua.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-ml.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-proto.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-sql.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-vb.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/lang-wiki.js
+%%PORTDOCS%%%%DOCSDIR%%/scripts/prettify.css
+%%PORTDOCS%%%%DOCSDIR%%/scripts/prettify.js
 %%PORTDOCS%%%%DOCSDIR%%/styles.css
-%%WWWDIR%%/cgi-bin/awredir.pl
+%%PORTDOCS%%%%DOCSDIR%%/webmin/README.md
+%%PORTDOCS%%%%DOCSDIR%%/webmin/awstats-2.0.wbm
+@(,,755) %%WWWDIR%%/cgi-bin/awdownloadcsv.pl
+@(,,755) %%WWWDIR%%/cgi-bin/awredir.pl
 %%WWWDIR%%/cgi-bin/awstats.model.conf
-%%WWWDIR%%/cgi-bin/awstats.pl
+@(,,755) %%WWWDIR%%/cgi-bin/awstats.pl
 %%WWWDIR%%/cgi-bin/lang/awstats-al.txt
 %%WWWDIR%%/cgi-bin/lang/awstats-ar.txt
 %%WWWDIR%%/cgi-bin/lang/awstats-ba.txt
@@ -198,582 +218,584 @@
 %%WWWDIR%%/classes/awgraphapplet.jar
 %%WWWDIR%%/css/awstats_bw.css
 %%WWWDIR%%/css/awstats_default.css
-%%WWWDIR%%/icons/browser/adobe.png
-%%WWWDIR%%/icons/browser/alcatel.png
-%%WWWDIR%%/icons/browser/amaya.png
-%%WWWDIR%%/icons/browser/amigavoyager.png
-%%WWWDIR%%/icons/browser/android.png
-%%WWWDIR%%/icons/browser/apt.png
-%%WWWDIR%%/icons/browser/avant.png
-%%WWWDIR%%/icons/browser/aweb.png
-%%WWWDIR%%/icons/browser/bpftp.png
-%%WWWDIR%%/icons/browser/bytel.png
-%%WWWDIR%%/icons/browser/chimera.png
-%%WWWDIR%%/icons/browser/chrome.png
-%%WWWDIR%%/icons/browser/cyberdog.png
-%%WWWDIR%%/icons/browser/da.png
-%%WWWDIR%%/icons/browser/dillo.png
-%%WWWDIR%%/icons/browser/dreamcast.png
-%%WWWDIR%%/icons/browser/ecatch.png
-%%WWWDIR%%/icons/browser/encompass.png
-%%WWWDIR%%/icons/browser/epiphany.png
-%%WWWDIR%%/icons/browser/ericsson.png
-%%WWWDIR%%/icons/browser/feeddemon.png
-%%WWWDIR%%/icons/browser/feedreader.png
-%%WWWDIR%%/icons/browser/firefox.png
-%%WWWDIR%%/icons/browser/flock.png
-%%WWWDIR%%/icons/browser/fpexpress.png
-%%WWWDIR%%/icons/browser/fresco.png
-%%WWWDIR%%/icons/browser/galeon.png
-%%WWWDIR%%/icons/browser/getright.png
-%%WWWDIR%%/icons/browser/gozilla.png
-%%WWWDIR%%/icons/browser/hotjava.png
-%%WWWDIR%%/icons/browser/ibrowse.png
-%%WWWDIR%%/icons/browser/icab.png
-%%WWWDIR%%/icons/browser/icecat.png
-%%WWWDIR%%/icons/browser/iceweasel.png
-%%WWWDIR%%/icons/browser/java.png
-%%WWWDIR%%/icons/browser/jetbrains_omea.png
-%%WWWDIR%%/icons/browser/kmeleon.png
-%%WWWDIR%%/icons/browser/konqueror.png
-%%WWWDIR%%/icons/browser/lg.png
-%%WWWDIR%%/icons/browser/lotusnotes.png
-%%WWWDIR%%/icons/browser/lynx.png
-%%WWWDIR%%/icons/browser/macweb.png
-%%WWWDIR%%/icons/browser/mediaplayer.png
-%%WWWDIR%%/icons/browser/mozilla.png
-%%WWWDIR%%/icons/browser/motorola.png
-%%WWWDIR%%/icons/browser/mplayer.png
-%%WWWDIR%%/icons/browser/msie.png
-%%WWWDIR%%/icons/browser/msie_large.png
-%%WWWDIR%%/icons/browser/multizilla.png
-%%WWWDIR%%/icons/browser/ncsa_mosaic.png
-%%WWWDIR%%/icons/browser/netnewswire.png
-%%WWWDIR%%/icons/browser/netpositive.png
-%%WWWDIR%%/icons/browser/netscape.png
-%%WWWDIR%%/icons/browser/netscape_large.png
-%%WWWDIR%%/icons/browser/netshow.png
-%%WWWDIR%%/icons/browser/newsfire.png
-%%WWWDIR%%/icons/browser/newsgator.png
-%%WWWDIR%%/icons/browser/newzcrawler.png
-%%WWWDIR%%/icons/browser/nokia.png
-%%WWWDIR%%/icons/browser/notavailable.png
-%%WWWDIR%%/icons/browser/omniweb.png
-%%WWWDIR%%/icons/browser/opera.png
-%%WWWDIR%%/icons/browser/panasonic.png
-%%WWWDIR%%/icons/browser/pdaphone.png
-%%WWWDIR%%/icons/browser/philips.png
-%%WWWDIR%%/icons/browser/phoenix.png
-%%WWWDIR%%/icons/browser/pluck.png
-%%WWWDIR%%/icons/browser/pulpfiction.png
-%%WWWDIR%%/icons/browser/real.png
-%%WWWDIR%%/icons/browser/rss.png
-%%WWWDIR%%/icons/browser/rssbandit.png
-%%WWWDIR%%/icons/browser/rssowl.png
-%%WWWDIR%%/icons/browser/rssreader.png
-%%WWWDIR%%/icons/browser/safari.png
-%%WWWDIR%%/icons/browser/sagem.png
-%%WWWDIR%%/icons/browser/samsung.png
-%%WWWDIR%%/icons/browser/seamonkey.png
-%%WWWDIR%%/icons/browser/sharp.png
-%%WWWDIR%%/icons/browser/sharpreader.png
-%%WWWDIR%%/icons/browser/shrook.png
-%%WWWDIR%%/icons/browser/siemens.png
-%%WWWDIR%%/icons/browser/sony.png
-%%WWWDIR%%/icons/browser/staroffice.png
-%%WWWDIR%%/icons/browser/teleport.png
-%%WWWDIR%%/icons/browser/trium.png
-%%WWWDIR%%/icons/browser/unknown.png
-%%WWWDIR%%/icons/browser/w3c.png
-%%WWWDIR%%/icons/browser/webcopier.png
-%%WWWDIR%%/icons/browser/webtv.png
-%%WWWDIR%%/icons/browser/webzip.png
-%%WWWDIR%%/icons/browser/abilon.png
-%%WWWDIR%%/icons/browser/akregator.png
-%%WWWDIR%%/icons/browser/analogx.png
-%%WWWDIR%%/icons/browser/doris.png
-%%WWWDIR%%/icons/browser/flashget.png
-%%WWWDIR%%/icons/browser/freshdownload.png
-%%WWWDIR%%/icons/browser/frontpage.png
-%%WWWDIR%%/icons/browser/gnome.png
-%%WWWDIR%%/icons/browser/gnus.png
-%%WWWDIR%%/icons/browser/httrack.png
-%%WWWDIR%%/icons/browser/leechget.png
-%%WWWDIR%%/icons/browser/neon.png
-%%WWWDIR%%/icons/browser/rssxpress.png
-%%WWWDIR%%/icons/browser/subversion.png
-%%WWWDIR%%/icons/browser/webreaper.png
-%%WWWDIR%%/icons/browser/winxbox.png
-%%WWWDIR%%/icons/browser/wizz.png
-%%WWWDIR%%/icons/clock/hr1.png
-%%WWWDIR%%/icons/clock/hr10.png
-%%WWWDIR%%/icons/clock/hr11.png
-%%WWWDIR%%/icons/clock/hr12.png
-%%WWWDIR%%/icons/clock/hr2.png
-%%WWWDIR%%/icons/clock/hr3.png
-%%WWWDIR%%/icons/clock/hr4.png
-%%WWWDIR%%/icons/clock/hr5.png
-%%WWWDIR%%/icons/clock/hr6.png
-%%WWWDIR%%/icons/clock/hr7.png
-%%WWWDIR%%/icons/clock/hr8.png
-%%WWWDIR%%/icons/clock/hr9.png
-%%WWWDIR%%/icons/cpu/digital.png
-%%WWWDIR%%/icons/cpu/hp.png
-%%WWWDIR%%/icons/cpu/ibm.png
-%%WWWDIR%%/icons/cpu/intel.png
-%%WWWDIR%%/icons/cpu/java.png
-%%WWWDIR%%/icons/cpu/mips.png
-%%WWWDIR%%/icons/cpu/motorola.png
-%%WWWDIR%%/icons/cpu/sun.png
-%%WWWDIR%%/icons/cpu/unknown.png
-%%WWWDIR%%/icons/flags/sl.png
-%%WWWDIR%%/icons/flags/me.png
-%%WWWDIR%%/icons/flags/gg.png
-%%WWWDIR%%/icons/flags/ax.png
-%%WWWDIR%%/icons/flags/a2.png
-%%WWWDIR%%/icons/flags/ac.png
-%%WWWDIR%%/icons/flags/ad.png
-%%WWWDIR%%/icons/flags/ae.png
-%%WWWDIR%%/icons/flags/aero.png
-%%WWWDIR%%/icons/flags/af.png
-%%WWWDIR%%/icons/flags/ag.png
-%%WWWDIR%%/icons/flags/ai.png
-%%WWWDIR%%/icons/flags/al.png
-%%WWWDIR%%/icons/flags/am.png
-%%WWWDIR%%/icons/flags/an.png
-%%WWWDIR%%/icons/flags/ao.png
-%%WWWDIR%%/icons/flags/aq.png
-%%WWWDIR%%/icons/flags/ar.png
-%%WWWDIR%%/icons/flags/arpa.png
-%%WWWDIR%%/icons/flags/as.png
-%%WWWDIR%%/icons/flags/at.png
-%%WWWDIR%%/icons/flags/au.png
-%%WWWDIR%%/icons/flags/aw.png
-%%WWWDIR%%/icons/flags/az.png
-%%WWWDIR%%/icons/flags/ba.png
-%%WWWDIR%%/icons/flags/bb.png
-%%WWWDIR%%/icons/flags/bd.png
-%%WWWDIR%%/icons/flags/be.png
-%%WWWDIR%%/icons/flags/bf.png
-%%WWWDIR%%/icons/flags/bg.png
-%%WWWDIR%%/icons/flags/bh.png
-%%WWWDIR%%/icons/flags/bi.png
-%%WWWDIR%%/icons/flags/biz.png
-%%WWWDIR%%/icons/flags/bj.png
-%%WWWDIR%%/icons/flags/bm.png
-%%WWWDIR%%/icons/flags/bn.png
-%%WWWDIR%%/icons/flags/bo.png
-%%WWWDIR%%/icons/flags/br.png
-%%WWWDIR%%/icons/flags/bs.png
-%%WWWDIR%%/icons/flags/bt.png
-%%WWWDIR%%/icons/flags/bv.png
-%%WWWDIR%%/icons/flags/bw.png
-%%WWWDIR%%/icons/flags/by.png
-%%WWWDIR%%/icons/flags/bz.png
-%%WWWDIR%%/icons/flags/ca.png
-%%WWWDIR%%/icons/flags/cc.png
-%%WWWDIR%%/icons/flags/cd.png
-%%WWWDIR%%/icons/flags/cf.png
-%%WWWDIR%%/icons/flags/cg.png
-%%WWWDIR%%/icons/flags/ch.png
-%%WWWDIR%%/icons/flags/ci.png
-%%WWWDIR%%/icons/flags/ck.png
-%%WWWDIR%%/icons/flags/cl.png
-%%WWWDIR%%/icons/flags/cm.png
-%%WWWDIR%%/icons/flags/cn.png
-%%WWWDIR%%/icons/flags/co.png
-%%WWWDIR%%/icons/flags/com.png
-%%WWWDIR%%/icons/flags/coop.png
-%%WWWDIR%%/icons/flags/cr.png
-%%WWWDIR%%/icons/flags/cs.png
-%%WWWDIR%%/icons/flags/cu.png
-%%WWWDIR%%/icons/flags/cv.png
-%%WWWDIR%%/icons/flags/cx.png
-%%WWWDIR%%/icons/flags/cy.png
-%%WWWDIR%%/icons/flags/cz.png
-%%WWWDIR%%/icons/flags/de.png
-%%WWWDIR%%/icons/flags/dj.png
-%%WWWDIR%%/icons/flags/dk.png
-%%WWWDIR%%/icons/flags/dm.png
-%%WWWDIR%%/icons/flags/do.png
-%%WWWDIR%%/icons/flags/dz.png
-%%WWWDIR%%/icons/flags/ec.png
-%%WWWDIR%%/icons/flags/edu.png
-%%WWWDIR%%/icons/flags/ee.png
-%%WWWDIR%%/icons/flags/eg.png
-%%WWWDIR%%/icons/flags/eh.png
-%%WWWDIR%%/icons/flags/en.png
-%%WWWDIR%%/icons/flags/er.png
-%%WWWDIR%%/icons/flags/es.png
-%%WWWDIR%%/icons/flags/es_cat.png
-%%WWWDIR%%/icons/flags/es_eu.png
-%%WWWDIR%%/icons/flags/et.png
-%%WWWDIR%%/icons/flags/eu.png
-%%WWWDIR%%/icons/flags/fi.png
-%%WWWDIR%%/icons/flags/fj.png
-%%WWWDIR%%/icons/flags/fk.png
-%%WWWDIR%%/icons/flags/fm.png
-%%WWWDIR%%/icons/flags/fo.png
-%%WWWDIR%%/icons/flags/fr.png
-%%WWWDIR%%/icons/flags/fx.png
-%%WWWDIR%%/icons/flags/ga.png
-%%WWWDIR%%/icons/flags/gb.png
-%%WWWDIR%%/icons/flags/gd.png
-%%WWWDIR%%/icons/flags/ge.png
-%%WWWDIR%%/icons/flags/gf.png
-%%WWWDIR%%/icons/flags/gh.png
-%%WWWDIR%%/icons/flags/gi.png
-%%WWWDIR%%/icons/flags/gl.png
-%%WWWDIR%%/icons/flags/glg.png
-%%WWWDIR%%/icons/flags/gm.png
-%%WWWDIR%%/icons/flags/gn.png
-%%WWWDIR%%/icons/flags/gov.png
-%%WWWDIR%%/icons/flags/gp.png
-%%WWWDIR%%/icons/flags/gq.png
-%%WWWDIR%%/icons/flags/gr.png
-%%WWWDIR%%/icons/flags/gs.png
-%%WWWDIR%%/icons/flags/gt.png
-%%WWWDIR%%/icons/flags/gu.png
-%%WWWDIR%%/icons/flags/gw.png
-%%WWWDIR%%/icons/flags/gy.png
-%%WWWDIR%%/icons/flags/hk.png
-%%WWWDIR%%/icons/flags/hm.png
-%%WWWDIR%%/icons/flags/hn.png
-%%WWWDIR%%/icons/flags/hr.png
-%%WWWDIR%%/icons/flags/ht.png
-%%WWWDIR%%/icons/flags/hu.png
-%%WWWDIR%%/icons/flags/i0.png
-%%WWWDIR%%/icons/flags/id.png
-%%WWWDIR%%/icons/flags/ie.png
-%%WWWDIR%%/icons/flags/il.png
-%%WWWDIR%%/icons/flags/im.png
-%%WWWDIR%%/icons/flags/in.png
-%%WWWDIR%%/icons/flags/info.png
-%%WWWDIR%%/icons/flags/int.png
-%%WWWDIR%%/icons/flags/io.png
-%%WWWDIR%%/icons/flags/ip.png
-%%WWWDIR%%/icons/flags/iq.png
-%%WWWDIR%%/icons/flags/ir.png
-%%WWWDIR%%/icons/flags/is.png
-%%WWWDIR%%/icons/flags/it.png
-%%WWWDIR%%/icons/flags/jm.png
-%%WWWDIR%%/icons/flags/jo.png
-%%WWWDIR%%/icons/flags/jp.png
-%%WWWDIR%%/icons/flags/ke.png
-%%WWWDIR%%/icons/flags/kg.png
-%%WWWDIR%%/icons/flags/kh.png
-%%WWWDIR%%/icons/flags/ki.png
-%%WWWDIR%%/icons/flags/km.png
-%%WWWDIR%%/icons/flags/kn.png
-%%WWWDIR%%/icons/flags/kp.png
-%%WWWDIR%%/icons/flags/kr.png
-%%WWWDIR%%/icons/flags/kw.png
-%%WWWDIR%%/icons/flags/ky.png
-%%WWWDIR%%/icons/flags/kz.png
-%%WWWDIR%%/icons/flags/la.png
-%%WWWDIR%%/icons/flags/lb.png
-%%WWWDIR%%/icons/flags/lc.png
-%%WWWDIR%%/icons/flags/li.png
-%%WWWDIR%%/icons/flags/lk.png
-%%WWWDIR%%/icons/flags/lr.png
-%%WWWDIR%%/icons/flags/ls.png
-%%WWWDIR%%/icons/flags/lt.png
-%%WWWDIR%%/icons/flags/lu.png
-%%WWWDIR%%/icons/flags/lv.png
-%%WWWDIR%%/icons/flags/ly.png
-%%WWWDIR%%/icons/flags/ma.png
-%%WWWDIR%%/icons/flags/mc.png
-%%WWWDIR%%/icons/flags/md.png
-%%WWWDIR%%/icons/flags/mg.png
-%%WWWDIR%%/icons/flags/mil.png
-%%WWWDIR%%/icons/flags/mk.png
-%%WWWDIR%%/icons/flags/ml.png
-%%WWWDIR%%/icons/flags/mm.png
-%%WWWDIR%%/icons/flags/mn.png
-%%WWWDIR%%/icons/flags/mo.png
-%%WWWDIR%%/icons/flags/mp.png
-%%WWWDIR%%/icons/flags/mq.png
-%%WWWDIR%%/icons/flags/mr.png
-%%WWWDIR%%/icons/flags/ms.png
-%%WWWDIR%%/icons/flags/mt.png
-%%WWWDIR%%/icons/flags/mu.png
-%%WWWDIR%%/icons/flags/museum.png
-%%WWWDIR%%/icons/flags/mv.png
-%%WWWDIR%%/icons/flags/mw.png
-%%WWWDIR%%/icons/flags/mx.png
-%%WWWDIR%%/icons/flags/my.png
-%%WWWDIR%%/icons/flags/mz.png
-%%WWWDIR%%/icons/flags/na.png
-%%WWWDIR%%/icons/flags/name.png
-%%WWWDIR%%/icons/flags/nato.png
-%%WWWDIR%%/icons/flags/nb.png
-%%WWWDIR%%/icons/flags/nc.png
-%%WWWDIR%%/icons/flags/ne.png
-%%WWWDIR%%/icons/flags/net.png
-%%WWWDIR%%/icons/flags/ng.png
-%%WWWDIR%%/icons/flags/ni.png
-%%WWWDIR%%/icons/flags/nl.png
-%%WWWDIR%%/icons/flags/nn.png
-%%WWWDIR%%/icons/flags/no.png
-%%WWWDIR%%/icons/flags/np.png
-%%WWWDIR%%/icons/flags/nr.png
-%%WWWDIR%%/icons/flags/nt.png
-%%WWWDIR%%/icons/flags/nu.png
-%%WWWDIR%%/icons/flags/nz.png
-%%WWWDIR%%/icons/flags/om.png
-%%WWWDIR%%/icons/flags/org.png
-%%WWWDIR%%/icons/flags/pa.png
-%%WWWDIR%%/icons/flags/pe.png
-%%WWWDIR%%/icons/flags/pf.png
-%%WWWDIR%%/icons/flags/pg.png
-%%WWWDIR%%/icons/flags/ph.png
-%%WWWDIR%%/icons/flags/pk.png
-%%WWWDIR%%/icons/flags/pl.png
-%%WWWDIR%%/icons/flags/pr.png
-%%WWWDIR%%/icons/flags/pro.png
-%%WWWDIR%%/icons/flags/ps.png
-%%WWWDIR%%/icons/flags/pt.png
-%%WWWDIR%%/icons/flags/py.png
-%%WWWDIR%%/icons/flags/qa.png
-%%WWWDIR%%/icons/flags/re.png
-%%WWWDIR%%/icons/flags/ro.png
-%%WWWDIR%%/icons/flags/rs.png
-%%WWWDIR%%/icons/flags/ru.png
-%%WWWDIR%%/icons/flags/rw.png
-%%WWWDIR%%/icons/flags/sa.png
-%%WWWDIR%%/icons/flags/sb.png
-%%WWWDIR%%/icons/flags/sc.png
-%%WWWDIR%%/icons/flags/sd.png
-%%WWWDIR%%/icons/flags/se.png
-%%WWWDIR%%/icons/flags/sg.png
-%%WWWDIR%%/icons/flags/si.png
-%%WWWDIR%%/icons/flags/sk.png
-%%WWWDIR%%/icons/flags/sm.png
-%%WWWDIR%%/icons/flags/sn.png
-%%WWWDIR%%/icons/flags/sr.png
-%%WWWDIR%%/icons/flags/st.png
-%%WWWDIR%%/icons/flags/su.png
-%%WWWDIR%%/icons/flags/sv.png
-%%WWWDIR%%/icons/flags/sy.png
-%%WWWDIR%%/icons/flags/sz.png
-%%WWWDIR%%/icons/flags/tc.png
-%%WWWDIR%%/icons/flags/td.png
-%%WWWDIR%%/icons/flags/tf.png
-%%WWWDIR%%/icons/flags/tg.png
-%%WWWDIR%%/icons/flags/th.png
-%%WWWDIR%%/icons/flags/tk.png
-%%WWWDIR%%/icons/flags/tm.png
-%%WWWDIR%%/icons/flags/tn.png
-%%WWWDIR%%/icons/flags/to.png
-%%WWWDIR%%/icons/flags/tr.png
-%%WWWDIR%%/icons/flags/tt.png
-%%WWWDIR%%/icons/flags/tv.png
-%%WWWDIR%%/icons/flags/tw.png
-%%WWWDIR%%/icons/flags/tz.png
-%%WWWDIR%%/icons/flags/ua.png
-%%WWWDIR%%/icons/flags/ug.png
-%%WWWDIR%%/icons/flags/uk.png
-%%WWWDIR%%/icons/flags/um.png
-%%WWWDIR%%/icons/flags/unknown.png
-%%WWWDIR%%/icons/flags/us.png
-%%WWWDIR%%/icons/flags/uy.png
-%%WWWDIR%%/icons/flags/uz.png
-%%WWWDIR%%/icons/flags/va.png
-%%WWWDIR%%/icons/flags/vc.png
-%%WWWDIR%%/icons/flags/ve.png
-%%WWWDIR%%/icons/flags/vg.png
-%%WWWDIR%%/icons/flags/vi.png
-%%WWWDIR%%/icons/flags/vn.png
-%%WWWDIR%%/icons/flags/vu.png
-%%WWWDIR%%/icons/flags/wf.png
-%%WWWDIR%%/icons/flags/wlk.png
-%%WWWDIR%%/icons/flags/ws.png
-%%WWWDIR%%/icons/flags/ye.png
-%%WWWDIR%%/icons/flags/yt.png
-%%WWWDIR%%/icons/flags/yu.png
-%%WWWDIR%%/icons/flags/za.png
-%%WWWDIR%%/icons/flags/ze.png
-%%WWWDIR%%/icons/flags/zm.png
-%%WWWDIR%%/icons/flags/zw.png
-%%WWWDIR%%/icons/mime/xsl.png
-%%WWWDIR%%/icons/mime/document.png
-%%WWWDIR%%/icons/mime/csv.png
-%%WWWDIR%%/icons/mime/runtime.png
-%%WWWDIR%%/icons/mime/ai.png
-%%WWWDIR%%/icons/mime/archive.png
-%%WWWDIR%%/icons/mime/audio.png
-%%WWWDIR%%/icons/mime/crystal.png
-%%WWWDIR%%/icons/mime/css.png
-%%WWWDIR%%/icons/mime/doc.png
-%%WWWDIR%%/icons/mime/dotnet.png
-%%WWWDIR%%/icons/mime/encrypt.png
-%%WWWDIR%%/icons/mime/flash.png
-%%WWWDIR%%/icons/mime/html.png
-%%WWWDIR%%/icons/mime/image.png
-%%WWWDIR%%/icons/mime/jnlp.png
-%%WWWDIR%%/icons/mime/jscript.png
-%%WWWDIR%%/icons/mime/library.png
-%%WWWDIR%%/icons/mime/lit.png
-%%WWWDIR%%/icons/mime/mdb.png
-%%WWWDIR%%/icons/mime/notavailable.png
-%%WWWDIR%%/icons/mime/ooffice.png
-%%WWWDIR%%/icons/mime/other.png
-%%WWWDIR%%/icons/mime/page.png
-%%WWWDIR%%/icons/mime/pdf.png
-%%WWWDIR%%/icons/mime/php.png
-%%WWWDIR%%/icons/mime/phshop.png
-%%WWWDIR%%/icons/mime/pl.png
-%%WWWDIR%%/icons/mime/ppt.png
-%%WWWDIR%%/icons/mime/quicktime.png
-%%WWWDIR%%/icons/mime/rar.png
-%%WWWDIR%%/icons/mime/readme.txt
-%%WWWDIR%%/icons/mime/real.png
-%%WWWDIR%%/icons/mime/rss.png
-%%WWWDIR%%/icons/mime/script.png
-%%WWWDIR%%/icons/mime/svg.png
-%%WWWDIR%%/icons/mime/text.png
-%%WWWDIR%%/icons/mime/ttf.png
-%%WWWDIR%%/icons/mime/unknown.png
-%%WWWDIR%%/icons/mime/video.png
-%%WWWDIR%%/icons/mime/wmv.png
-%%WWWDIR%%/icons/mime/glasses.png
-%%WWWDIR%%/icons/mime/xls.png
-%%WWWDIR%%/icons/os/macosx8.png
-%%WWWDIR%%/icons/os/macosx6.png
-%%WWWDIR%%/icons/os/macosx7.png
-%%WWWDIR%%/icons/os/macosx9.png
-%%WWWDIR%%/icons/os/macosx4.png
-%%WWWDIR%%/icons/os/macosx5.png
-%%WWWDIR%%/icons/os/aix.png
-%%WWWDIR%%/icons/os/amigaos.png
-%%WWWDIR%%/icons/os/apple.png
-%%WWWDIR%%/icons/os/atari.png
-%%WWWDIR%%/icons/os/beos.png
-%%WWWDIR%%/icons/os/blackberry.png
-%%WWWDIR%%/icons/os/bsd.png
-%%WWWDIR%%/icons/os/bsddflybsd.png
-%%WWWDIR%%/icons/os/bsdfreebsd.png
-%%WWWDIR%%/icons/os/bsdi.png
-%%WWWDIR%%/icons/os/bsdkfreebsd.png
-%%WWWDIR%%/icons/os/bsdnetbsd.png
-%%WWWDIR%%/icons/os/bsdopenbsd.png
-%%WWWDIR%%/icons/os/cpm.png
-%%WWWDIR%%/icons/os/debian.png
-%%WWWDIR%%/icons/os/digital.png
-%%WWWDIR%%/icons/os/dos.png
-%%WWWDIR%%/icons/os/dreamcast.png
-%%WWWDIR%%/icons/os/freebsd.png
-%%WWWDIR%%/icons/os/gnu.png
-%%WWWDIR%%/icons/os/hpux.png
-%%WWWDIR%%/icons/os/ibm.png
-%%WWWDIR%%/icons/os/imode.png
-%%WWWDIR%%/icons/os/inferno.png
-%%WWWDIR%%/icons/os/ios.png
-%%WWWDIR%%/icons/os/ios_ipad.png
-%%WWWDIR%%/icons/os/ios_iphone.png
-%%WWWDIR%%/icons/os/iphone.png
-%%WWWDIR%%/icons/os/irix.png
-%%WWWDIR%%/icons/os/j2me.png
-%%WWWDIR%%/icons/os/java.png
-%%WWWDIR%%/icons/os/kfreebsd.png
-%%WWWDIR%%/icons/os/linux.png
-%%WWWDIR%%/icons/os/linuxandroid.png
-%%WWWDIR%%/icons/os/linuxasplinux.png
-%%WWWDIR%%/icons/os/linuxcentos.png
-%%WWWDIR%%/icons/os/linuxdebian.png
-%%WWWDIR%%/icons/os/linuxfedora.png
-%%WWWDIR%%/icons/os/linuxgentoo.png
-%%WWWDIR%%/icons/os/linuxmandr.png
-%%WWWDIR%%/icons/os/linuxpclinuxos.png
-%%WWWDIR%%/icons/os/linuxredhat.png
-%%WWWDIR%%/icons/os/linuxsuse.png
-%%WWWDIR%%/icons/os/linuxubuntu.png
-%%WWWDIR%%/icons/os/linuxvine.png
-%%WWWDIR%%/icons/os/linuxzenwalk.png
-%%WWWDIR%%/icons/os/mac.png
-%%WWWDIR%%/icons/os/macintosh.png
-%%WWWDIR%%/icons/os/macosx.png
-%%WWWDIR%%/icons/os/macosx10.png
-%%WWWDIR%%/icons/os/macosx11.png
-%%WWWDIR%%/icons/os/netbsd.png
-%%WWWDIR%%/icons/os/netware.png
-%%WWWDIR%%/icons/os/next.png
-%%WWWDIR%%/icons/os/openbsd.png
-%%WWWDIR%%/icons/os/os2.png
-%%WWWDIR%%/icons/os/osf.png
-%%WWWDIR%%/icons/os/palmos.png
-%%WWWDIR%%/icons/os/qnx.png
-%%WWWDIR%%/icons/os/riscos.png
-%%WWWDIR%%/icons/os/sco.png
-%%WWWDIR%%/icons/os/sunos.png
-%%WWWDIR%%/icons/os/syllable.png
-%%WWWDIR%%/icons/os/symbian.png
-%%WWWDIR%%/icons/os/unix.png
-%%WWWDIR%%/icons/os/unknown.png
-%%WWWDIR%%/icons/os/vms.png
-%%WWWDIR%%/icons/os/webtv.png
-%%WWWDIR%%/icons/os/wii.png
-%%WWWDIR%%/icons/os/win.png
-%%WWWDIR%%/icons/os/win7.png
-%%WWWDIR%%/icons/os/win8.1.png
-%%WWWDIR%%/icons/os/win8.png
-%%WWWDIR%%/icons/os/win80.png
-%%WWWDIR%%/icons/os/win81.png
-%%WWWDIR%%/icons/os/win10.png
-%%WWWDIR%%/icons/os/win16.png
-%%WWWDIR%%/icons/os/win2000.png
-%%WWWDIR%%/icons/os/win2003.png
-%%WWWDIR%%/icons/os/win2008.png
-%%WWWDIR%%/icons/os/win95.png
-%%WWWDIR%%/icons/os/win98.png
-%%WWWDIR%%/icons/os/wince.png
-%%WWWDIR%%/icons/os/winlong.png
-%%WWWDIR%%/icons/os/winme.png
-%%WWWDIR%%/icons/os/winnt.png
-%%WWWDIR%%/icons/os/winphone.png
-%%WWWDIR%%/icons/os/winunknown.png
-%%WWWDIR%%/icons/os/winvista.png
-%%WWWDIR%%/icons/os/winxp.png
-%%WWWDIR%%/icons/os/commodore.png
-%%WWWDIR%%/icons/os/psp.png
-%%WWWDIR%%/icons/os/winxbox.png
-%%WWWDIR%%/icons/other/awstats_logo1.png
-%%WWWDIR%%/icons/other/awstats_logo5.png
-%%WWWDIR%%/icons/other/awstats_logo6.png
-%%WWWDIR%%/icons/other/backleft.png
-%%WWWDIR%%/icons/other/button.gif
-%%WWWDIR%%/icons/other/he.png
-%%WWWDIR%%/icons/other/hh.png
-%%WWWDIR%%/icons/other/hk.png
-%%WWWDIR%%/icons/other/hp.png
-%%WWWDIR%%/icons/other/ht.png
-%%WWWDIR%%/icons/other/hx.png
-%%WWWDIR%%/icons/other/menu1.png
-%%WWWDIR%%/icons/other/menu2.png
-%%WWWDIR%%/icons/other/menu3.png
-%%WWWDIR%%/icons/other/menu4.png
-%%WWWDIR%%/icons/other/menu5.png
-%%WWWDIR%%/icons/other/menu6.png
-%%WWWDIR%%/icons/other/menu7.png
-%%WWWDIR%%/icons/other/menu8.png
-%%WWWDIR%%/icons/other/page.png
-%%WWWDIR%%/icons/other/vh.png
-%%WWWDIR%%/icons/other/vk.png
-%%WWWDIR%%/icons/other/vp.png
-%%WWWDIR%%/icons/other/vu.png
-%%WWWDIR%%/icons/other/vv.png
+%%WWWDIR%%/icon/browser/adobe.png
+%%WWWDIR%%/icon/browser/alcatel.png
+%%WWWDIR%%/icon/browser/amaya.png
+%%WWWDIR%%/icon/browser/amigavoyager.png
+%%WWWDIR%%/icon/browser/android.png
+%%WWWDIR%%/icon/browser/apt.png
+%%WWWDIR%%/icon/browser/avant.png
+%%WWWDIR%%/icon/browser/aweb.png
+%%WWWDIR%%/icon/browser/bpftp.png
+%%WWWDIR%%/icon/browser/bytel.png
+%%WWWDIR%%/icon/browser/chimera.png
+%%WWWDIR%%/icon/browser/chrome.png
+%%WWWDIR%%/icon/browser/cyberdog.png
+%%WWWDIR%%/icon/browser/da.png
+%%WWWDIR%%/icon/browser/dillo.png
+%%WWWDIR%%/icon/browser/dreamcast.png
+%%WWWDIR%%/icon/browser/ecatch.png
+%%WWWDIR%%/icon/browser/edge.png
+%%WWWDIR%%/icon/browser/encompass.png
+%%WWWDIR%%/icon/browser/epiphany.png
+%%WWWDIR%%/icon/browser/ericsson.png
+%%WWWDIR%%/icon/browser/feeddemon.png
+%%WWWDIR%%/icon/browser/feedreader.png
+%%WWWDIR%%/icon/browser/firefox.png
+%%WWWDIR%%/icon/browser/flock.png
+%%WWWDIR%%/icon/browser/fpexpress.png
+%%WWWDIR%%/icon/browser/fresco.png
+%%WWWDIR%%/icon/browser/galeon.png
+%%WWWDIR%%/icon/browser/getright.png
+%%WWWDIR%%/icon/browser/gozilla.png
+%%WWWDIR%%/icon/browser/hotjava.png
+%%WWWDIR%%/icon/browser/ibrowse.png
+%%WWWDIR%%/icon/browser/icab.png
+%%WWWDIR%%/icon/browser/icecat.png
+%%WWWDIR%%/icon/browser/iceweasel.png
+%%WWWDIR%%/icon/browser/java.png
+%%WWWDIR%%/icon/browser/jetbrains_omea.png
+%%WWWDIR%%/icon/browser/kmeleon.png
+%%WWWDIR%%/icon/browser/konqueror.png
+%%WWWDIR%%/icon/browser/lg.png
+%%WWWDIR%%/icon/browser/lotusnotes.png
+%%WWWDIR%%/icon/browser/lynx.png
+%%WWWDIR%%/icon/browser/macweb.png
+%%WWWDIR%%/icon/browser/mediaplayer.png
+%%WWWDIR%%/icon/browser/mozilla.png
+%%WWWDIR%%/icon/browser/motorola.png
+%%WWWDIR%%/icon/browser/mplayer.png
+%%WWWDIR%%/icon/browser/msie.png
+%%WWWDIR%%/icon/browser/msie_large.png
+%%WWWDIR%%/icon/browser/multizilla.png
+%%WWWDIR%%/icon/browser/ncsa_mosaic.png
+%%WWWDIR%%/icon/browser/netnewswire.png
+%%WWWDIR%%/icon/browser/netpositive.png
+%%WWWDIR%%/icon/browser/netscape.png
+%%WWWDIR%%/icon/browser/netscape_large.png
+%%WWWDIR%%/icon/browser/netshow.png
+%%WWWDIR%%/icon/browser/newsfire.png
+%%WWWDIR%%/icon/browser/newsgator.png
+%%WWWDIR%%/icon/browser/newzcrawler.png
+%%WWWDIR%%/icon/browser/nokia.png
+%%WWWDIR%%/icon/browser/notavailable.png
+%%WWWDIR%%/icon/browser/omniweb.png
+%%WWWDIR%%/icon/browser/opera.png
+%%WWWDIR%%/icon/browser/panasonic.png
+%%WWWDIR%%/icon/browser/pdaphone.png
+%%WWWDIR%%/icon/browser/philips.png
+%%WWWDIR%%/icon/browser/phoenix.png
+%%WWWDIR%%/icon/browser/pluck.png
+%%WWWDIR%%/icon/browser/pulpfiction.png
+%%WWWDIR%%/icon/browser/real.png
+%%WWWDIR%%/icon/browser/rss.png
+%%WWWDIR%%/icon/browser/rssbandit.png
+%%WWWDIR%%/icon/browser/rssowl.png
+%%WWWDIR%%/icon/browser/rssreader.png

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***