Update to 6.5

PR:		91888
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com>
Approved by:	maintainer

14 files changed, 196 insertions, 644 deletions

diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index 99a5cda3ada2..4c5da785c17c 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.4
-PORTREVISION=	1
+PORTVERSION=	6.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	webmaster@lightningfire.net
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
@@ -20,7 +18,6 @@ RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-USE_REINPLACE=	yes
 
 SUB_FILES=	pkg-message
 
@@ -31,10 +28,10 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storabl
 .endif
 
 post-patch:
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_configure.pl
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_updateall.pl
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_configure.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_updateall.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
 
 do-install:
 	@${MKDIR} ${PREFIX}/www/awstats
@@ -65,7 +62,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.5.wbm ${PREFIX}/www/awstats/tools/webmin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.wbm ${PREFIX}/www/awstats/tools/webmin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin
@@ -101,6 +98,7 @@ do-install:
 	@${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats"
 	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"
 	@${ECHO_CMD} ""
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
diff --git a/www/awstats-devel/distinfo b/www/awstats-devel/distinfo
index 08fc9125a310..9414a5f36141 100644
--- a/www/awstats-devel/distinfo
+++ b/www/awstats-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (awstats-6.4.tgz) = 056e6fb0c7351b17fe5bbbe0aa1297b1
-SHA256 (awstats-6.4.tgz) = 94ec0963dd88a4995ae63be675936da9d3dfaed0c0b0155c5c0400c989b6d294
-SIZE (awstats-6.4.tgz) = 918435
+MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a
+SHA256 (awstats-6.5.tar.gz) = 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c
+SIZE (awstats-6.5.tar.gz) = 1051780
diff --git a/www/awstats-devel/files/patch-awstats.model.conf b/www/awstats-devel/files/patch-awstats.model.conf
index 2d006aa4b9d8..ccfa4d4cc75f 100644
--- a/www/awstats-devel/files/patch-awstats.model.conf
+++ b/www/awstats-devel/files/patch-awstats.model.conf
@@ -1,11 +1,12 @@
---- wwwroot/cgi-bin/awstats.model.conf.orig	Sat Dec 18 14:33:27 2004
-+++ wwwroot/cgi-bin/awstats.model.conf	Sat Dec 18 14:34:38 2004
-@@ -208,7 +208,7 @@
+--- wwwroot/cgi-bin/awstats.model.conf.orig     Sun Jan 15 21:54:18 2006
++++ wwwroot/cgi-bin/awstats.model.conf  Sun Jan 15 21:55:00 2006
+@@ -219,7 +219,7 @@
  # Example: "../icon"
  # Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
  #
 -DirIcons="/icon"
 +DirIcons="/awstatsicons"
- 
- 
+
+
  # When this parameter is set to 1, AWStats add a button on report page to
+
diff --git a/www/awstats-devel/files/patch-awstats.pl b/www/awstats-devel/files/patch-awstats.pl
deleted file mode 100644
index 52413a4b6cd8..000000000000
--- a/www/awstats-devel/files/patch-awstats.pl
+++ /dev/null
@@ -1,297 +0,0 @@
---- wwwroot/cgi-bin/awstats.pl.orig	Thu Feb 24 23:02:23 2005
-+++ wwwroot/cgi-bin/awstats.pl	Thu Aug 18 08:26:22 2005
-@@ -625,8 +625,8 @@
- EOF
- 			# Call to plugins' function AddHTMLStyles
- 			foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLStyles'}})  {
--				my $function="AddHTMLStyles_$pluginname()";
--				eval("$function");
-+				my $function="AddHTMLStyles_$pluginname";
-+				&$function();
- 			}
- 	
- 			if ($BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml') { print ($ENV{'HTTP_USER_AGENT'}=~/Firebird/i?"//-->\n":"]]>\n"); }
-@@ -660,8 +660,8 @@
- 
-     	# Call to plugins' function AddHTMLBodyFooter
-     	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyFooter'}})  {
--    		my $function="AddHTMLBodyFooter_$pluginname()";
--    		eval("$function");
-+			my $function="AddHTMLBodyFooter_$pluginname";
-+			&$function();
-     	}
- 
- 		if ($FrameName ne 'index' && $FrameName ne 'mainleft') {
-@@ -3254,15 +3254,15 @@
-                         # The plugin for this section was loaded
-                		    $found=1;
-                	        my $issectiontoload=$SectionsToLoad{"plugin_$pluginname"};
--               		    my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)";
--               		    eval("$function");
-+						my $function="SectionReadHistory_$pluginname";
-+						&$function($issectiontoload,$readxml,$xmleb,$countlines);
-         				delete $SectionsToLoad{"plugin_$pluginname"};
-         				if ($SectionsToSave{"plugin_$pluginname"}) {
-         					Save_History("plugin_$pluginname",$year,$month);
-         					delete $SectionsToSave{"plugin_$pluginname"};
-         					if ($withpurge) {
--                           		my $function="SectionInitHashArray_$pluginname()";
--                           		eval("$function");
-+								my $function="SectionInitHashArray_$pluginname";
-+								&$function();
-         					}
-         				}
-                         last;
-@@ -3977,8 +3977,8 @@
-    	if ($AtLeastOneSectionPlugin && $sectiontosave =~ /^plugin_(\w+)$/i)   {
-   	    my $pluginname=$1;
-   	    if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"})  {
--   		    my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)";
--  		    eval("$function");
-+			my $function="SectionWriteHistory_$pluginname";
-+			&$function($xml,$xmlbb,$xmlbs,$xmlbe,$xmlrb,$xmlrs,$xmlre,$xmleb,$xmlee);
-         }
-     }
- 
-@@ -4203,8 +4203,8 @@
-  		%{'_section_' . $ix . '_l'} = %{'_section_' . $ix . '_p'} = ();
-  	}
-    	foreach my $pluginname (keys %{$PluginsLoaded{'SectionInitHashArray'}})  {
--   		my $function="SectionInitHashArray_$pluginname()";
--   		eval("$function");
-+		my $function="SectionInitHashArray_$pluginname";
-+		&$function();
-     }
- }
- 
-@@ -4788,8 +4788,8 @@
- 	my $user=shift;
- 	# Call to plugins' function ShowInfoUser
- 	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoUser'}})  {
--		my $function="ShowInfoUser_$pluginname('$user')";
--		eval("$function");
-+		my $function="ShowInfoUser_$pluginname";
-+		&$function($user);
- 	}
- }
- 
-@@ -4804,8 +4804,8 @@
- 	my $user=shift;
- 	# Call to plugins' function ShowInfoCluster
- 	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoCluster'}})  {
--		my $function="ShowInfoCluster_$pluginname('$user')";
--		eval("$function");
-+		my $function="ShowInfoCluster_$pluginname";
-+		&$function($user);
- 	}
- }
- 
-@@ -4820,8 +4820,8 @@
- 	my $host=shift;
- 	# Call to plugins' function ShowInfoHost
- 	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoHost'}})  {
--		my $function="ShowInfoHost_$pluginname('$host')";
--		eval("$function");
-+		my $function="ShowInfoHost_$pluginname";
-+		&$function($host);
- 	}
- }
- 
-@@ -4838,8 +4838,8 @@
- 
- 	# Call to plugins' function ShowInfoURL
- 	foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoURL'}})  {
--		my $function="ShowInfoURL_$pluginname('$url')";
--		eval("$function");
-+		my $function="ShowInfoURL_$pluginname";
-+		&$function($url);
- 	}
- 
- 	if (length($nompage)>$MaxLengthOfShownURL) { $nompage=substr($nompage,0,$MaxLengthOfShownURL)."..."; }
-@@ -5154,8 +5154,8 @@
-     my $linetitle=0;
- 	# Call to plugins' function AddHTMLMenuLink
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuLink'}})  {
--		my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
--		eval("$function");
-+		my $function="AddHTMLMenuLink_$pluginname";
-+		&$function($categ,$menu,$menulink,$menutext);
- 	}
-     foreach my $key (%$menu) { if ($menu->{$key}>0) { $linetitle++; last; } }
- 	if (! $linetitle) { return; }
-@@ -5723,8 +5723,8 @@
- 
- # AWStats output is replaced by a plugin output
- if ($PluginMode) {
--	my $function="BuildFullHTMLOutput_$PluginMode()";
--	eval("$function");
-+	my $function="BuildFullHTMLOutput_$PluginMode";
-+	&$function();
- 	if ($? || $@) { error("$@"); }
- 	&html_end(0);
- 	exit 0;	
-@@ -6623,8 +6623,8 @@
- 			elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); }
-             if ($AtLeastOneSectionPlugin) {
-                	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}})  {
--               		my $function="SectionProcessIp_$pluginname(\$HostResolved)";
--               		eval("$function");
-+					my $function="SectionProcessIp_$pluginname";
-+					&$function($HostResolved);
-                 }
-    		    }
- 		}
-@@ -6638,8 +6638,8 @@
- 				elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
-                 if ($AtLeastOneSectionPlugin) {
-                    	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}})  {
--                   		my $function="SectionProcessIp_$pluginname(\$Host)";
--                   		eval("$function");
-+						my $function="SectionProcessIp_$pluginname";
-+						&$function($Host);
-                     }
-                 }
- 			}
-@@ -6649,8 +6649,8 @@
- 				elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
-                 if ($AtLeastOneSectionPlugin) {
-                    	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}})  {
--                   		my $function="SectionProcessHostname_$pluginname(\$HostResolved)";
--                   		eval("$function");
-+						my $function="SectionProcessHostname_$pluginname";
-+						&$function($HostResolved);
-                     }
-                 }
- 			}
-@@ -7319,8 +7319,8 @@
- 
- 	# Call to plugins' function AddHTMLBodyHeader
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyHeader'}})  {
--		my $function="AddHTMLBodyHeader_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLBodyHeader_$pluginname";
-+		&$function();
- 	}
- 
-     my $WIDTHMENU1=($FrameName eq 'mainleft'?$FRAMEWIDTH:150);
-@@ -7462,8 +7462,8 @@
-     
- 	# Call to plugins' function AddHTMLMenuHeader
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuHeader'}})  {
--		my $function="AddHTMLMenuHeader_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLMenuHeader_$pluginname";
-+		&$function();
- 	}
- 
- 	# MENU
-@@ -7572,8 +7572,8 @@
- 
- 	# Call to plugins' function AddHTMLMenuFooter
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuFooter'}})  {
--		my $function="AddHTMLMenuFooter_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLMenuFooter_$pluginname";
-+		&$function();
- 	}
- 
- 	# Exit if left frame
-@@ -7666,8 +7666,8 @@
- 
- 	# Call to plugins' function AddHTMLContentHeader
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLContentHeader'}})  {
--		my $function="AddHTMLContentHeader_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLContentHeader_$pluginname";
-+		&$function();
- 	}
- 
- 	# Output particular part
-@@ -7946,8 +7946,8 @@
-     	if ($HTMLOutput{'urldetail'} || $HTMLOutput{'urlentry'} || $HTMLOutput{'urlexit'}) {
-     		# Call to plugins' function ShowPagesFilter
-     		foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesFilter'}})  {
--    			my $function="ShowPagesFilter_$pluginname()";
--    			eval("$function");
-+				my $function="ShowPagesFilter_$pluginname";
-+				&$function();
-     		}
-     		print "$Center<a name=\"urls\">&nbsp;</a><br />\n";
-     		# Show filter form
-@@ -7977,8 +7977,8 @@
-     		if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
-     		# Call to plugins' function ShowPagesAddField
-     		foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--    			my $function="ShowPagesAddField_$pluginname('title')";
--    			eval("$function");
-+				my $function="ShowPagesAddField_$pluginname()";
-+				&$function('title');
-     		}
-     		print "<th>&nbsp;</th></tr>\n";
-     		$total_p=$total_k=$total_e=$total_x=0;
-@@ -8010,8 +8010,8 @@
-     			if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:"&nbsp;")."</td>"; }
-     			# Call to plugins' function ShowPagesAddField
-     			foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--    				my $function="ShowPagesAddField_$pluginname('$key')"; 
--    				eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function($key);
-     			}
-     			print "<td class=\"aws\">";
-     			# alt and title are not provided to reduce page size
-@@ -8039,8 +8039,8 @@
-     			if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:"&nbsp;")."</td>"; }
-     			# Call to plugins' function ShowPagesAddField
-     			foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--    				my $function="ShowPagesAddField_$pluginname('')";
--    				eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function('');
-     			}
-     			print "<td>&nbsp;</td></tr>\n";
-     		}
-@@ -8485,8 +8485,8 @@
-     	if ($htmloutput =~ /^plugin_(\w+)$/) {
-     		my $pluginname=$1;
-     		print "$Center<a name=\"plugin_$pluginname\">&nbsp;</a><br />";
--       		my $function="AddHTMLGraph_$pluginname()";
--       		eval("$function");
-+			my $function="AddHTMLGraph_$pluginname";
-+			&$function();
-     		&html_end(1);
-     	}
-     }
-@@ -9592,8 +9592,8 @@
- 			if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
- 			# Call to plugins' function ShowPagesAddField
- 			foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--				my $function="ShowPagesAddField_$pluginname('title')";
--				eval("$function");
-+				my $function="ShowPagesAddField_$pluginname";
-+				&$function('title');
- 			}
- 			print "<th>&nbsp;</th></tr>\n";
- 			$total_p=$total_e=$total_x=$total_k=0;
-@@ -9624,8 +9624,8 @@
- 				if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:"&nbsp;")."</td>"; }
- 				# Call to plugins' function ShowPagesAddField
- 				foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--					my $function="ShowPagesAddField_$pluginname('$key')";
--					eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function($key);
- 				}
- 				print "<td class=\"aws\">";
- 				if ($ShowPagesStats =~ /P/i && $LogType ne 'F')    { print "<img src=\"$DirIcons\/other\/$BarPng{'hp'}\" width=\"$bredde_p\" height=\"4\"".AltTitle("")." /><br />"; }
-@@ -9653,8 +9653,8 @@
- 				if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:"&nbsp;")."</td>"; }
- 				# Call to plugins' function ShowPagesAddField
- 				foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--					my $function="ShowPagesAddField_$pluginname('')";
--					eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function('');
- 				}
- 				print "<td>&nbsp;</td></tr>\n";
- 			}
diff --git a/www/awstats-devel/files/patch-wwwroot-cgi-bin-awstats.pl b/www/awstats-devel/files/patch-wwwroot-cgi-bin-awstats.pl
index 8e1c95ad7e97..6ddbf9e3cc65 100644
--- a/www/awstats-devel/files/patch-wwwroot-cgi-bin-awstats.pl
+++ b/www/awstats-devel/files/patch-wwwroot-cgi-bin-awstats.pl
@@ -1,11 +1,11 @@
---- wwwroot/cgi-bin/awstats.pl.orig	Thu Feb 24 16:02:23 2005
-+++ wwwroot/cgi-bin/awstats.pl	Thu Sep 22 20:33:18 2005
-@@ -1835,7 +1835,7 @@
+--- wwwroot/cgi-bin/awstats.pl.orig	Sun Jan 15 22:28:43 2006
++++ wwwroot/cgi-bin/awstats.pl	Sun Jan 15 22:30:17 2006
+@@ -1911,7 +1911,7 @@
  	# Windows and standard package:        		"$DIR/plugins" (plugins in same dir than awstats.pl)
  	# Redhat :                                  "/usr/local/awstats/wwwroot/cgi-bin/plugins"
  	# Debian package :                    		"/usr/share/awstats/plugins"
 -	my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins");
 +	my @PossiblePluginsDir=("$DIR/plugins","%%PREFIX%%/www/awstats/cgi-bin/plugins","/usr/share/awstats/plugins");
   	my %DirAddedInINC=();
