4 files changed, 19 insertions, 16 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 7178ca337bbd..40ca472fa3e7 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	6.7
+PORTVERSION=	6.8
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
@@ -19,7 +18,7 @@ RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
-USE_DOS2UNIX=	tools/logresolvemerge.pl
+USE_DOS2UNIX=	yes
 
 SUB_FILES=	pkg-message
 
@@ -71,7 +70,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.7.wbm ${PREFIX}/www/awstats/tools/webmin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.8.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
@@ -103,8 +102,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
 .endif
 
-post-install:
 .if !defined(BATCH)
+post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index c40d38b792a7..0f49fbdf3089 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,3 +1,3 @@
-MD5 (awstats-6.7.tar.gz) = 512cd146247eb178ef023c924f7bb766
-SHA256 (awstats-6.7.tar.gz) = 36344e7c2271393cf60e9a3818392fbece0ff838c83fcf59fed9818dfac5a081
-SIZE (awstats-6.7.tar.gz) = 1089638
+MD5 (awstats-6.8.tar.gz) = 1a35d5a2ca29b31dabd650f3e5f173e9
+SHA256 (awstats-6.8.tar.gz) = a888d0fd680016f71950f584b70c607ae3e28f192a0b8a6d758ed2a7928b6a99
+SIZE (awstats-6.8.tar.gz) = 1101851
diff --git a/www/awstats/files/patch-awstats.model.conf b/www/awstats/files/patch-awstats.model.conf
index ccfa4d4cc75f..5634f040a148 100644
--- a/www/awstats/files/patch-awstats.model.conf
+++ b/www/awstats/files/patch-awstats.model.conf
@@ -1,12 +1,11 @@
---- 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
+--- wwwroot/cgi-bin/awstats.model.conf.orig	2008-07-23 11:57:04.000000000 -0400
++++ wwwroot/cgi-bin/awstats.model.conf	2008-07-23 11:57:19.000000000 -0400
 @@ -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
-
+ 
+ 
+ # When this parameter is set to 1, AWStats adds a button on report page to
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index ac0ab07fb486..64af9e79e6a5 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -54,6 +54,7 @@ www/awstats/cgi-bin/awstats.pl
 www/awstats/cgi-bin/lang/awstats-al.txt
 www/awstats/cgi-bin/lang/awstats-ar.txt
 www/awstats/cgi-bin/lang/awstats-ba.txt
+www/awstats/cgi-bin/lang/awstats-be.txt
 www/awstats/cgi-bin/lang/awstats-bg.txt
 www/awstats/cgi-bin/lang/awstats-br.txt
 www/awstats/cgi-bin/lang/awstats-ca.txt
@@ -99,11 +100,13 @@ www/awstats/cgi-bin/lang/awstats-lt.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-cz.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-en.txt
+www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-gr.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-is.txt
 www/awstats/cgi-bin/lang/tooltips_f/awstats-tt-it.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-br.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-en.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-fr.txt
+www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-gr.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-is.txt
 www/awstats/cgi-bin/lang/tooltips_m/awstats-tt-it.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-al.txt
@@ -120,6 +123,7 @@ www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-es.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-fi.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-fr.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-gl.txt
+www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-gr.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-hu.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-is.txt
 www/awstats/cgi-bin/lang/tooltips_w/awstats-tt-it.txt
@@ -143,6 +147,7 @@ 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
@@ -678,7 +683,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.7.wbm
+www/awstats/tools/webmin/awstats-1.8.wbm
 @dirrm www/awstats/tools/webmin
 @dirrm www/awstats/tools
 @dirrm www/awstats/js