Attachment #61314 for bug #91888

View | Details | Raw Unified | Return to bug 91888
Collapse All | Expand All




# Date created:			May 13, 2002
# Whom:				Munish Chopra <mchopra@engmail.uwaterloo.ca>
#
# $FreeBSD: ports/www/awstats/Makefile,v 1.24 2005/08/23 20:20:34 simon Exp $
#

PORTNAME=	awstats
PORTVERSION=	6.5
PORTREVISION=	1
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


SUB_FILES=	pkg-message

.include <bsd.port.pre.mk>

.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.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

do-install:
	@${MKDIR} ${PREFIX}/www/awstats

	${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.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

	@${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

post-install:
.if !defined(BATCH)
	@${CAT} ${PKGMESSAGE}
.endif

.include <bsd.port.pre.mk>

.if ${PERL_LEVEL} < 500800
RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)/kirby/shared/awstats/distinfo (-2 / +2 lines)
1	MD5 (awstats-6.4.tgz) = 056e6fb0c7351b17fe5bbbe0aa1297b1	1	MD5 (awstats-6.5.tar.gz) = aef00b2ff5c5413bd2a868299cabd69a
2	SIZE (awstats-6.4.tgz) = 918435	2	SIZE (awstats-6.5.tar.gz) = 1051780




--- 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





--- 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";
 			}

Lines 1-11 Link Here

(-)/kirby/shared/awstats/files/patch-wwwroot-cgi-bin-awstats.pl (-4 / +4 lines)
1	--- wwwroot/cgi-bin/awstats.pl.orig Thu Feb 24 16:02:23 2005	1	--- wwwroot/cgi-bin/awstats.pl.orig Sun Jan 15 22:28:43 2006
2	+++ wwwroot/cgi-bin/awstats.pl Thu Sep 22 20:33:18 2005	2	+++ wwwroot/cgi-bin/awstats.pl Sun Jan 15 22:30:17 2006
3	@@ -1835,7 +1835,7 @@	3	@@ -1911,7 +1911,7 @@
4	# Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl)	4	# Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl)
5	# Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins"	5	# Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins"
6	# Debian package : "/usr/share/awstats/plugins"	6	# Debian package : "/usr/share/awstats/plugins"
7	- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins");	7	- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins");
8	+ my @PossiblePluginsDir=("$DIR/plugins","%%PREFIX%%/www/awstats/cgi-bin/plugins","/usr/share/awstats/plugins");	8	+ my @PossiblePluginsDir=("$DIR/plugins","%%PREFIX%%/www/awstats/cgi-bin/plugins","/usr/share/awstats/plugins");
9	my %DirAddedInINC=();	9	my %DirAddedInINC=();
10		10
11	#Removed for security reason	11	#Removed for security reason




</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"

*****************************************************************




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-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

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

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

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

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

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

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

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

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

www/awstats/tools/logresolvemerge.pl
www/awstats/tools/maillogconvert.pl
www/awstats/tools/urlaliasbuilder.pl
www/awstats/tools/webmin/awstats-1.6.wbm
@dirrm www/awstats/tools/webmin
@dirrm www/awstats/tools
@dirrm www/awstats/js

Return to bug 91888

Lines 2-17 Link Here