-
+ 
  	#Removed for security reason
diff --git a/www/awstats-devel/files/pkg-message.in b/www/awstats-devel/files/pkg-message.in
index 5997bb49d373..0c69d1ae9e8f 100644
--- a/www/awstats-devel/files/pkg-message.in
+++ b/www/awstats-devel/files/pkg-message.in
@@ -20,3 +20,13 @@ ScriptAlias /awstats/ "%%PREFIX%%/www/awstats/cgi-bin/"
 </Directory>
 
 *****************************************************************
+
+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"
+
+*****************************************************************
diff --git a/www/awstats-devel/pkg-plist b/www/awstats-devel/pkg-plist
index 985052420390..105c8e581f56 100644
--- a/www/awstats-devel/pkg-plist
+++ b/www/awstats-devel/pkg-plist
@@ -69,13 +69,15 @@ www/awstats/cgi-bin/lang/awstats-fr.txt
 www/awstats/cgi-bin/lang/awstats-gl.txt
 www/awstats/cgi-bin/lang/awstats-gr.txt
 www/awstats/cgi-bin/lang/awstats-he.txt
+www/awstats/cgi-bin/lang/awstats-hr.txt
 www/awstats/cgi-bin/lang/awstats-hu.txt
 www/awstats/cgi-bin/lang/awstats-id.txt
 www/awstats/cgi-bin/lang/awstats-is.txt
 www/awstats/cgi-bin/lang/awstats-it.txt
 www/awstats/cgi-bin/lang/awstats-jp.txt
