Attachment #57304 for bug #86481

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

Lines 20-25 Link Here

(-)/kirby/shared/awstats/Makefile (+9 lines)
20		20
21	NO_BUILD= yes	21	NO_BUILD= yes
22	USE_PERL5_RUN= yes	22	USE_PERL5_RUN= yes
		23	USE_REINPLACE= yes
		24
		25	SUB_FILES= pkg-message
		26
		27	post-patch:
		28	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_buildstaticpages.pl
		29	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_configure.pl
		30	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/tools/awstats_updateall.pl
		31	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
23		32
24	do-install:	33	do-install:
25	@${MKDIR} ${PREFIX}/www/awstats	34	@${MKDIR} ${PREFIX}/www/awstats




--- tools/awstats_buildstaticpages.pl.orig	Sun Feb 20 11:11:06 2005
+++ tools/awstats_buildstaticpages.pl	Thu Sep 22 20:33:32 2005
@@ -293,8 +293,8 @@
 # Check if AWSTATS prog is found
 my $AwstatsFound=0;
 if (-s "$Awstats") { $AwstatsFound=1; }
-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
-	$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
+elsif (-s "%%PREFIX%%/www/awstats/cgi-bin/awstats.pl") {
+	$Awstats="%%PREFIX%%/www/awstats/cgi-bin/awstats.pl";
 	$AwstatsFound=1;
 }
 if (! $AwstatsFound) {




--- tools/awstats_configure.pl.orig	Sat Jan 15 17:42:58 2005
+++ tools/awstats_configure.pl	Thu Sep 22 20:34:07 2005
@@ -29,10 +29,10 @@
 $AWSTATS_DIRDATA_PATH
 /;
 $AWSTATS_PATH='';
-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
+$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon';
+$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css';
+$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes';
+$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin';
 $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf';		# Used only when configure ran on linux
 $AWSTATS_DIRDATA_PATH='/var/lib/awstats';						# Used only when configure ran on linux





--- tools/awstats_updateall.pl.orig	Mon Jun  7 08:27:26 2004
+++ tools/awstats_updateall.pl	Thu Sep 22 01:30:15 2005
@@ -121,8 +121,8 @@
 	# Check if AWSTATS prog is found
 	my $AwstatsFound=0;
 	if (-s "$Awstats") { $AwstatsFound=1; }
-	elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
-		$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
+	elsif (-s "%%PREFIX%%/www/awstats/cgi-bin/awstats.pl") {
+		$Awstats="%%PREFIX%%/www/awstats/cgi-bin/awstats.pl";
 		$AwstatsFound=1;
 	}
 	if (! $AwstatsFound) {

Line 0 Link Here

(-)/kirby/shared/awstats/files/patch-wwwroot-cgi-bin-awstats.pl (+11 lines)
	1	--- wwwroot/cgi-bin/awstats.pl.orig Thu Feb 24 16:02:23 2005
	2	+++ wwwroot/cgi-bin/awstats.pl Thu Sep 22 20:33:18 2005
	3	@@ -1835,7 +1835,7 @@
	4	# Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl)
	5	# Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins"
	6	# Debian package : "/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");
	9	my %DirAddedInINC=();
	10
	11	#Removed for security reason




*****************************************************************
Please add the following to your apache config, and restart.

#
# Directives to allow use of AWStats as a CGI
#
Alias /awstatsclasses "%%PREFIX%%/www/awstats/classes/"
Alias /awstatscss "%%PREFIX%%/www/awstats/css/"
Alias /awstatsicons "%%PREFIX%%/www/awstats/icons/"
ScriptAlias /awstats/ "%%PREFIX%%/www/awstats/cgi-bin/"

#
# This is to permit URL access to scripts/files in AWStats directory.
#
<Directory "%%PREFIX%%/www/awstats/">
    Options None
    AllowOverride None
    Order allow,deny
    Allow from all
</Directory>

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




*****************************************************************
Please add the following to your apache config, and restart.

#
# Directives to allow use of AWStats as a CGI
#
Alias /awstatsclasses "/usr/local/www/awstats/classes/"
Alias /awstatscss "/usr/local/www/awstats/css/"
Alias /awstatsicons "/usr/local/www/awstats/icons/"
ScriptAlias /awstats/ "/usr/local/www/awstats/cgi-bin/"

#
# This is to permit URL access to scripts/files in AWStats directory.
#
<Directory "/usr/local/www/awstats/">
    Options None
    AllowOverride None
    Order allow,deny
    Allow from all
</Directory>

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

Return to bug 86481

Line 0 Link Here

(-)/kirby/shared/awstats/files/patch-tools-awstats_buildstaticpages.pl (+13 lines)
	1	--- tools/awstats_buildstaticpages.pl.orig Sun Feb 20 11:11:06 2005
	2	+++ tools/awstats_buildstaticpages.pl Thu Sep 22 20:33:32 2005
	3	@@ -293,8 +293,8 @@
	4	# Check if AWSTATS prog is found
	5	my $AwstatsFound=0;
	6	if (-s "$Awstats") { $AwstatsFound=1; }
	7	-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
	8	- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
	9	+elsif (-s "%%PREFIX%%/www/awstats/cgi-bin/awstats.pl") {
	10	+ $Awstats="%%PREFIX%%/www/awstats/cgi-bin/awstats.pl";
	11	$AwstatsFound=1;
	12	}
	13	if (! $AwstatsFound) {

Line 0 Link Here

(-)/kirby/shared/awstats/files/patch-tools-awstats_configure.pl (+17 lines)
	1	--- tools/awstats_configure.pl.orig Sat Jan 15 17:42:58 2005
	2	+++ tools/awstats_configure.pl Thu Sep 22 20:34:07 2005
	3	@@ -29,10 +29,10 @@
	4	$AWSTATS_DIRDATA_PATH
	5	/;
	6	$AWSTATS_PATH='';
	7	-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
	8	-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
	9	-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
	10	-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
	11	+$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon';
	12	+$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css';
	13	+$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes';
	14	+$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin';
	15	$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
	16	$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
	17

Line 0 Link Here

(-)/kirby/shared/awstats/files/patch-tools-awstats_updateall.pl (+13 lines)
	1	--- tools/awstats_updateall.pl.orig Mon Jun 7 08:27:26 2004
	2	+++ tools/awstats_updateall.pl Thu Sep 22 01:30:15 2005
	3	@@ -121,8 +121,8 @@
	4	# Check if AWSTATS prog is found
	5	my $AwstatsFound=0;
	6	if (-s "$Awstats") { $AwstatsFound=1; }
	7	- elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
	8	- $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
	9	+ elsif (-s "%%PREFIX%%/www/awstats/cgi-bin/awstats.pl") {
	10	+ $Awstats="%%PREFIX%%/www/awstats/cgi-bin/awstats.pl";
	11	$AwstatsFound=1;
	12	}
	13	if (! $AwstatsFound) {

Line 0 Link Here

(-)/kirby/shared/awstats/files/pkg-message.in (+22 lines)
	1	*****************************************************************
	2	Please add the following to your apache config, and restart.
	3
	4	#
	5	# Directives to allow use of AWStats as a CGI
	6	#
	7	Alias /awstatsclasses "%%PREFIX%%/www/awstats/classes/"
	8	Alias /awstatscss "%%PREFIX%%/www/awstats/css/"
	9	Alias /awstatsicons "%%PREFIX%%/www/awstats/icons/"
	10	ScriptAlias /awstats/ "%%PREFIX%%/www/awstats/cgi-bin/"
	11
	12	#
	13	# This is to permit URL access to scripts/files in AWStats directory.
	14	#
	15	<Directory "%%PREFIX%%/www/awstats/">
	16	Options None
	17	AllowOverride None
	18	Order allow,deny
	19	Allow from all
	20	</Directory>
	21
	22	*****************************************************************

Lines 1-22 Link Here

(-)/kirby/shared/awstats/pkg-message (-22 lines)
1	*****************************************************************
2	Please add the following to your apache config, and restart.
3
4	#
5	# Directives to allow use of AWStats as a CGI
6	#
7	Alias /awstatsclasses "/usr/local/www/awstats/classes/"
8	Alias /awstatscss "/usr/local/www/awstats/css/"
9	Alias /awstatsicons "/usr/local/www/awstats/icons/"
10	ScriptAlias /awstats/ "/usr/local/www/awstats/cgi-bin/"
11
12	#
13	# This is to permit URL access to scripts/files in AWStats directory.
14	#
15	<Directory "/usr/local/www/awstats/">
16	Options None
17	AllowOverride None
18	Order allow,deny
19	Allow from all
20	</Directory>
21
22	*****************************************************************