(-)/kirby/shared/awstats/Makefile (-15 / +14 lines)
2	# Date created: May 13, 2002	2	# Date created: May 13, 2002
3	# Whom: Munish Chopra <mchopra@engmail.uwaterloo.ca>	3	# Whom: Munish Chopra <mchopra@engmail.uwaterloo.ca>
4	#	4	#
5	# $FreeBSD: ports/www/awstats/Makefile,v 1.25 2005/10/26 00:30:46 mnag Exp $	5	# $FreeBSD: ports/www/awstats/Makefile,v 1.24 2005/08/23 20:20:34 simon Exp $
6	#	6	#
7		7
8	PORTNAME= awstats	8	PORTNAME= awstats
9	PORTVERSION= 6.4	9	PORTVERSION= 6.5
10	PORTREVISION= 1
11	CATEGORIES= www	10	CATEGORIES= www
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	EXTRACT_SUFX= .tgz
15		13
16	MAINTAINER= webmaster@lightningfire.net	14	MAINTAINER= webmaster@lightningfire.net
17	COMMENT= Free real-time logfile analyzer to get advanced web statistics	15	COMMENT= Free real-time logfile analyzer to get advanced web statistics
Lines 24-40 Link Here
24		22
25	SUB_FILES= pkg-message	23	SUB_FILES= pkg-message
26		24
27	.include <bsd.port.pre.mk>
28
29	.if ${PERL_LEVEL} < 500800
30	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
31	.endif
32
33	post-patch:	25	post-patch:
34	# ${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl	26	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl
35	# ${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_configure.pl	27	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_configure.pl
36	# ${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_updateall.pl	28	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_updateall.pl
37	# ${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl	29	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
38		30
39	do-install:	31	do-install:
40	@${MKDIR} ${PREFIX}/www/awstats	32	@${MKDIR} ${PREFIX}/www/awstats
Lines 65-71 Link Here
65	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools	57	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
66	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools	58	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
67	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools	59	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
68	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.5.wbm ${PREFIX}/www/awstats/tools/webmin	60	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.wbm ${PREFIX}/www/awstats/tools/webmin
69	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin	61	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin
70	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin	62	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin
71	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin	63	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin
Lines 101-106 Link Here
101	@${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats"	93	@${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats"
102	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"	94	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"
103	@${ECHO_CMD} ""	95	@${ECHO_CMD} ""
		96
104	.if !defined(NOPORTDOCS)	97	.if !defined(NOPORTDOCS)
105	@${MKDIR} ${DOCSDIR}/images	98	@${MKDIR} ${DOCSDIR}/images
106	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images	99	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
Lines 110-115 Link Here
110	post-install:	103	post-install:
111	.if !defined(BATCH)	104	.if !defined(BATCH)
112	@${CAT} ${PKGMESSAGE}	105	@${CAT} ${PKGMESSAGE}
		106	.endif
		107
		108	.include <bsd.port.pre.mk>
		109
		110	.if ${PERL_LEVEL} < 500800
		111	RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
113	.endif	112	.endif
114		113
115	.include <bsd.port.post.mk>	114	.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)/kirby/shared/awstats/files/patch-awstats.model.conf (-5 / +6 lines)
1	--- wwwroot/cgi-bin/awstats.model.conf.orig Sat Dec 18 14:33:27 2004	1	--- wwwroot/cgi-bin/awstats.model.conf.orig Sun Jan 15 21:54:18 2006
2	+++ wwwroot/cgi-bin/awstats.model.conf Sat Dec 18 14:34:38 2004	2	+++ wwwroot/cgi-bin/awstats.model.conf Sun Jan 15 21:55:00 2006
3	@@ -208,7 +208,7 @@	3	@@ -219,7 +219,7 @@
4	# Example: "../icon"	4	# Example: "../icon"
5	# Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")	5	# Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
6	#	6	#
7	-DirIcons="/icon"	7	-DirIcons="/icon"
8	+DirIcons="/awstatsicons"	8	+DirIcons="/awstatsicons"
9		9
10		10
11	# When this parameter is set to 1, AWStats add a button on report page to	11	# When this parameter is set to 1, AWStats add a button on report page to
		12

Lines 1-297 Link Here