-www/awstats/cgi-bin/lang/awstats-kr.txt
+www/awstats/cgi-bin/lang/awstats-ko.txt
 www/awstats/cgi-bin/lang/awstats-lv.txt
+www/awstats/cgi-bin/lang/awstats-mk.txt
 www/awstats/cgi-bin/lang/awstats-nb.txt
 www/awstats/cgi-bin/lang/awstats-nl.txt
 www/awstats/cgi-bin/lang/awstats-nn.txt
@@ -89,7 +91,6 @@ www/awstats/cgi-bin/lang/awstats-sk.txt
 www/awstats/cgi-bin/lang/awstats-sr.txt
 www/awstats/cgi-bin/lang/awstats-th.txt
 www/awstats/cgi-bin/lang/awstats-tr.txt
-www/awstats/cgi-bin/lang/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/awstats-tw.txt
 www/awstats/cgi-bin/lang/awstats-ua.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
@@ -131,11 +132,12 @@ www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-sr.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt
+www/awstats/cgi-bin/lib/blacklist.txt
 www/awstats/cgi-bin/lib/browsers.pm
+www/awstats/cgi-bin/lib/browsers_phone.pm
 www/awstats/cgi-bin/lib/domains.pm
 www/awstats/cgi-bin/lib/mime.pm
 www/awstats/cgi-bin/lib/operating_systems.pm
-www/awstats/cgi-bin/lib/referer_spam.pm
 www/awstats/cgi-bin/lib/robots.pm
 www/awstats/cgi-bin/lib/search_engines.pm
 www/awstats/cgi-bin/lib/status_http.pm
@@ -158,12 +160,14 @@ www/awstats/cgi-bin/plugins/userinfo.pm
 www/awstats/css/awstats_bw.css
 www/awstats/css/awstats_default.css
 www/awstats/icons/browser/adobe.png
+www/awstats/icons/browser/alcatel.png
 www/awstats/icons/browser/amaya.png
 www/awstats/icons/browser/amigavoyager.png
 www/awstats/icons/browser/apt.png
 www/awstats/icons/browser/avant.png
 www/awstats/icons/browser/aweb.png
 www/awstats/icons/browser/bpftp.png
+www/awstats/icons/browser/bytel.png
 www/awstats/icons/browser/chimera.png
 www/awstats/icons/browser/cyberdog.png
 www/awstats/icons/browser/da.png
@@ -171,6 +175,10 @@ www/awstats/icons/browser/dillo.png
 www/awstats/icons/browser/dreamcast.png
 www/awstats/icons/browser/ecatch.png
 www/awstats/icons/browser/encompass.png
