- Tweak upstream configure script to run on FreeBSD [1]

- Replace spaces with tabs to pacify portlint

PR:		ports/153449 [1]
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
Approved by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)
Feature safe:	yes
This commit is contained in:
Sahil Tandon 2011-02-06 04:11:17 +00:00
parent 223459a6c7
commit 1930bd653c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=268702
2 changed files with 82 additions and 10 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= awstats PORTNAME= awstats
PORTVERSION= 7.0 PORTVERSION= 7.0
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/AWStats/${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/AWStats/${PORTVERSION}
@ -16,8 +17,8 @@ COMMENT= Free real-time logfile analyzer to get advanced web statistics
RUN_DEPENDS= ${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois RUN_DEPENDS= ${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/docs/LICENSE.TXT LICENSE_FILE= ${WRKSRC}/docs/LICENSE.TXT
NO_BUILD= yes NO_BUILD= yes
USE_PERL5_RUN= yes USE_PERL5_RUN= yes
@ -87,7 +88,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
${INSTALL_DATA} ${WRKSRC}/tools/xslt/* ${PREFIX}/www/awstats/tools/xslt ${INSTALL_DATA} ${WRKSRC}/tools/xslt/* ${PREFIX}/www/awstats/tools/xslt
${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin ${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.model.conf ${PREFIX}/www/awstats/cgi-bin
${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin
${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_f/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_f ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_f/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_f
${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_m/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_m ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_m/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_m
@ -112,7 +113,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
.endif .endif
@${ECHO_CMD} "" @${ECHO_CMD} ""
@${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats" @${ECHO_CMD} "* Use ${PREFIX}/www/awstats/tools/awstats_configure.pl to setup your hosts."
.if !defined(NOPORTDOCS) .if !defined(NOPORTDOCS)
@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats" @${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"
.endif .endif

View file

@ -1,17 +1,88 @@
--- tools/awstats_configure.pl.orig Sat Jan 15 17:42:58 2005 --- tools/awstats_configure.pl.old 2010-12-25 19:25:49.000000000 -0600
+++ tools/awstats_configure.pl Thu Sep 22 20:34:07 2005 +++ tools/awstats_configure.pl 2010-12-25 19:33:43.000000000 -0600
@@ -29,10 +29,10 @@ @@ -28,12 +28,13 @@
$AWSTATS_MODEL_CONFIG
$AWSTATS_DIRDATA_PATH $AWSTATS_DIRDATA_PATH
/; /;
$AWSTATS_PATH=''; -$AWSTATS_PATH='';
-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; -$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; -$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; -$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; -$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
+$AWSTATS_PATH='%%PREFIX%%/www/awstats';
+$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon'; +$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon';
+$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css'; +$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css';
+$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes'; +$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes';
+$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin'; +$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin';
$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux +$AWSTATS_MODEL_CONFIG='%%PREFIX%%/etc/awstats/awstats.model.conf';
+# Used only when configure ran on linux
$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
@@ -64,6 +65,7 @@
'/etc/httpd/httpd.conf',
'/usr/local/apache/conf/httpd.conf',
'/usr/local/apache2/conf/httpd.conf',
+'/usr/local/etc/apache(13/22)/httpd.conf',
);
use vars qw/
@@ -309,7 +311,8 @@
$AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//;
$AWSTATS_PATH=~s/tools[\\\/]?$//;
$AWSTATS_PATH=~s/[\\\/]$//;
- if ($AWSTATS_PATH ne '/usr/local/awstats') {
+#freebsd default %%PREFIX%%/www/awstats
+ if ($AWSTATS_PATH ne '/usr/local/www/awstats') {
print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n";
print "If you want to use standard directory, you should first move all content\n";
print "of AWStats distribution from current directory:\n";
@@ -324,10 +327,10 @@
print "configure.pl aborted.\n";
exit 1;
}
- $AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon";
- $AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css";
- $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes";
- $AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin";
+ $AWSTATS_ICON_PATH="$AWSTATS_PATH/icon";
+ $AWSTATS_CSS_PATH="$AWSTATS_PATH/css";
+ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
+ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
}
}
elsif ($OS eq 'macosx') {
@@ -420,6 +423,7 @@
print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
print "Example: /etc/httpd/httpd.conf\n";
+ print "Example: %%PREFIX%%/etc/apache(13/22)/httpd.conf";
print "Example: /usr/local/apache2/conf/httpd.conf\n";
print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
$bidon='';
@@ -527,7 +531,7 @@
#
# This is to permit URL access to scripts/files in AWStats directory.
#
-<Directory "$AWSTATS_PATH/wwwroot">
+<Directory "$AWSTATS_PATH/">
Options None
AllowOverride None
Order allow,deny
@@ -546,12 +550,12 @@
# -----------------------------
my $modelfile='';
if ($OS eq 'linux') {
- if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") {
- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
+ if (-f "$AWSTATS_PATH/cgi-bin/awstats.model.conf") {
+ $modelfile="$AWSTATS_PATH/cgi-bin/awstats.model.conf";
}
else {
$modelfile="$AWSTATS_MODEL_CONFIG";
- if (! -s $modelfile || ! -w $modelfile) { $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf"; }
+ if (! -s $modelfile || ! -w $modelfile) { $modelfile="$AWSTATS_PATH/cgi-bin/awstats.model.conf"; }
}
}
elsif ($OS eq "macosx") {