(-)/kirby/shared/awstats/files/patch-awstats.pl (-297 lines)
1	--- wwwroot/cgi-bin/awstats.pl.orig Thu Feb 24 23:02:23 2005
2	+++ wwwroot/cgi-bin/awstats.pl Thu Aug 18 08:26:22 2005
3	@@ -625,8 +625,8 @@
4	EOF
5	# Call to plugins' function AddHTMLStyles
6	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLStyles'}}) {
7	- my $function="AddHTMLStyles_$pluginname()";
8	- eval("$function");
9	+ my $function="AddHTMLStyles_$pluginname";
10	+ &$function();
11	}
12
13	if ($BuildReportFormat eq 'xhtml' \|\| $BuildReportFormat eq 'xml') { print ($ENV{'HTTP_USER_AGENT'}=~/Firebird/i?"//-->\n":"]]>\n"); }
14	@@ -660,8 +660,8 @@
15
16	# Call to plugins' function AddHTMLBodyFooter
17	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyFooter'}}) {
18	- my $function="AddHTMLBodyFooter_$pluginname()";
19	- eval("$function");
20	+ my $function="AddHTMLBodyFooter_$pluginname";
21	+ &$function();
22	}
23
24	if ($FrameName ne 'index' && $FrameName ne 'mainleft') {
25	@@ -3254,15 +3254,15 @@
26	# The plugin for this section was loaded
27	$found=1;
28	my $issectiontoload=$SectionsToLoad{"plugin_$pluginname"};
29	- my $function="SectionReadHistory_$pluginname(\$issectiontoload,\$readxml,\$xmleb,\$countlines)";
30	- eval("$function");
31	+ my $function="SectionReadHistory_$pluginname";
32	+ &$function($issectiontoload,$readxml,$xmleb,$countlines);
33	delete $SectionsToLoad{"plugin_$pluginname"};
34	if ($SectionsToSave{"plugin_$pluginname"}) {
35	Save_History("plugin_$pluginname",$year,$month);
36	delete $SectionsToSave{"plugin_$pluginname"};
37	if ($withpurge) {
38	- my $function="SectionInitHashArray_$pluginname()";
39	- eval("$function");
40	+ my $function="SectionInitHashArray_$pluginname";
41	+ &$function();
42	}
43	}
44	last;
45	@@ -3977,8 +3977,8 @@
46	if ($AtLeastOneSectionPlugin && $sectiontosave =~ /^plugin_(\w+)$/i) {
47	my $pluginname=$1;
48	if ($PluginsLoaded{'SectionInitHashArray'}{"$pluginname"}) {
49	- my $function="SectionWriteHistory_$pluginname(\$xml,\$xmlbb,\$xmlbs,\$xmlbe,\$xmlrb,\$xmlrs,\$xmlre,\$xmleb,\$xmlee)";
50	- eval("$function");
51	+ my $function="SectionWriteHistory_$pluginname";
52	+ &$function($xml,$xmlbb,$xmlbs,$xmlbe,$xmlrb,$xmlrs,$xmlre,$xmleb,$xmlee);
53	}
54	}
55
56	@@ -4203,8 +4203,8 @@
57	%{'_section_' . $ix . '_l'} = %{'_section_' . $ix . '_p'} = ();
58	}
59	foreach my $pluginname (keys %{$PluginsLoaded{'SectionInitHashArray'}}) {
60	- my $function="SectionInitHashArray_$pluginname()";
61	- eval("$function");
62	+ my $function="SectionInitHashArray_$pluginname";
63	+ &$function();
64	}
65	}
66
67	@@ -4788,8 +4788,8 @@
68	my $user=shift;
69	# Call to plugins' function ShowInfoUser
70	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoUser'}}) {
71	- my $function="ShowInfoUser_$pluginname('$user')";
72	- eval("$function");
73	+ my $function="ShowInfoUser_$pluginname";
74	+ &$function($user);
75	}
76	}
77
78	@@ -4804,8 +4804,8 @@
79	my $user=shift;
80	# Call to plugins' function ShowInfoCluster
81	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoCluster'}}) {
82	- my $function="ShowInfoCluster_$pluginname('$user')";
83	- eval("$function");
84	+ my $function="ShowInfoCluster_$pluginname";
85	+ &$function($user);
86	}
87	}
88
89	@@ -4820,8 +4820,8 @@
90	my $host=shift;
91	# Call to plugins' function ShowInfoHost
92	foreach my $pluginname (sort keys %{$PluginsLoaded{'ShowInfoHost'}}) {
93	- my $function="ShowInfoHost_$pluginname('$host')";
94	- eval("$function");
95	+ my $function="ShowInfoHost_$pluginname";
96	+ &$function($host);
97	}
98	}
99
100	@@ -4838,8 +4838,8 @@
101
102	# Call to plugins' function ShowInfoURL
103	foreach my $pluginname (keys %{$PluginsLoaded{'ShowInfoURL'}}) {
104	- my $function="ShowInfoURL_$pluginname('$url')";
105	- eval("$function");
106	+ my $function="ShowInfoURL_$pluginname";
107	+ &$function($url);
108	}
109
110	if (length($nompage)>$MaxLengthOfShownURL) { $nompage=substr($nompage,0,$MaxLengthOfShownURL)."..."; }
111	@@ -5154,8 +5154,8 @@
112	my $linetitle=0;
113	# Call to plugins' function AddHTMLMenuLink
114	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuLink'}}) {
115	- my $function="AddHTMLMenuLink_$pluginname('$categ',\$menu,\$menulink,\$menutext)";
116	- eval("$function");
117	+ my $function="AddHTMLMenuLink_$pluginname";
118	+ &$function($categ,$menu,$menulink,$menutext);
119	}
120	foreach my $key (%$menu) { if ($menu->{$key}>0) { $linetitle++; last; } }
121	if (! $linetitle) { return; }
122	@@ -5723,8 +5723,8 @@
123
124	# AWStats output is replaced by a plugin output
125	if ($PluginMode) {
126	- my $function="BuildFullHTMLOutput_$PluginMode()";
127	- eval("$function");
128	+ my $function="BuildFullHTMLOutput_$PluginMode";
129	+ &$function();
130	if ($? \|\| $@) { error("$@"); }
131	&html_end(0);
132	exit 0;
133	@@ -6623,8 +6623,8 @@
134	elsif ($PluginsLoaded{'GetCountryCodeByAddr'}{'geoip'}) { $Domain=GetCountryCodeByAddr_geoip($HostResolved); }
135	if ($AtLeastOneSectionPlugin) {
136	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) {
137	- my $function="SectionProcessIp_$pluginname(\$HostResolved)";
138	- eval("$function");
139	+ my $function="SectionProcessIp_$pluginname";
140	+ &$function($HostResolved);
141	}
142	}
143	}
144	@@ -6638,8 +6638,8 @@
145	elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
146	if ($AtLeastOneSectionPlugin) {
147	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessIp'}}) {
148	- my $function="SectionProcessIp_$pluginname(\$Host)";
149	- eval("$function");
150	+ my $function="SectionProcessIp_$pluginname";
151	+ &$function($Host);
152	}
153	}
154	}
155	@@ -6649,8 +6649,8 @@
156	elsif ($HostResolved =~ /\.(\w+)$/) { $Domain=$1; }
157	if ($AtLeastOneSectionPlugin) {
158	foreach my $pluginname (keys %{$PluginsLoaded{'SectionProcessHostname'}}) {
159	- my $function="SectionProcessHostname_$pluginname(\$HostResolved)";
160	- eval("$function");
161	+ my $function="SectionProcessHostname_$pluginname";
162	+ &$function($HostResolved);
163	}
164	}
165	}
166	@@ -7319,8 +7319,8 @@
167
168	# Call to plugins' function AddHTMLBodyHeader
169	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLBodyHeader'}}) {
170	- my $function="AddHTMLBodyHeader_$pluginname()";
171	- eval("$function");
172	+ my $function="AddHTMLBodyHeader_$pluginname";
173	+ &$function();
174	}
175
176	my $WIDTHMENU1=($FrameName eq 'mainleft'?$FRAMEWIDTH:150);
177	@@ -7462,8 +7462,8 @@
178
179	# Call to plugins' function AddHTMLMenuHeader
180	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuHeader'}}) {
181	- my $function="AddHTMLMenuHeader_$pluginname()";
182	- eval("$function");
183	+ my $function="AddHTMLMenuHeader_$pluginname";
184	+ &$function();
185	}
186
187	# MENU
188	@@ -7572,8 +7572,8 @@
189
190	# Call to plugins' function AddHTMLMenuFooter
191	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLMenuFooter'}}) {
192	- my $function="AddHTMLMenuFooter_$pluginname()";
193	- eval("$function");
194	+ my $function="AddHTMLMenuFooter_$pluginname";
195	+ &$function();
196	}
197
198	# Exit if left frame
199	@@ -7666,8 +7666,8 @@
200
201	# Call to plugins' function AddHTMLContentHeader
202	foreach my $pluginname (keys %{$PluginsLoaded{'AddHTMLContentHeader'}}) {
203	- my $function="AddHTMLContentHeader_$pluginname()";
204	- eval("$function");
205	+ my $function="AddHTMLContentHeader_$pluginname";
206	+ &$function();
207	}
208
209	# Output particular part
210	@@ -7946,8 +7946,8 @@
211	if ($HTMLOutput{'urldetail'} \|\| $HTMLOutput{'urlentry'} \|\| $HTMLOutput{'urlexit'}) {
212	# Call to plugins' function ShowPagesFilter
213	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesFilter'}}) {
214	- my $function="ShowPagesFilter_$pluginname()";
215	- eval("$function");
216	+ my $function="ShowPagesFilter_$pluginname";
217	+ &$function();
218	}
219	print "$Center<a name=\"urls\"> </a><br />\n";
220	# Show filter form
221	@@ -7977,8 +7977,8 @@
222	if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
223	# Call to plugins' function ShowPagesAddField
224	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
225	- my $function="ShowPagesAddField_$pluginname('title')";
226	- eval("$function");
227	+ my $function="ShowPagesAddField_$pluginname()";
228	+ &$function('title');
229	}
230	print "<th> </th></tr>\n";
231	$total_p=$total_k=$total_e=$total_x=0;
232	@@ -8010,8 +8010,8 @@
233	if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:" ")."</td>"; }
234	# Call to plugins' function ShowPagesAddField
235	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
236	- my $function="ShowPagesAddField_$pluginname('$key')";
237	- eval("$function");
238	+ my $function="ShowPagesAddField_$pluginname";
239	+ &$function($key);
240	}
241	print "<td class=\"aws\">";
242	# alt and title are not provided to reduce page size
243	@@ -8039,8 +8039,8 @@
244	if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:" ")."</td>"; }
245	# Call to plugins' function ShowPagesAddField
246	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
247	- my $function="ShowPagesAddField_$pluginname('')";
248	- eval("$function");
249	+ my $function="ShowPagesAddField_$pluginname";
250	+ &$function('');
251	}
252	print "<td> </td></tr>\n";
253	}
254	@@ -8485,8 +8485,8 @@
255	if ($htmloutput =~ /^plugin_(\w+)$/) {
256	my $pluginname=$1;
257	print "$Center<a name=\"plugin_$pluginname\"> </a><br />";
258	- my $function="AddHTMLGraph_$pluginname()";
259	- eval("$function");
260	+ my $function="AddHTMLGraph_$pluginname";
261	+ &$function();
262	&html_end(1);
263	}
264	}
265	@@ -9592,8 +9592,8 @@
266	if ($ShowPagesStats =~ /X/i) { print "<th bgcolor=\"#$color_x\" width=\"80\">$Message[116]</th>"; }
267	# Call to plugins' function ShowPagesAddField
268	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
269	- my $function="ShowPagesAddField_$pluginname('title')";
270	- eval("$function");
271	+ my $function="ShowPagesAddField_$pluginname";
272	+ &$function('title');
273	}
274	print "<th> </th></tr>\n";
275	$total_p=$total_e=$total_x=$total_k=0;
276	@@ -9624,8 +9624,8 @@
277	if ($ShowPagesStats =~ /X/i) { print "<td>".($_url_x{$key}?$_url_x{$key}:" ")."</td>"; }
278	# Call to plugins' function ShowPagesAddField
279	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
280	- my $function="ShowPagesAddField_$pluginname('$key')";
281	- eval("$function");
282	+ my $function="ShowPagesAddField_$pluginname";
283	+ &$function($key);
284	}
285	print "<td class=\"aws\">";
286	if ($ShowPagesStats =~ /P/i && $LogType ne 'F') { print "<img src=\"$DirIcons\/other\/$BarPng{'hp'}\" width=\"$bredde_p\" height=\"4\"".AltTitle("")." /><br />"; }
287	@@ -9653,8 +9653,8 @@
288	if ($ShowPagesStats =~ /X/i) { print "<td>".($rest_x?$rest_x:" ")."</td>"; }
289	# Call to plugins' function ShowPagesAddField
290	foreach my $pluginname (keys %{$PluginsLoaded{'ShowPagesAddField'}}) {
291	- my $function="ShowPagesAddField_$pluginname('')";
292	- eval("$function");
293	+ my $function="ShowPagesAddField_$pluginname";
294	+ &$function('');
295	}
296	print "<td> </td></tr>\n";
297	}