+www/awstats/icons/browser/epiphany.png
+www/awstats/icons/browser/ericsson.png
+www/awstats/icons/browser/feeddemon.png
+www/awstats/icons/browser/feedreader.png
 www/awstats/icons/browser/firefox.png
 www/awstats/icons/browser/fpexpress.png
 www/awstats/icons/browser/fresco.png
@@ -180,29 +188,58 @@ www/awstats/icons/browser/gozilla.png
 www/awstats/icons/browser/hotjava.png
 www/awstats/icons/browser/ibrowse.png
 www/awstats/icons/browser/icab.png
+www/awstats/icons/browser/java.png
+www/awstats/icons/browser/jetbrains_omea.png
 www/awstats/icons/browser/kmeleon.png
 www/awstats/icons/browser/konqueror.png
+www/awstats/icons/browser/lg.png
 www/awstats/icons/browser/lotusnotes.png
 www/awstats/icons/browser/lynx.png
 www/awstats/icons/browser/macweb.png
 www/awstats/icons/browser/mediaplayer.png
 www/awstats/icons/browser/mozilla.png
+www/awstats/icons/browser/motorola.png
+www/awstats/icons/browser/mplayer.png
 www/awstats/icons/browser/msie.png
 www/awstats/icons/browser/msie_large.png
 www/awstats/icons/browser/multizilla.png
 www/awstats/icons/browser/ncsa_mosaic.png
+www/awstats/icons/browser/netnewswire.png
 www/awstats/icons/browser/netpositive.png
 www/awstats/icons/browser/netscape.png
 www/awstats/icons/browser/netscape_large.png
+www/awstats/icons/browser/netshow.png
+www/awstats/icons/browser/newsfire.png
+www/awstats/icons/browser/newsgator.png
+www/awstats/icons/browser/newzcrawler.png
+www/awstats/icons/browser/nokia.png
 www/awstats/icons/browser/notavailable.png
 www/awstats/icons/browser/omniweb.png
 www/awstats/icons/browser/opera.png
+www/awstats/icons/browser/panasonic.png
 www/awstats/icons/browser/pdaphone.png
+www/awstats/icons/browser/philips.png
 www/awstats/icons/browser/phoenix.png
+www/awstats/icons/browser/pluck.png
+www/awstats/icons/browser/pulpfiction.png
+www/awstats/icons/browser/real.png
+www/awstats/icons/browser/rss.png
+www/awstats/icons/browser/rssbandit.png
+www/awstats/icons/browser/rssowl.png
+www/awstats/icons/browser/rssreader.png
 www/awstats/icons/browser/safari.png
+www/awstats/icons/browser/sagem.png
+www/awstats/icons/browser/samsung.png
+www/awstats/icons/browser/sharp.png
+www/awstats/icons/browser/sharpreader.png
+www/awstats/icons/browser/shrook.png
+www/awstats/icons/browser/siemens.png
+www/awstats/icons/browser/sony.png
 www/awstats/icons/browser/staroffice.png
 www/awstats/icons/browser/teleport.png
+www/awstats/icons/browser/trium.png
 www/awstats/icons/browser/unknown.png
+www/awstats/icons/browser/w3c.png
 www/awstats/icons/browser/webcopier.png
 www/awstats/icons/browser/webtv.png
 www/awstats/icons/browser/webzip.png
@@ -396,6 +433,7 @@ www/awstats/icons/flags/mt.png
 www/awstats/icons/flags/mu.png
 www/awstats/icons/flags/museum.png
 www/awstats/icons/flags/mv.png
+www/awstats/icons/flags/mw.png
 www/awstats/icons/flags/mx.png
 www/awstats/icons/flags/my.png
 www/awstats/icons/flags/mz.png
@@ -488,24 +526,42 @@ www/awstats/icons/flags/za.png
 www/awstats/icons/flags/ze.png
 www/awstats/icons/flags/zm.png
 www/awstats/icons/flags/zw.png
+www/awstats/icons/mime/ai.png
 www/awstats/icons/mime/archive.png
 www/awstats/icons/mime/audio.png
 www/awstats/icons/mime/doc.png
+www/awstats/icons/mime/flash.png
 www/awstats/icons/mime/html.png
 www/awstats/icons/mime/image.png
+www/awstats/icons/mime/jscript.png
+www/awstats/icons/mime/lit.png
 www/awstats/icons/mime/notavailable.png
 www/awstats/icons/mime/other.png
 www/awstats/icons/mime/pdf.png
+www/awstats/icons/mime/php.png
+www/awstats/icons/mime/phshop.png
+www/awstats/icons/mime/pl.png
+www/awstats/icons/mime/ppt.png
+www/awstats/icons/mime/quicktime.png
+www/awstats/icons/mime/rar.png
+www/awstats/icons/mime/real.png
 www/awstats/icons/mime/script.png
+www/awstats/icons/mime/svg.png
 www/awstats/icons/mime/text.png
+www/awstats/icons/mime/ttf.png
 www/awstats/icons/mime/unknown.png
 www/awstats/icons/mime/video.png
+www/awstats/icons/mime/wmv.png
 www/awstats/icons/os/aix.png
 www/awstats/icons/os/amigaos.png
 www/awstats/icons/os/apple.png
 www/awstats/icons/os/atari.png
 www/awstats/icons/os/beos.png
+www/awstats/icons/os/bsd.png
+www/awstats/icons/os/bsdfreebsd.png
 www/awstats/icons/os/bsdi.png
+www/awstats/icons/os/bsdnetbsd.png
+www/awstats/icons/os/bsdopenbsd.png
 www/awstats/icons/os/cpm.png
 www/awstats/icons/os/debian.png
 www/awstats/icons/os/digital.png
@@ -518,7 +574,15 @@ www/awstats/icons/os/ibm.png
 www/awstats/icons/os/imode.png
 www/awstats/icons/os/irix.png
 www/awstats/icons/os/java.png
+www/awstats/icons/os/kfreebsd.png
 www/awstats/icons/os/linux.png
+www/awstats/icons/os/linuxcentos.png
+www/awstats/icons/os/linuxdebian.png
+www/awstats/icons/os/linuxfedora.png
+www/awstats/icons/os/linuxmandr.png
+www/awstats/icons/os/linuxredhat.png
+www/awstats/icons/os/linuxsuse.png
+www/awstats/icons/os/linuxubuntu.png
 www/awstats/icons/os/mac.png
 www/awstats/icons/os/macintosh.png
 www/awstats/icons/os/macosx.png
@@ -581,7 +645,7 @@ www/awstats/tools/awstats_updateall.pl
 www/awstats/tools/logresolvemerge.pl
 www/awstats/tools/maillogconvert.pl
 www/awstats/tools/urlaliasbuilder.pl
