- Update to 6.1

PR:		ports/66772, ports/68220
Submitted by:	Toni Viemero <toni.viemero@iki.fi>
Approved by:	maintainer timeout (1 month)

4 files changed, 65 insertions, 48 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index ca97e7ece4f7..9cf49f73e367 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.0
-PORTREVISION=	1
+PORTVERSION=	6.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,12 +15,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	webmaster@lightningfire.net
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
+RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
+
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-RUN_DEPENDS+=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 do-install:
 	@${MKDIR} ${PREFIX}/www/cgi-bin/lang
+	@${MKDIR} ${PREFIX}/www/cgi-bin/lang/tooltips_f
+	@${MKDIR} ${PREFIX}/www/cgi-bin/lang/tooltips_m
+	@${MKDIR} ${PREFIX}/www/cgi-bin/lang/tooltips_w
 	@${MKDIR} ${PREFIX}/www/cgi-bin/lib
 	@${MKDIR} ${PREFIX}/www/cgi-bin/plugins
 	@${MKDIR} ${PREFIX}/www/cgi-bin/plugins/example
@@ -41,20 +44,23 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/bin/awstats_logresolvemerge.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/bin/awstats_maillogconvert.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/bin/awstats_urlaliasbuilder.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.21.wbm ${PREFIX}/bin/awstats-1.21.wbm
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.3.wbm ${PREFIX}/bin/awstats-1.3.wbm
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/cgi-bin
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/cgi-bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/* ${PREFIX}/www/cgi-bin/lang
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_f/*.txt ${PREFIX}/www/cgi-bin/lang/tooltips_f
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_m/*.txt ${PREFIX}/www/cgi-bin/lang/tooltips_m
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_w/*.txt ${PREFIX}/www/cgi-bin/lang/tooltips_w
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/*.txt ${PREFIX}/www/cgi-bin/lang
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/cgi-bin/lib
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/decodeutfkeys.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoip.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/geoipfree.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/graphapplet.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/hashfiles.pm ${PREFIX}/www/cgi-bin/plugins
-	${INSTALL_DATA}	${WRKSRC}/wwwroot/cgi-bin/plugins/hostinfo.pm ${PREFIX}/www/cgi-bin/plugins
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/hostinfo.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/ipv6.pm ${PREFIX}/www/cgi-bin/plugins
-	${INSTALL_DATA}	${WRKSRC}/wwwroot/cgi-bin/plugins/rawlog.pm ${PREFIX}/www/cgi-bin/plugins
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/rawlog.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/timehires.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/timezone.pm ${PREFIX}/www/cgi-bin/plugins
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/tooltips.pm ${PREFIX}/www/cgi-bin/plugins
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index bf3337321f63..bcc9886748d4 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,2 +1,2 @@
-MD5 (awstats-6.0.tgz) = 959498f7182f20d84d7bd8aca68f4155
-SIZE (awstats-6.0.tgz) = 791020
+MD5 (awstats-6.1.tgz) = 4f02c0fc4f1a0f946fcae3b3768bf113
+SIZE (awstats-6.1.tgz) = 800275
diff --git a/www/awstats/files/patch.awstats.model.conf b/www/awstats/files/patch.awstats.model.conf
index df9323acd567..37e91452c6b5 100644
--- a/www/awstats/files/patch.awstats.model.conf
+++ b/www/awstats/files/patch.awstats.model.conf
@@ -1,18 +1,18 @@
---- awstats.model.conf.orig	Wed Nov  6 15:27:14 2002
-+++ awstats.model.conf	Wed Nov  6 15:29:49 2002
-@@ -150,11 +150,11 @@
- # subdirectories.
+--- wwwroot/cgi-bin/awstats.model.conf.org	Sun May  9 15:53:35 2004
++++ wwwroot/cgi-bin/awstats.model.conf	Mon May 17 21:34:29 2004
+@@ -204,11 +204,11 @@
+ # Relative or absolute web URL of your awstats icon directory.
  # If you build static reports ("... -output > outputpath/output.html"), enter
- # path of icon directory relative to the directory outputpath.
--# Example: "/icon"
+ # path of icon directory relative to the output directory 'outputpath'.
+-# Example: "/awstatsicon"
 -# Example: "../icon"
 -# Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
 +# Example: "/icons"
 +# Example: "../icons"
-+# Default: "/icons" (means you must copy icon directories in "/mywwwroot/icons")
++# Default: "/icons" (means you must copy icon directories in "/mywwwroot/icon")
  #
 -DirIcons="/icon"
 +DirIcons="/icons"
  
  
- # "SiteDomain" must contain the main domain name or the main intranet web
+ # When this parameter is set to 1, AWStats add a button on report page to
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index 6cf4e2e34164..a4188c3d7c07 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -1,4 +1,4 @@
-bin/awstats-1.21.wbm
+bin/awstats-1.3.wbm
 bin/awstats_buildstaticpages.pl
 bin/awstats_configure.pl
 bin/awstats_exportlib.pl
@@ -51,6 +51,7 @@ www/cgi-bin/awredir.pl
 www/cgi-bin/awstats.model.conf
 www/cgi-bin/awstats.pl
 www/cgi-bin/lang/awstats-al.txt
+www/cgi-bin/lang/awstats-ar.txt
 www/cgi-bin/lang/awstats-ba.txt
 www/cgi-bin/lang/awstats-bg.txt
 www/cgi-bin/lang/awstats-br.txt
@@ -86,39 +87,45 @@ www/cgi-bin/lang/awstats-se.txt
 www/cgi-bin/lang/awstats-sk.txt
 www/cgi-bin/lang/awstats-sr.txt
 www/cgi-bin/lang/awstats-tr.txt
-www/cgi-bin/lang/awstats-tt-al.txt
-www/cgi-bin/lang/awstats-tt-ba.txt
-www/cgi-bin/lang/awstats-tt-bg.txt
-www/cgi-bin/lang/awstats-tt-ca.txt
-www/cgi-bin/lang/awstats-tt-cn.txt
-www/cgi-bin/lang/awstats-tt-cz.txt
-www/cgi-bin/lang/awstats-tt-de.txt
-www/cgi-bin/lang/awstats-tt-dk.txt
-www/cgi-bin/lang/awstats-tt-en.txt
-www/cgi-bin/lang/awstats-tt-es.txt
-www/cgi-bin/lang/awstats-tt-fi.txt
-www/cgi-bin/lang/awstats-tt-fr.txt
-www/cgi-bin/lang/awstats-tt-gl.txt
-www/cgi-bin/lang/awstats-tt-hu.txt
-www/cgi-bin/lang/awstats-tt-is.txt
-www/cgi-bin/lang/awstats-tt-it.txt
-www/cgi-bin/lang/awstats-tt-jp.txt
-www/cgi-bin/lang/awstats-tt-kr.txt
-www/cgi-bin/lang/awstats-tt-nb.txt
-www/cgi-bin/lang/awstats-tt-nl.txt
-www/cgi-bin/lang/awstats-tt-nn.txt
-www/cgi-bin/lang/awstats-tt-pl.txt
-www/cgi-bin/lang/awstats-tt-ro.txt
-www/cgi-bin/lang/awstats-tt-ru.txt
-www/cgi-bin/lang/awstats-tt-se.txt
-www/cgi-bin/lang/awstats-tt-sk.txt
-www/cgi-bin/lang/awstats-tt-sr.txt
-www/cgi-bin/lang/awstats-tt-tr.txt
-www/cgi-bin/lang/awstats-tt-tw.txt
-www/cgi-bin/lang/awstats-tt-ua.txt
 www/cgi-bin/lang/awstats-tw.txt
 www/cgi-bin/lang/awstats-ua.txt
 www/cgi-bin/lang/awstats-wlk.txt
+www/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
+www/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
+www/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-ba.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-ca.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-cn.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-cz.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-de.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-dk.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-en.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-es.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-fi.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-fr.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-gl.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-hu.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-is.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-it.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-jp.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-kr.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-nb.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-nl.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-nn.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-pl.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-ro.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-ru.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-se.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-sk.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-sr.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-tr.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-tw.txt
+www/cgi-bin/lang/tooltips_w/awstats-tt-ua.txt
+www/cgi-bin/lang/tooltips_w/awstats-tw.txt
+www/cgi-bin/lang/tooltips_w/awstats-ua.txt
+www/cgi-bin/lang/tooltips_w/awstats-wlk.txt
 www/cgi-bin/lib/browsers.pm
 www/cgi-bin/lib/domains.pm
 www/cgi-bin/lib/mime.pm
@@ -159,6 +166,7 @@ www/icons/browser/dillo.png
 www/icons/browser/dreamcast.png
 www/icons/browser/ecatch.png
 www/icons/browser/encompass.png
+www/icons/browser/firefox.png
 www/icons/browser/fpexpress.png
 www/icons/browser/fresco.png
 www/icons/browser/galeon.png
@@ -572,6 +580,9 @@ www/js/awstats_misc_tracker.js
 @dirrm www/cgi-bin/plugins/example
 @dirrm www/cgi-bin/plugins
 @dirrm www/cgi-bin/lib
+@dirrm www/cgi-bin/lang/tooltips_w
+@dirrm www/cgi-bin/lang/tooltips_m
+@dirrm www/cgi-bin/lang/tooltips_f
 @dirrm www/cgi-bin/lang
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%