Lines 20-22 Link Here

(-)/kirby/shared/awstats/files/pkg-message.in (+10 lines)
20	</Directory>	20	</Directory>
21		21
22	*****************************************************************	22	*****************************************************************
		23
		24	If you are upgrading from AWStats 6.4 or older, please note the following:
		25
		26	If you used the geoip plugin, you must edit your AWStats config file
		27	to change the line
		28	LoadPlugin="geoip GEOIP_STANDARD"
		29	into
		30	LoadPlugin="geoip GEOIP_STANDARD /pathto/GeoIP.dat"
		31
		32	*****************************************************************

Lines 69-81 Link Here

(-)/kirby/shared/awstats/pkg-plist (-4 / +68 lines)
69	www/awstats/cgi-bin/lang/awstats-gl.txt	69	www/awstats/cgi-bin/lang/awstats-gl.txt
70	www/awstats/cgi-bin/lang/awstats-gr.txt	70	www/awstats/cgi-bin/lang/awstats-gr.txt
71	www/awstats/cgi-bin/lang/awstats-he.txt	71	www/awstats/cgi-bin/lang/awstats-he.txt
		72	www/awstats/cgi-bin/lang/awstats-hr.txt
72	www/awstats/cgi-bin/lang/awstats-hu.txt	73	www/awstats/cgi-bin/lang/awstats-hu.txt
73	www/awstats/cgi-bin/lang/awstats-id.txt	74	www/awstats/cgi-bin/lang/awstats-id.txt
74	www/awstats/cgi-bin/lang/awstats-is.txt	75	www/awstats/cgi-bin/lang/awstats-is.txt
75	www/awstats/cgi-bin/lang/awstats-it.txt	76	www/awstats/cgi-bin/lang/awstats-it.txt
76	www/awstats/cgi-bin/lang/awstats-jp.txt	77	www/awstats/cgi-bin/lang/awstats-jp.txt
77	www/awstats/cgi-bin/lang/awstats-kr.txt	78	www/awstats/cgi-bin/lang/awstats-ko.txt
78	www/awstats/cgi-bin/lang/awstats-lv.txt	79	www/awstats/cgi-bin/lang/awstats-lv.txt
		80	www/awstats/cgi-bin/lang/awstats-mk.txt