-www/awstats/tools/webmin/awstats-1.5.wbm
+www/awstats/tools/webmin/awstats-1.6.wbm
 @dirrm www/awstats/tools/webmin
 @dirrm www/awstats/tools
 @dirrm www/awstats/js
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 99a5cda3ada2..4c5da785c17c 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.4
-PORTREVISION=	1
+PORTVERSION=	6.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	webmaster@lightningfire.net
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
@@ -20,7 +18,6 @@ RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-USE_REINPLACE=	yes
 
 SUB_FILES=	pkg-message
 
@@ -31,10 +28,10 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storabl
 .endif
 
 post-patch:
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_configure.pl
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_updateall.pl
-#	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_configure.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_updateall.pl
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
 
 do-install:
 	@${MKDIR} ${PREFIX}/www/awstats
@@ -65,7 +62,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.5.wbm ${PREFIX}/www/awstats/tools/webmin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.wbm ${PREFIX}/www/awstats/tools/webmin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin
@@ -101,6 +98,7 @@ do-install:
 	@${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats"
 	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"
 	@${ECHO_CMD} ""
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/images
 	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 08fc9125a310..9414a5f36141 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,3 +1,3 @@
-MD5 (awstats-6.4.tgz) = 056e6fb0c7351b17fe5bbbe0aa1297b1
-SHA256 (awstats-6.4.tgz) = 94ec0963dd88a4995ae63be675936da9d3dfaed0c0b0155c5c0400c989b6d294
-SIZE (awstats-6.4.tgz) = 918435
+MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a
+SHA256 (awstats-6.5.tar.gz) = 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c
+SIZE (awstats-6.5.tar.gz) = 1051780
diff --git a/www/awstats/files/patch-awstats.model.conf b/www/awstats/files/patch-awstats.model.conf
index 2d006aa4b9d8..ccfa4d4cc75f 100644
--- a/www/awstats/files/patch-awstats.model.conf
+++ b/www/awstats/files/patch-awstats.model.conf
@@ -1,11 +1,12 @@
---- wwwroot/cgi-bin/awstats.model.conf.orig	Sat Dec 18 14:33:27 2004
-+++ wwwroot/cgi-bin/awstats.model.conf	Sat Dec 18 14:34:38 2004
-@@ -208,7 +208,7 @@
+--- wwwroot/cgi-bin/awstats.model.conf.orig     Sun Jan 15 21:54:18 2006
++++ wwwroot/cgi-bin/awstats.model.conf  Sun Jan 15 21:55:00 2006
+@@ -219,7 +219,7 @@
  # Example: "../icon"
  # Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
  #
 -DirIcons="/icon"
 +DirIcons="/awstatsicons"
- 
- 
+
+
  # When this parameter is set to 1, AWStats add a button on report page to
+
diff --git a/www/awstats/files/patch-awstats.pl b/www/awstats/files/patch-awstats.pl
deleted file mode 100644
index 52413a4b6cd8..000000000000
--- a/www/awstats/files/patch-awstats.pl
+++ /dev/null
@@ -1,297 +0,0 @@
---- wwwroot/cgi-bin/awstats.pl.orig	Thu Feb 24 23:02:23 2005
-+++ wwwroot/cgi-bin/awstats.pl	Thu Aug 18 08:26:22 2005
-@@ -625,8 +625,8 @@
- EOF
- 			# Call to plugins' function AddHTMLStyles
- 			foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLStyles'}})  {
--				my $function="AddHTMLStyles_$pluginname()";
--				eval("$function");
-+				my $function="AddHTMLStyles_$pluginname";
-+				&$function();
- 			}
- 	
- 			if ($BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml') { print ($ENV{'HTTP_USER_AGENT'}=~/Firebird/i?"//-->\n":"]]>\n"); }
-@@ -660,8 +660,8 @@
- 
-     	# Call to plugins' function AddHTMLBodyFooter
-     	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyFooter'}})  {
--    		my $function="AddHTMLBodyFooter_$pluginname()";
--    		eval("$function");
-+			my $function="AddHTMLBodyFooter_$pluginname";
-+			&$function();
-     	}
- 
- 		if ($FrameName ne 'index' && $FrameName ne 'mainleft') {
-@@ -3254,15 +3254,15 @@
-                         # The plugin for this section was loaded
-                		    $found=1;
-                	        my $issectiontoload=$SectionsToLoad{"plugin_$pluginname"};
--               		    my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)";
--               		    eval("$function");
-+						my $function="SectionReadHistory_$pluginname";
-+						&$function($issectiontoload,$readxml,$xmleb,$countlines);
-         				delete $SectionsToLoad{"plugin_$pluginname"};
-         				if ($SectionsToSave{"plugin_$pluginname"}) {
-         					Save_History("plugin_$pluginname",$year,$month);
-         					delete $SectionsToSave{"plugin_$pluginname"};
-         					if ($withpurge) {
--                           		my $function="SectionInitHashArray_$pluginname()";
--                           		eval("$function");
-+								my $function="SectionInitHashArray_$pluginname";
-+								&$function();
-         					}
-         				}
-                         last;
-@@ -3977,8 +3977,8 @@
-    	if ($AtLeastOneSectionPlugin && $sectiontosave =~ /^plugin_(\w+)$/i)   {
-   	    my $pluginname=$1;
-   	    if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"})  {
--   		    my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)";
--  		    eval("$function");
-+			my $function="SectionWriteHistory_$pluginname";
-+			&$function($xml,$xmlbb,$xmlbs,$xmlbe,$xmlrb,$xmlrs,$xmlre,$xmleb,$xmlee);
-         }
-     }
- 
-@@ -4203,8 +4203,8 @@
-  		%{'_section_' . $ix . '_l'} = %{'_section_' . $ix . '_p'} = ();
-  	}
-    	foreach my $pluginname (keys %{$PluginsLoaded{'SectionInitHashArray'}})  {
--   		my $function="SectionInitHashArray_$pluginname()";
--   		eval("$function");
-+		my $function="SectionInitHashArray_$pluginname";
-+		&$function();
-     }
- }
- 
-@@ -4788,8 +4788,8 @@
- 	my $user=shift;
- 	# Call to plugins' function ShowInfoUser
- 	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoUser'}})  {
--		my $function="ShowInfoUser_$pluginname('$user')";
--		eval("$function");
-+		my $function="ShowInfoUser_$pluginname";
-+		&$function($user);
- 	}
- }
- 
-@@ -4804,8 +4804,8 @@
- 	my $user=shift;
- 	# Call to plugins' function ShowInfoCluster
- 	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoCluster'}})  {
--		my $function="ShowInfoCluster_$pluginname('$user')";
--		eval("$function");
-+		my $function="ShowInfoCluster_$pluginname";
-+		&$function($user);
- 	}
- }
- 
-@@ -4820,8 +4820,8 @@
- 	my $host=shift;
- 	# Call to plugins' function ShowInfoHost
- 	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoHost'}})  {
--		my $function="ShowInfoHost_$pluginname('$host')";
--		eval("$function");
-+		my $function="ShowInfoHost_$pluginname";
-+		&$function($host);
- 	}
- }
- 
-@@ -4838,8 +4838,8 @@
- 
- 	# Call to plugins' function ShowInfoURL
- 	foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoURL'}})  {
--		my $function="ShowInfoURL_$pluginname('$url')";
--		eval("$function");
-+		my $function="ShowInfoURL_$pluginname";
-+		&$function($url);
- 	}
- 
- 	if (length($nompage)>$MaxLengthOfShownURL) { $nompage=substr($nompage,0,$MaxLengthOfShownURL)."..."; }
-@@ -5154,8 +5154,8 @@
-     my $linetitle=0;
- 	# Call to plugins' function AddHTMLMenuLink
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuLink'}})  {
--		my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
--		eval("$function");
-+		my $function="AddHTMLMenuLink_$pluginname";
-+		&$function($categ,$menu,$menulink,$menutext);
- 	}
-     foreach my $key (%$menu) { if ($menu->{$key}>0) { $linetitle++; last; } }
- 	if (! $linetitle) { return; }
-@@ -5723,8 +5723,8 @@
- 
- # AWStats output is replaced by a plugin output
- if ($PluginMode) {
--	my $function="BuildFullHTMLOutput_$PluginMode()";
--	eval("$function");
-+	my $function="BuildFullHTMLOutput_$PluginMode";
-+	&$function();
- 	if ($? || $@) { error("$@"); }
- 	&html_end(0);
- 	exit 0;	
-@@ -6623,8 +6623,8 @@
- 			elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); }
-             if ($AtLeastOneSectionPlugin) {
-                	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}})  {
--               		my $function="SectionProcessIp_$pluginname(\$HostResolved)";
--               		eval("$function");
-+					my $function="SectionProcessIp_$pluginname";
-+					&$function($HostResolved);
-                 }
-    		    }
- 		}
-@@ -6638,8 +6638,8 @@
- 				elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
-                 if ($AtLeastOneSectionPlugin) {
-                    	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}})  {
--                   		my $function="SectionProcessIp_$pluginname(\$Host)";
--                   		eval("$function");
-+						my $function="SectionProcessIp_$pluginname";
-+						&$function($Host);
-                     }
-                 }
- 			}
-@@ -6649,8 +6649,8 @@
- 				elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
-                 if ($AtLeastOneSectionPlugin) {
-                    	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}})  {
--                   		my $function="SectionProcessHostname_$pluginname(\$HostResolved)";
--                   		eval("$function");
-+						my $function="SectionProcessHostname_$pluginname";
-+						&$function($HostResolved);
-                     }
-                 }
- 			}
-@@ -7319,8 +7319,8 @@
- 
- 	# Call to plugins' function AddHTMLBodyHeader
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyHeader'}})  {
--		my $function="AddHTMLBodyHeader_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLBodyHeader_$pluginname";
-+		&$function();
- 	}
- 
-     my $WIDTHMENU1=($FrameName eq 'mainleft'?$FRAMEWIDTH:150);
-@@ -7462,8 +7462,8 @@
-     
- 	# Call to plugins' function AddHTMLMenuHeader
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuHeader'}})  {
--		my $function="AddHTMLMenuHeader_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLMenuHeader_$pluginname";
-+		&$function();
- 	}
- 
- 	# MENU
-@@ -7572,8 +7572,8 @@
- 
- 	# Call to plugins' function AddHTMLMenuFooter
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuFooter'}})  {
--		my $function="AddHTMLMenuFooter_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLMenuFooter_$pluginname";
-+		&$function();
- 	}
- 
- 	# Exit if left frame
-@@ -7666,8 +7666,8 @@
- 
- 	# Call to plugins' function AddHTMLContentHeader
- 	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLContentHeader'}})  {
--		my $function="AddHTMLContentHeader_$pluginname()";
--		eval("$function");
-+		my $function="AddHTMLContentHeader_$pluginname";
-+		&$function();
- 	}
- 
- 	# Output particular part
-@@ -7946,8 +7946,8 @@
-     	if ($HTMLOutput{'urldetail'} || $HTMLOutput{'urlentry'} || $HTMLOutput{'urlexit'}) {
-     		# Call to plugins' function ShowPagesFilter
-     		foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesFilter'}})  {
--    			my $function="ShowPagesFilter_$pluginname()";
--    			eval("$function");
-+				my $function="ShowPagesFilter_$pluginname";
-+				&$function();
-     		}
-     		print "$Center<a name=\"urls\">&nbsp;</a><br />\n";
-     		# Show filter form
-@@ -7977,8 +7977,8 @@
-     		if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
-     		# Call to plugins' function ShowPagesAddField
-     		foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--    			my $function="ShowPagesAddField_$pluginname('title')";
--    			eval("$function");
-+				my $function="ShowPagesAddField_$pluginname()";
-+				&$function('title');
-     		}
-     		print "<th>&nbsp;</th></tr>\n";
-     		$total_p=$total_k=$total_e=$total_x=0;
-@@ -8010,8 +8010,8 @@
-     			if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:"&nbsp;")."</td>"; }
-     			# Call to plugins' function ShowPagesAddField
-     			foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--    				my $function="ShowPagesAddField_$pluginname('$key')"; 
--    				eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function($key);
-     			}
-     			print "<td class=\"aws\">";
-     			# alt and title are not provided to reduce page size
-@@ -8039,8 +8039,8 @@
-     			if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:"&nbsp;")."</td>"; }
-     			# Call to plugins' function ShowPagesAddField
-     			foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--    				my $function="ShowPagesAddField_$pluginname('')";
--    				eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function('');
-     			}
-     			print "<td>&nbsp;</td></tr>\n";
-     		}
-@@ -8485,8 +8485,8 @@
-     	if ($htmloutput =~ /^plugin_(\w+)$/) {
-     		my $pluginname=$1;
-     		print "$Center<a name=\"plugin_$pluginname\">&nbsp;</a><br />";
--       		my $function="AddHTMLGraph_$pluginname()";
--       		eval("$function");
-+			my $function="AddHTMLGraph_$pluginname";
-+			&$function();
-     		&html_end(1);
-     	}
-     }
-@@ -9592,8 +9592,8 @@
- 			if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
- 			# Call to plugins' function ShowPagesAddField
- 			foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--				my $function="ShowPagesAddField_$pluginname('title')";
--				eval("$function");
-+				my $function="ShowPagesAddField_$pluginname";
-+				&$function('title');
- 			}
- 			print "<th>&nbsp;</th></tr>\n";
- 			$total_p=$total_e=$total_x=$total_k=0;
-@@ -9624,8 +9624,8 @@
- 				if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:"&nbsp;")."</td>"; }
- 				# Call to plugins' function ShowPagesAddField
- 				foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--					my $function="ShowPagesAddField_$pluginname('$key')";
--					eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function($key);
- 				}
- 				print "<td class=\"aws\">";
- 				if ($ShowPagesStats =~ /P/i && $LogType ne 'F')    { print "<img src=\"$DirIcons\/other\/$BarPng{'hp'}\" width=\"$bredde_p\" height=\"4\"".AltTitle("")." /><br />"; }
-@@ -9653,8 +9653,8 @@
- 				if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:"&nbsp;")."</td>"; }
- 				# Call to plugins' function ShowPagesAddField
- 				foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}})  {
--					my $function="ShowPagesAddField_$pluginname('')";
--					eval("$function");
-+					my $function="ShowPagesAddField_$pluginname";
-+					&$function('');
- 				}
- 				print "<td>&nbsp;</td></tr>\n";
- 			}
diff --git a/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl b/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl
index 8e1c95ad7e97..6ddbf9e3cc65 100644
--- a/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl
+++ b/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl
@@ -1,11 +1,11 @@
---- wwwroot/cgi-bin/awstats.pl.orig	Thu Feb 24 16:02:23 2005
-+++ wwwroot/cgi-bin/awstats.pl	Thu Sep 22 20:33:18 2005
-@@ -1835,7 +1835,7 @@
+--- wwwroot/cgi-bin/awstats.pl.orig	Sun Jan 15 22:28:43 2006
++++ wwwroot/cgi-bin/awstats.pl	Sun Jan 15 22:30:17 2006
+@@ -1911,7 +1911,7 @@
  	# Windows and standard package:        		"$DIR/plugins" (plugins in same dir than awstats.pl)
  	# Redhat :                                  "/usr/local/awstats/wwwroot/cgi-bin/plugins"
  	# Debian package :                    		"/usr/share/awstats/plugins"
 -	my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins");
 +	my @PossiblePluginsDir=("$DIR/plugins","%%PREFIX%%/www/awstats/cgi-bin/plugins","/usr/share/awstats/plugins");
   	my %DirAddedInINC=();
