5 files changed, 72 insertions, 24 deletions

diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 7d3b18f9992e..b94f54b09d00 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	4.1
+PORTVERSION=	5.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,19 +16,31 @@ MAINTAINER=	mchopra@engmail.uwaterloo.ca
 
 NO_BUILD=	yes
 
+USE_PERL5=	yes
+
 do-install:
 	@${MKDIR} ${PREFIX}/www/cgi-bin/lang
 	@${MKDIR} ${PREFIX}/www/cgi-bin/lib
+	@${MKDIR} ${PREFIX}/www/cgi-bin/plugins
+	@${MKDIR} ${PREFIX}/www/cgi-bin/plugins/example
 	@${MKDIR} ${PREFIX}/www/icons/browser
 	@${MKDIR} ${PREFIX}/www/icons/clock
 	@${MKDIR} ${PREFIX}/www/icons/cpu
 	@${MKDIR} ${PREFIX}/www/icons/flags
 	@${MKDIR} ${PREFIX}/www/icons/os
 	@${MKDIR} ${PREFIX}/www/icons/other
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/cgi-bin/awstats.model.conf
-	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/cgi-bin/awstats.pl
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_buildstaticpages.pl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_updateall.pl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/bin/awstats_logresolvemerge.pl
+	${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/lib/* ${PREFIX}/www/cgi-bin/lib
+	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/graph3d.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/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/example/* ${PREFIX}/www/cgi-bin/plugins/example
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/browser/* ${PREFIX}/www/icons/browser
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/clock/* ${PREFIX}/www/icons/clock
 	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/cpu/* ${PREFIX}/www/icons/cpu
@@ -38,6 +50,8 @@ do-install:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "* Rename ${PREFIX}/www/cgi-bin/awstats.model.conf to awstats.conf to set up 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
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index b2199a0d6f28..f6e71e907b12 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1 +1 @@
-MD5 (awstats-4.1.tgz) = 03c0325c955063c192c3c9780a3820f7
+MD5 (awstats-5.1.tgz) = b54ca72ebb511f50e8ca08f4256ce1d7
diff --git a/www/awstats/files/patch-aa b/www/awstats/files/patch-aa
deleted file mode 100644
index 58bde5e412d3..000000000000
--- a/www/awstats/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- wwwroot/cgi-bin/awstats.model.conf.orig	Fri Aug  9 16:58:22 2002
-+++ wwwroot/cgi-bin/awstats.model.conf	Fri Aug  9 16:59:10 2002
-@@ -122,9 +122,9 @@
- DirCgi="/cgi-bin"
- 
- # Relative or absolute web URL of all icons subdirectories.
--# Default: "/icon" (means you must copy icon directories in "/mywwwroot/icon")
-+# Default: "/icons" (means you must copy icons directories in "/mywwwroot/icons")
- #
--DirIcons="/icon"
-+DirIcons="/icons"
- 
- # "SiteDomain" must contain the main domain name or the main intranet web
- # server name used to reach the web site.
diff --git a/www/awstats/files/patch.awstats.model.conf b/www/awstats/files/patch.awstats.model.conf
new file mode 100644
index 000000000000..df9323acd567
--- /dev/null
+++ b/www/awstats/files/patch.awstats.model.conf
@@ -0,0 +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.
+ # If you build static reports ("... -output > outputpath/output.html"), enter
+ # path of icon directory relative to the directory outputpath.
+-# Example: "/icon"
+-# 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")
+ #
+-DirIcons="/icon"
++DirIcons="/icons"
+ 
+ 
+ # "SiteDomain" must contain the main domain name or the main intranet web
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index 533fdfacdb53..6bc80136f6ac 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -30,8 +30,12 @@
 %%PORTDOCS%%share/doc/awstats/images/screen_shot_3.gif
 %%PORTDOCS%%share/doc/awstats/images/screen_shot_3.png
 %%PORTDOCS%%share/doc/awstats/images/screen_shot_4.png
+%%PORTDOCS%%share/doc/awstats/images/star.png
 %%PORTDOCS%%share/doc/awstats/index.html
 %%PORTDOCS%%share/doc/awstats/styles.css
+bin/awstats_buildstaticpages.pl
+bin/awstats_logresolvemerge.pl
+bin/awstats_updateall.pl
 www/cgi-bin/awstats.model.conf
 www/cgi-bin/awstats.pl
 www/cgi-bin/lang/awstats-ba.txt
@@ -42,6 +46,7 @@ www/cgi-bin/lang/awstats-de.txt
 www/cgi-bin/lang/awstats-dk.txt
 www/cgi-bin/lang/awstats-en.txt
 www/cgi-bin/lang/awstats-es.txt
+www/cgi-bin/lang/awstats-es_cat.txt
 www/cgi-bin/lang/awstats-fi.txt
 www/cgi-bin/lang/awstats-fr.txt
 www/cgi-bin/lang/awstats-gr.txt
@@ -59,6 +64,7 @@ www/cgi-bin/lang/awstats-pt.txt
 www/cgi-bin/lang/awstats-ro.txt
 www/cgi-bin/lang/awstats-ru.txt
 www/cgi-bin/lang/awstats-se.txt
+www/cgi-bin/lang/awstats-sk.txt
 www/cgi-bin/lang/awstats-tr.txt
 www/cgi-bin/lang/awstats-tt-ba.txt
 www/cgi-bin/lang/awstats-tt-cn.txt
@@ -66,6 +72,8 @@ www/cgi-bin/lang/awstats-tt-cz.txt
 www/cgi-bin/lang/awstats-tt-de.txt
 www/cgi-bin/lang/awstats-tt-en.txt
 www/cgi-bin/lang/awstats-tt-es.txt
+www/cgi-bin/lang/awstats-tt-es_cat.txt
+www/cgi-bin/lang/awstats-tt-fi.txt
 www/cgi-bin/lang/awstats-tt-fr.txt
 www/cgi-bin/lang/awstats-tt-hu.txt
 www/cgi-bin/lang/awstats-tt-it.txt
@@ -78,6 +86,7 @@ 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-tr.txt
 www/cgi-bin/lang/awstats-tt-tw.txt
 www/cgi-bin/lang/awstats-tt-ua.txt
@@ -88,18 +97,27 @@ www/cgi-bin/lib/domains.pm
 www/cgi-bin/lib/operating_systems.pm
 www/cgi-bin/lib/robots.pm
 www/cgi-bin/lib/search_engines.pm
+www/cgi-bin/lib/worms.pm
+www/cgi-bin/plugins/example/example.pm
+www/cgi-bin/plugins/graph3d.pm
+www/cgi-bin/plugins/hashfiles.pm
+www/cgi-bin/plugins/timehires.pm
+www/cgi-bin/plugins/timezone.pm
 www/icons/browser/adobe.png
 www/icons/browser/amaya.png
 www/icons/browser/da.png
 www/icons/browser/dreamcast.png
+www/icons/browser/galeon.png
 www/icons/browser/getright.png
 www/icons/browser/gozilla.png
+www/icons/browser/ibrowse.png
 www/icons/browser/icab.png
 www/icons/browser/konqueror.png
 www/icons/browser/lynx.png
 www/icons/browser/mediaplayer.png
 www/icons/browser/msie.png
 www/icons/browser/msie_large.png
+www/icons/browser/netpositive.png
 www/icons/browser/netscape.png
 www/icons/browser/netscape_large.png
 www/icons/browser/notavailable.png
@@ -328,6 +346,7 @@ www/icons/flags/ru.png
 www/icons/flags/rw.png
 www/icons/flags/sa.png
 www/icons/flags/sb.png
+www/icons/flags/sc.png
 www/icons/flags/se.png
 www/icons/flags/sg.png
 www/icons/flags/si.png
@@ -376,7 +395,6 @@ www/icons/flags/za.png
 www/icons/flags/ze.png
 www/icons/flags/zm.png
 www/icons/flags/zw.png
-www/icons/os/acorn.png
 www/icons/os/aix.png
 www/icons/os/amigaos.png
 www/icons/os/apple.png
@@ -387,25 +405,34 @@ www/icons/os/digital.png
 www/icons/os/dos.png
 www/icons/os/dreamcast.png
 www/icons/os/freebsd.png
-www/icons/os/hp.png
+www/icons/os/hpux.png
 www/icons/os/ibm.png
 www/icons/os/irix.png
 www/icons/os/java.png
 www/icons/os/linux.png
-www/icons/os/mac.png
+www/icons/os/macintosh.png
 www/icons/os/netbsd.png
 www/icons/os/netware.png
 www/icons/os/next.png
 www/icons/os/openbsd.png
+www/icons/os/os2.png
 www/icons/os/osf.png
 www/icons/os/qnx.png
+www/icons/os/riscos.png
 www/icons/os/sco.png
-www/icons/os/sun.png
+www/icons/os/sunos.png
+www/icons/os/unix.png
 www/icons/os/unknown.png
 www/icons/os/vms.png
-www/icons/os/warp.png
 www/icons/os/webtv.png
-www/icons/os/windows.png
+www/icons/os/win16.png
+www/icons/os/win2000.png
+www/icons/os/win95.png
+www/icons/os/win98.png
+www/icons/os/wince.png
+www/icons/os/winme.png
+www/icons/os/winnt.png
+www/icons/os/winxp.png
 www/icons/other/awstats_logo1.png
 www/icons/other/awstats_logo2.png
 www/icons/other/barrehe.png
@@ -418,6 +445,7 @@ www/icons/other/barrevk.png
 www/icons/other/barrevp.png
 www/icons/other/barrevu.png
 www/icons/other/barrevv.png
+www/icons/other/page.png
 @dirrm www/icons/other
 @dirrm www/icons/os
 @dirrm www/icons/flags
@@ -426,5 +454,7 @@ www/icons/other/barrevv.png
 @dirrm www/icons/browser
 @dirrm www/cgi-bin/lib
 @dirrm www/cgi-bin/lang
+@dirrm www/cgi-bin/plugins/example
+@dirrm www/cgi-bin/plugins
 %%PORTDOCS%%@dirrm share/doc/awstats/images
 %%PORTDOCS%%@dirrm share/doc/awstats