79	www/awstats/cgi-bin/lang/awstats-nb.txt	81	www/awstats/cgi-bin/lang/awstats-nb.txt
80	www/awstats/cgi-bin/lang/awstats-nl.txt	82	www/awstats/cgi-bin/lang/awstats-nl.txt
81	www/awstats/cgi-bin/lang/awstats-nn.txt	83	www/awstats/cgi-bin/lang/awstats-nn.txt
Lines 89-95 Link Here
89	www/awstats/cgi-bin/lang/awstats-sr.txt	91	www/awstats/cgi-bin/lang/awstats-sr.txt
90	www/awstats/cgi-bin/lang/awstats-th.txt	92	www/awstats/cgi-bin/lang/awstats-th.txt
91	www/awstats/cgi-bin/lang/awstats-tr.txt	93	www/awstats/cgi-bin/lang/awstats-tr.txt
92	www/awstats/cgi-bin/lang/awstats-tt-br.txt
93	www/awstats/cgi-bin/lang/awstats-tw.txt	94	www/awstats/cgi-bin/lang/awstats-tw.txt
94	www/awstats/cgi-bin/lang/awstats-ua.txt	95	www/awstats/cgi-bin/lang/awstats-ua.txt
95	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt	96	www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
Lines 131-141 Link Here
131	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt	132	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt
132	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt	133	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt
133	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt	134	www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt
		135	www/awstats/cgi-bin/lib/blacklist.txt