-
+ 
  	#Removed for security reason
diff --git a/www/awstats/files/pkg-message.in b/www/awstats/files/pkg-message.in
index 5997bb49d373..0c69d1ae9e8f 100644
--- a/www/awstats/files/pkg-message.in
+++ b/www/awstats/files/pkg-message.in
@@ -20,3 +20,13 @@ ScriptAlias /awstats/ "%%PREFIX%%/www/awstats/cgi-bin/"
 </Directory>
 
 *****************************************************************
+
+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"
+
+*****************************************************************
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index 985052420390..105c8e581f56 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -69,13 +69,15 @@ www/awstats/cgi-bin/lang/awstats-fr.txt
 www/awstats/cgi-bin/lang/awstats-gl.txt
 www/awstats/cgi-bin/lang/awstats-gr.txt
 www/awstats/cgi-bin/lang/awstats-he.txt
+www/awstats/cgi-bin/lang/awstats-hr.txt
 www/awstats/cgi-bin/lang/awstats-hu.txt
 www/awstats/cgi-bin/lang/awstats-id.txt
 www/awstats/cgi-bin/lang/awstats-is.txt
 www/awstats/cgi-bin/lang/awstats-it.txt
 www/awstats/cgi-bin/lang/awstats-jp.txt
-www/awstats/cgi-bin/lang/awstats-kr.txt
+www/awstats/cgi-bin/lang/awstats-ko.txt
 www/awstats/cgi-bin/lang/awstats-lv.txt