134	www/awstats/cgi-bin/lib/browsers.pm	136	www/awstats/cgi-bin/lib/browsers.pm
		137	www/awstats/cgi-bin/lib/browsers_phone.pm
135	www/awstats/cgi-bin/lib/domains.pm	138	www/awstats/cgi-bin/lib/domains.pm
136	www/awstats/cgi-bin/lib/mime.pm	139	www/awstats/cgi-bin/lib/mime.pm
137	www/awstats/cgi-bin/lib/operating_systems.pm	140	www/awstats/cgi-bin/lib/operating_systems.pm
138	www/awstats/cgi-bin/lib/referer_spam.pm
139	www/awstats/cgi-bin/lib/robots.pm	141	www/awstats/cgi-bin/lib/robots.pm
140	www/awstats/cgi-bin/lib/search_engines.pm	142	www/awstats/cgi-bin/lib/search_engines.pm
141	www/awstats/cgi-bin/lib/status_http.pm	143	www/awstats/cgi-bin/lib/status_http.pm
Lines 158-169 Link Here
158	www/awstats/css/awstats_bw.css	160	www/awstats/css/awstats_bw.css
159	www/awstats/css/awstats_default.css	161	www/awstats/css/awstats_default.css
160	www/awstats/icons/browser/adobe.png	162	www/awstats/icons/browser/adobe.png
		163	www/awstats/icons/browser/alcatel.png
161	www/awstats/icons/browser/amaya.png	164	www/awstats/icons/browser/amaya.png
162	www/awstats/icons/browser/amigavoyager.png	165	www/awstats/icons/browser/amigavoyager.png
163	www/awstats/icons/browser/apt.png	166	www/awstats/icons/browser/apt.png
164	www/awstats/icons/browser/avant.png	167	www/awstats/icons/browser/avant.png
165	www/awstats/icons/browser/aweb.png	168	www/awstats/icons/browser/aweb.png
166	www/awstats/icons/browser/bpftp.png	169	www/awstats/icons/browser/bpftp.png
		170	www/awstats/icons/browser/bytel.png
167	www/awstats/icons/browser/chimera.png	171	www/awstats/icons/browser/chimera.png
168	www/awstats/icons/browser/cyberdog.png	172	www/awstats/icons/browser/cyberdog.png
169	www/awstats/icons/browser/da.png	173	www/awstats/icons/browser/da.png
Lines 171-176 Link Here
171	www/awstats/icons/browser/dreamcast.png	175	www/awstats/icons/browser/dreamcast.png
172	www/awstats/icons/browser/ecatch.png	176	www/awstats/icons/browser/ecatch.png
173	www/awstats/icons/browser/encompass.png	177	www/awstats/icons/browser/encompass.png
		178	www/awstats/icons/browser/epiphany.png
		179	www/awstats/icons/browser/ericsson.png
		180	www/awstats/icons/browser/feeddemon.png
		181	www/awstats/icons/browser/feedreader.png
174	www/awstats/icons/browser/firefox.png	182	www/awstats/icons/browser/firefox.png
175	www/awstats/icons/browser/fpexpress.png	183	www/awstats/icons/browser/fpexpress.png
176	www/awstats/icons/browser/fresco.png	184	www/awstats/icons/browser/fresco.png
Lines 180-208 Link Here
180	www/awstats/icons/browser/hotjava.png	188	www/awstats/icons/browser/hotjava.png
181	www/awstats/icons/browser/ibrowse.png	189	www/awstats/icons/browser/ibrowse.png
182	www/awstats/icons/browser/icab.png	190	www/awstats/icons/browser/icab.png
		191	www/awstats/icons/browser/java.png
		192	www/awstats/icons/browser/jetbrains_omea.png
183	www/awstats/icons/browser/kmeleon.png	193	www/awstats/icons/browser/kmeleon.png
184	www/awstats/icons/browser/konqueror.png	194	www/awstats/icons/browser/konqueror.png
		195	www/awstats/icons/browser/lg.png