+www/awstats/cgi-bin/lang/awstats-mk.txt
 www/awstats/cgi-bin/lang/awstats-nb.txt
 www/awstats/cgi-bin/lang/awstats-nl.txt
 www/awstats/cgi-bin/lang/awstats-nn.txt
@@ -89,7 +91,6 @@ www/awstats/cgi-bin/lang/awstats-sk.txt
 www/awstats/cgi-bin/lang/awstats-sr.txt
 www/awstats/cgi-bin/lang/awstats-th.txt
 www/awstats/cgi-bin/lang/awstats-tr.txt
-www/awstats/cgi-bin/lang/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/awstats-tw.txt
 www/awstats/cgi-bin/lang/awstats-ua.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
@@ -131,11 +132,12 @@ www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-sr.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt
+www/awstats/cgi-bin/lib/blacklist.txt
 www/awstats/cgi-bin/lib/browsers.pm
+www/awstats/cgi-bin/lib/browsers_phone.pm
 www/awstats/cgi-bin/lib/domains.pm
 www/awstats/cgi-bin/lib/mime.pm
 www/awstats/cgi-bin/lib/operating_systems.pm
-www/awstats/cgi-bin/lib/referer_spam.pm
 www/awstats/cgi-bin/lib/robots.pm
 www/awstats/cgi-bin/lib/search_engines.pm
 www/awstats/cgi-bin/lib/status_http.pm
@@ -158,12 +160,14 @@ www/awstats/cgi-bin/plugins/userinfo.pm
 www/awstats/css/awstats_bw.css
 www/awstats/css/awstats_default.css
 www/awstats/icons/browser/adobe.png
+www/awstats/icons/browser/alcatel.png
 www/awstats/icons/browser/amaya.png
 www/awstats/icons/browser/amigavoyager.png
 www/awstats/icons/browser/apt.png
 www/awstats/icons/browser/avant.png
 www/awstats/icons/browser/aweb.png
 www/awstats/icons/browser/bpftp.png
+www/awstats/icons/browser/bytel.png
 www/awstats/icons/browser/chimera.png
 www/awstats/icons/browser/cyberdog.png
 www/awstats/icons/browser/da.png
@@ -171,6 +175,10 @@ www/awstats/icons/browser/dillo.png
 www/awstats/icons/browser/dreamcast.png
 www/awstats/icons/browser/ecatch.png
 www/awstats/icons/browser/encompass.png
+www/awstats/icons/browser/epiphany.png
+www/awstats/icons/browser/ericsson.png
+www/awstats/icons/browser/feeddemon.png
+www/awstats/icons/browser/feedreader.png
 www/awstats/icons/browser/firefox.png
 www/awstats/icons/browser/fpexpress.png
 www/awstats/icons/browser/fresco.png
@@ -180,29 +188,58 @@ www/awstats/icons/browser/gozilla.png
 www/awstats/icons/browser/hotjava.png
 www/awstats/icons/browser/ibrowse.png
 www/awstats/icons/browser/icab.png
+www/awstats/icons/browser/java.png
+www/awstats/icons/browser/jetbrains_omea.png
 www/awstats/icons/browser/kmeleon.png
 www/awstats/icons/browser/konqueror.png
+www/awstats/icons/browser/lg.png
 www/awstats/icons/browser/lotusnotes.png
 www/awstats/icons/browser/lynx.png
 www/awstats/icons/browser/macweb.png
 www/awstats/icons/browser/mediaplayer.png
 www/awstats/icons/browser/mozilla.png
+www/awstats/icons/browser/motorola.png
+www/awstats/icons/browser/mplayer.png
 www/awstats/icons/browser/msie.png
 www/awstats/icons/browser/msie_large.png
 www/awstats/icons/browser/multizilla.png
 www/awstats/icons/browser/ncsa_mosaic.png
+www/awstats/icons/browser/netnewswire.png
 www/awstats/icons/browser/netpositive.png
 www/awstats/icons/browser/netscape.png
 www/awstats/icons/browser/netscape_large.png
+www/awstats/icons/browser/netshow.png
+www/awstats/icons/browser/newsfire.png
+www/awstats/icons/browser/newsgator.png
+www/awstats/icons/browser/newzcrawler.png
+www/awstats/icons/browser/nokia.png
 www/awstats/icons/browser/notavailable.png
 www/awstats/icons/browser/omniweb.png
 www/awstats/icons/browser/opera.png
+www/awstats/icons/browser/panasonic.png
 www/awstats/icons/browser/pdaphone.png
+www/awstats/icons/browser/philips.png
 www/awstats/icons/browser/phoenix.png
+www/awstats/icons/browser/pluck.png
+www/awstats/icons/browser/pulpfiction.png
+www/awstats/icons/browser/real.png
+www/awstats/icons/browser/rss.png
+www/awstats/icons/browser/rssbandit.png
+www/awstats/icons/browser/rssowl.png
+www/awstats/icons/browser/rssreader.png
 www/awstats/icons/browser/safari.png
+www/awstats/icons/browser/sagem.png
+www/awstats/icons/browser/samsung.png
+www/awstats/icons/browser/sharp.png
+www/awstats/icons/browser/sharpreader.png
+www/awstats/icons/browser/shrook.png
+www/awstats/icons/browser/siemens.png
+www/awstats/icons/browser/sony.png
 www/awstats/icons/browser/staroffice.png
 www/awstats/icons/browser/teleport.png
+www/awstats/icons/browser/trium.png
 www/awstats/icons/browser/unknown.png
+www/awstats/icons/browser/w3c.png
 www/awstats/icons/browser/webcopier.png
 www/awstats/icons/browser/webtv.png
 www/awstats/icons/browser/webzip.png
@@ -396,6 +433,7 @@ www/awstats/icons/flags/mt.png
 www/awstats/icons/flags/mu.png
 www/awstats/icons/flags/museum.png
 www/awstats/icons/flags/mv.png
+www/awstats/icons/flags/mw.png
 www/awstats/icons/flags/mx.png
 www/awstats/icons/flags/my.png
 www/awstats/icons/flags/mz.png
@@ -488,24 +526,42 @@ www/awstats/icons/flags/za.png
 www/awstats/icons/flags/ze.png
 www/awstats/icons/flags/zm.png
 www/awstats/icons/flags/zw.png
+www/awstats/icons/mime/ai.png
 www/awstats/icons/mime/archive.png
 www/awstats/icons/mime/audio.png
 www/awstats/icons/mime/doc.png
+www/awstats/icons/mime/flash.png
 www/awstats/icons/mime/html.png
 www/awstats/icons/mime/image.png
+www/awstats/icons/mime/jscript.png
+www/awstats/icons/mime/lit.png
 www/awstats/icons/mime/notavailable.png
 www/awstats/icons/mime/other.png
 www/awstats/icons/mime/pdf.png
+www/awstats/icons/mime/php.png
+www/awstats/icons/mime/phshop.png
+www/awstats/icons/mime/pl.png
+www/awstats/icons/mime/ppt.png
+www/awstats/icons/mime/quicktime.png
+www/awstats/icons/mime/rar.png
+www/awstats/icons/mime/real.png
 www/awstats/icons/mime/script.png
+www/awstats/icons/mime/svg.png
 www/awstats/icons/mime/text.png
+www/awstats/icons/mime/ttf.png
 www/awstats/icons/mime/unknown.png
 www/awstats/icons/mime/video.png
+www/awstats/icons/mime/wmv.png
 www/awstats/icons/os/aix.png
 www/awstats/icons/os/amigaos.png
 www/awstats/icons/os/apple.png
 www/awstats/icons/os/atari.png
 www/awstats/icons/os/beos.png
+www/awstats/icons/os/bsd.png
+www/awstats/icons/os/bsdfreebsd.png
 www/awstats/icons/os/bsdi.png
+www/awstats/icons/os/bsdnetbsd.png
+www/awstats/icons/os/bsdopenbsd.png
 www/awstats/icons/os/cpm.png
 www/awstats/icons/os/debian.png
 www/awstats/icons/os/digital.png
@@ -518,7 +574,15 @@ www/awstats/icons/os/ibm.png
 www/awstats/icons/os/imode.png
 www/awstats/icons/os/irix.png
 www/awstats/icons/os/java.png
+www/awstats/icons/os/kfreebsd.png
 www/awstats/icons/os/linux.png
+www/awstats/icons/os/linuxcentos.png
+www/awstats/icons/os/linuxdebian.png
+www/awstats/icons/os/linuxfedora.png
+www/awstats/icons/os/linuxmandr.png
+www/awstats/icons/os/linuxredhat.png
+www/awstats/icons/os/linuxsuse.png
+www/awstats/icons/os/linuxubuntu.png
 www/awstats/icons/os/mac.png
 www/awstats/icons/os/macintosh.png
 www/awstats/icons/os/macosx.png
@@ -581,7 +645,7 @@ www/awstats/tools/awstats_updateall.pl
 www/awstats/tools/logresolvemerge.pl
 www/awstats/tools/maillogconvert.pl
 www/awstats/tools/urlaliasbuilder.pl
-www/awstats/tools/webmin/awstats-1.5.wbm
+www/awstats/tools/webmin/awstats-1.6.wbm
 @dirrm www/awstats/tools/webmin
 @dirrm www/awstats/tools
 @dirrm www/awstats/js