185	www/awstats/icons/browser/lotusnotes.png	196	www/awstats/icons/browser/lotusnotes.png
186	www/awstats/icons/browser/lynx.png	197	www/awstats/icons/browser/lynx.png
187	www/awstats/icons/browser/macweb.png	198	www/awstats/icons/browser/macweb.png
188	www/awstats/icons/browser/mediaplayer.png	199	www/awstats/icons/browser/mediaplayer.png
189	www/awstats/icons/browser/mozilla.png	200	www/awstats/icons/browser/mozilla.png
		201	www/awstats/icons/browser/motorola.png
		202	www/awstats/icons/browser/mplayer.png
190	www/awstats/icons/browser/msie.png	203	www/awstats/icons/browser/msie.png
191	www/awstats/icons/browser/msie_large.png	204	www/awstats/icons/browser/msie_large.png
192	www/awstats/icons/browser/multizilla.png	205	www/awstats/icons/browser/multizilla.png
193	www/awstats/icons/browser/ncsa_mosaic.png	206	www/awstats/icons/browser/ncsa_mosaic.png
		207	www/awstats/icons/browser/netnewswire.png
194	www/awstats/icons/browser/netpositive.png	208	www/awstats/icons/browser/netpositive.png
195	www/awstats/icons/browser/netscape.png	209	www/awstats/icons/browser/netscape.png
196	www/awstats/icons/browser/netscape_large.png	210	www/awstats/icons/browser/netscape_large.png
		211	www/awstats/icons/browser/netshow.png
		212	www/awstats/icons/browser/newsfire.png
		213	www/awstats/icons/browser/newsgator.png
		214	www/awstats/icons/browser/newzcrawler.png
		215	www/awstats/icons/browser/nokia.png
197	www/awstats/icons/browser/notavailable.png	216	www/awstats/icons/browser/notavailable.png
198	www/awstats/icons/browser/omniweb.png	217	www/awstats/icons/browser/omniweb.png
199	www/awstats/icons/browser/opera.png	218	www/awstats/icons/browser/opera.png
		219	www/awstats/icons/browser/panasonic.png
200	www/awstats/icons/browser/pdaphone.png	220	www/awstats/icons/browser/pdaphone.png
		221	www/awstats/icons/browser/philips.png
201	www/awstats/icons/browser/phoenix.png	222	www/awstats/icons/browser/phoenix.png
		223	www/awstats/icons/browser/pluck.png
		224	www/awstats/icons/browser/pulpfiction.png
		225	www/awstats/icons/browser/real.png
		226	www/awstats/icons/browser/rss.png
		227	www/awstats/icons/browser/rssbandit.png
		228	www/awstats/icons/browser/rssowl.png
		229	www/awstats/icons/browser/rssreader.png
202	www/awstats/icons/browser/safari.png	230	www/awstats/icons/browser/safari.png
		231	www/awstats/icons/browser/sagem.png
		232	www/awstats/icons/browser/samsung.png
		233	www/awstats/icons/browser/sharp.png
		234	www/awstats/icons/browser/sharpreader.png
		235	www/awstats/icons/browser/shrook.png
		236	www/awstats/icons/browser/siemens.png
		237	www/awstats/icons/browser/sony.png
203	www/awstats/icons/browser/staroffice.png	238	www/awstats/icons/browser/staroffice.png
204	www/awstats/icons/browser/teleport.png	239	www/awstats/icons/browser/teleport.png
		240	www/awstats/icons/browser/trium.png
205	www/awstats/icons/browser/unknown.png	241	www/awstats/icons/browser/unknown.png
		242	www/awstats/icons/browser/w3c.png
206	www/awstats/icons/browser/webcopier.png	243	www/awstats/icons/browser/webcopier.png
207	www/awstats/icons/browser/webtv.png	244	www/awstats/icons/browser/webtv.png
208	www/awstats/icons/browser/webzip.png	245	www/awstats/icons/browser/webzip.png
Lines 396-401 Link Here
396	www/awstats/icons/flags/mu.png	433	www/awstats/icons/flags/mu.png
397	www/awstats/icons/flags/museum.png	434	www/awstats/icons/flags/museum.png
398	www/awstats/icons/flags/mv.png	435	www/awstats/icons/flags/mv.png
		436	www/awstats/icons/flags/mw.png
399	www/awstats/icons/flags/mx.png	437	www/awstats/icons/flags/mx.png
400	www/awstats/icons/flags/my.png	438	www/awstats/icons/flags/my.png
401	www/awstats/icons/flags/mz.png	439	www/awstats/icons/flags/mz.png
Lines 488-511 Link Here
488	www/awstats/icons/flags/ze.png	526	www/awstats/icons/flags/ze.png
489	www/awstats/icons/flags/zm.png	527	www/awstats/icons/flags/zm.png
490	www/awstats/icons/flags/zw.png	528	www/awstats/icons/flags/zw.png
		529	www/awstats/icons/mime/ai.png
491	www/awstats/icons/mime/archive.png	530	www/awstats/icons/mime/archive.png
492	www/awstats/icons/mime/audio.png	531	www/awstats/icons/mime/audio.png
493	www/awstats/icons/mime/doc.png	532	www/awstats/icons/mime/doc.png
		533	www/awstats/icons/mime/flash.png
494	www/awstats/icons/mime/html.png	534	www/awstats/icons/mime/html.png
495	www/awstats/icons/mime/image.png	535	www/awstats/icons/mime/image.png
		536	www/awstats/icons/mime/jscript.png
		537	www/awstats/icons/mime/lit.png
496	www/awstats/icons/mime/notavailable.png	538	www/awstats/icons/mime/notavailable.png
497	www/awstats/icons/mime/other.png	539	www/awstats/icons/mime/other.png
498	www/awstats/icons/mime/pdf.png	540	www/awstats/icons/mime/pdf.png
		541	www/awstats/icons/mime/php.png
		542	www/awstats/icons/mime/phshop.png
		543	www/awstats/icons/mime/pl.png
		544	www/awstats/icons/mime/ppt.png
		545	www/awstats/icons/mime/quicktime.png
		546	www/awstats/icons/mime/rar.png
		547	www/awstats/icons/mime/real.png
499	www/awstats/icons/mime/script.png	548	www/awstats/icons/mime/script.png
		549	www/awstats/icons/mime/svg.png
500	www/awstats/icons/mime/text.png	550	www/awstats/icons/mime/text.png
		551	www/awstats/icons/mime/ttf.png
501	www/awstats/icons/mime/unknown.png	552	www/awstats/icons/mime/unknown.png
502	www/awstats/icons/mime/video.png	553	www/awstats/icons/mime/video.png
		554	www/awstats/icons/mime/wmv.png
503	www/awstats/icons/os/aix.png	555	www/awstats/icons/os/aix.png
504	www/awstats/icons/os/amigaos.png	556	www/awstats/icons/os/amigaos.png
505	www/awstats/icons/os/apple.png	557	www/awstats/icons/os/apple.png
506	www/awstats/icons/os/atari.png	558	www/awstats/icons/os/atari.png
507	www/awstats/icons/os/beos.png	559	www/awstats/icons/os/beos.png
		560	www/awstats/icons/os/bsd.png
		561	www/awstats/icons/os/bsdfreebsd.png
508	www/awstats/icons/os/bsdi.png	562	www/awstats/icons/os/bsdi.png
		563	www/awstats/icons/os/bsdnetbsd.png
		564	www/awstats/icons/os/bsdopenbsd.png
509	www/awstats/icons/os/cpm.png	565	www/awstats/icons/os/cpm.png
510	www/awstats/icons/os/debian.png	566	www/awstats/icons/os/debian.png
511	www/awstats/icons/os/digital.png	567	www/awstats/icons/os/digital.png
Lines 518-524 Link Here
518	www/awstats/icons/os/imode.png	574	www/awstats/icons/os/imode.png
519	www/awstats/icons/os/irix.png	575	www/awstats/icons/os/irix.png
520	www/awstats/icons/os/java.png	576	www/awstats/icons/os/java.png
		577	www/awstats/icons/os/kfreebsd.png
521	www/awstats/icons/os/linux.png	578	www/awstats/icons/os/linux.png
		579	www/awstats/icons/os/linuxcentos.png
		580	www/awstats/icons/os/linuxdebian.png
		581	www/awstats/icons/os/linuxfedora.png
		582	www/awstats/icons/os/linuxmandr.png
		583	www/awstats/icons/os/linuxredhat.png
		584	www/awstats/icons/os/linuxsuse.png
		585	www/awstats/icons/os/linuxubuntu.png
522	www/awstats/icons/os/mac.png	586	www/awstats/icons/os/mac.png
523	www/awstats/icons/os/macintosh.png	587	www/awstats/icons/os/macintosh.png
524	www/awstats/icons/os/macosx.png	588	www/awstats/icons/os/macosx.png
Lines 581-587 Link Here
581	www/awstats/tools/logresolvemerge.pl	645	www/awstats/tools/logresolvemerge.pl
582	www/awstats/tools/maillogconvert.pl	646	www/awstats/tools/maillogconvert.pl
583	www/awstats/tools/urlaliasbuilder.pl	647	www/awstats/tools/urlaliasbuilder.pl
584	www/awstats/tools/webmin/awstats-1.5.wbm	648	www/awstats/tools/webmin/awstats-1.6.wbm
585	@dirrm www/awstats/tools/webmin	649	@dirrm www/awstats/tools/webmin
586	@dirrm www/awstats/tools	650	@dirrm www/awstats/tools
587	@dirrm www/awstats/js	651	@dirrm www/awstats/js