Update to 4.1 and sort plist

PR:		ports/40545
Submitted by:	maintainer

6 files changed, 262 insertions, 246 deletions

diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index e9e183bc8ca7..7d3b18f9992e 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	4.0
+PORTVERSION=	4.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,8 @@ MAINTAINER=	mchopra@engmail.uwaterloo.ca
 NO_BUILD=	yes
 
 do-install:
-	@${MKDIR} ${PREFIX}/www/cgi-bin/db
 	@${MKDIR} ${PREFIX}/www/cgi-bin/lang
+	@${MKDIR} ${PREFIX}/www/cgi-bin/lib
 	@${MKDIR} ${PREFIX}/www/icons/browser
 	@${MKDIR} ${PREFIX}/www/icons/clock
 	@${MKDIR} ${PREFIX}/www/icons/cpu
@@ -27,8 +27,8 @@ do-install:
 	@${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}/wwwroot/cgi-bin/db/* ${PREFIX}/www/cgi-bin/db
 	${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/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
@@ -39,8 +39,9 @@ do-install:
 	@${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"
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/images && ${CHMOD} -R a+rx ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/awstats-devel/distinfo b/www/awstats-devel/distinfo
index ce82eb4c3e42..b2199a0d6f28 100644
--- a/www/awstats-devel/distinfo
+++ b/www/awstats-devel/distinfo
@@ -1 +1 @@
-MD5 (awstats-4.0.tgz) = 96ffd8fc7c4d55857053a8c3542a65e0
+MD5 (awstats-4.1.tgz) = 03c0325c955063c192c3c9780a3820f7
diff --git a/www/awstats-devel/pkg-plist b/www/awstats-devel/pkg-plist
index b2840dfcf993..533fdfacdb53 100644
--- a/www/awstats-devel/pkg-plist
+++ b/www/awstats-devel/pkg-plist
@@ -1,3 +1,19 @@
+%%PORTDOCS%%share/doc/awstats/COPYING.TXT
+%%PORTDOCS%%share/doc/awstats/LICENSE.TXT
+%%PORTDOCS%%share/doc/awstats/awstats.htm
+%%PORTDOCS%%share/doc/awstats/awstats.pdf
+%%PORTDOCS%%share/doc/awstats/awstats.xml
+%%PORTDOCS%%share/doc/awstats/awstats_benchmark.html
+%%PORTDOCS%%share/doc/awstats/awstats_changelog.txt
+%%PORTDOCS%%share/doc/awstats/awstats_compare.html
+%%PORTDOCS%%share/doc/awstats/awstats_config.html
+%%PORTDOCS%%share/doc/awstats/awstats_faq.html
+%%PORTDOCS%%share/doc/awstats/awstats_glossary.html
+%%PORTDOCS%%share/doc/awstats/awstats_license.html
+%%PORTDOCS%%share/doc/awstats/awstats_security.html
+%%PORTDOCS%%share/doc/awstats/awstats_setup.html
+%%PORTDOCS%%share/doc/awstats/awstats_tools.html
+%%PORTDOCS%%share/doc/awstats/awstats_what.html
 %%PORTDOCS%%share/doc/awstats/images/awstats.ico
 %%PORTDOCS%%share/doc/awstats/images/awstats_logo1.gif
 %%PORTDOCS%%share/doc/awstats/images/awstats_logo1.png
@@ -14,31 +30,10 @@
 %%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/COPYING.TXT
-%%PORTDOCS%%share/doc/awstats/LICENSE.TXT
-%%PORTDOCS%%share/doc/awstats/awstats.htm
-%%PORTDOCS%%share/doc/awstats/awstats.pdf
-%%PORTDOCS%%share/doc/awstats/awstats.xml
-%%PORTDOCS%%share/doc/awstats/awstats_benchmark.html
-%%PORTDOCS%%share/doc/awstats/awstats_changelog.txt
-%%PORTDOCS%%share/doc/awstats/awstats_compare.html
-%%PORTDOCS%%share/doc/awstats/awstats_config.html
-%%PORTDOCS%%share/doc/awstats/awstats_faq.html
-%%PORTDOCS%%share/doc/awstats/awstats_license.html
-%%PORTDOCS%%share/doc/awstats/awstats_security.html
-%%PORTDOCS%%share/doc/awstats/awstats_setup.html
-%%PORTDOCS%%share/doc/awstats/awstats_what.html
 %%PORTDOCS%%share/doc/awstats/index.html
 %%PORTDOCS%%share/doc/awstats/styles.css
-%%PORTDOCS%%@dirrm share/doc/awstats/images
-%%PORTDOCS%%@dirrm share/doc/awstats
 www/cgi-bin/awstats.model.conf
 www/cgi-bin/awstats.pl
-www/cgi-bin/db/browsers.pl
-www/cgi-bin/db/domains.pl
-www/cgi-bin/db/operating_systems.pl
-www/cgi-bin/db/robots.pl
-www/cgi-bin/db/search_engines.pl
 www/cgi-bin/lang/awstats-ba.txt
 www/cgi-bin/lang/awstats-br.txt
 www/cgi-bin/lang/awstats-cn.txt
@@ -47,6 +42,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-fi.txt
 www/cgi-bin/lang/awstats-fr.txt
 www/cgi-bin/lang/awstats-gr.txt
 www/cgi-bin/lang/awstats-hu.txt
@@ -79,6 +75,7 @@ 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-tr.txt
@@ -86,30 +83,35 @@ 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/icons/browser/netscape.png
-www/icons/browser/msie_large.png
-www/icons/browser/netscape_large.png
-www/icons/browser/konqueror.png
-www/icons/browser/webtv.png
-www/icons/browser/unknown.png
-www/icons/browser/msie.png
-www/icons/browser/omniweb.png
+www/cgi-bin/lib/browsers.pm
+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/icons/browser/adobe.png
+www/icons/browser/amaya.png
+www/icons/browser/da.png
 www/icons/browser/dreamcast.png
-www/icons/browser/mediaplayer.png
+www/icons/browser/getright.png
+www/icons/browser/gozilla.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/netscape.png
+www/icons/browser/netscape_large.png
 www/icons/browser/notavailable.png
-www/icons/browser/pdaphone.png
-www/icons/browser/amaya.png
+www/icons/browser/omniweb.png
 www/icons/browser/opera.png
-www/icons/browser/adobe.png
+www/icons/browser/pdaphone.png
 www/icons/browser/staroffice.png
-www/icons/browser/da.png
-www/icons/browser/webzip.png
-www/icons/browser/getright.png
-www/icons/browser/gozilla.png
 www/icons/browser/teleport.png
+www/icons/browser/unknown.png
 www/icons/browser/webcopier.png
-www/icons/browser/icab.png
+www/icons/browser/webtv.png
+www/icons/browser/webzip.png
 www/icons/clock/hr1.png
 www/icons/clock/hr10.png
 www/icons/clock/hr11.png
@@ -131,112 +133,43 @@ www/icons/cpu/mips.png
 www/icons/cpu/motorola.png
 www/icons/cpu/sun.png
 www/icons/cpu/unknown.png
-www/icons/flags/unknown.png
-www/icons/flags/us.png
 www/icons/flags/ad.png
-www/icons/flags/nu.png
-www/icons/flags/nz.png
 www/icons/flags/ae.png
-www/icons/flags/om.png
-www/icons/flags/org.png
 www/icons/flags/aero.png
-www/icons/flags/pa.png
-www/icons/flags/pe.png
 www/icons/flags/af.png
-www/icons/flags/pf.png
-www/icons/flags/ph.png
 www/icons/flags/ag.png
-www/icons/flags/pk.png
-www/icons/flags/pl.png
 www/icons/flags/ai.png
-www/icons/flags/pro.png
-www/icons/flags/pt.png
 www/icons/flags/al.png
-www/icons/flags/py.png
-www/icons/flags/qa.png
 www/icons/flags/am.png
-www/icons/flags/ro.png
-www/icons/flags/ru.png
 www/icons/flags/an.png
-www/icons/flags/rw.png
-www/icons/flags/sa.png
 www/icons/flags/ao.png
-www/icons/flags/sb.png
-www/icons/flags/se.png
 www/icons/flags/aq.png
-www/icons/flags/sg.png
-www/icons/flags/si.png
 www/icons/flags/ar.png
-www/icons/flags/sk.png
-www/icons/flags/sm.png
 www/icons/flags/arpa.png
-www/icons/flags/sn.png
-www/icons/flags/su.png
 www/icons/flags/as.png
-www/icons/flags/sv.png
-www/icons/flags/sy.png
 www/icons/flags/at.png
-www/icons/flags/sz.png
-www/icons/flags/tc.png
 www/icons/flags/au.png
-www/icons/flags/td.png
-www/icons/flags/tf.png
 www/icons/flags/aw.png
-www/icons/flags/tg.png
-www/icons/flags/th.png
 www/icons/flags/az.png
-www/icons/flags/tk.png
-www/icons/flags/tm.png
 www/icons/flags/ba.png
-www/icons/flags/tn.png
-www/icons/flags/to.png
 www/icons/flags/bb.png
-www/icons/flags/tr.png
-www/icons/flags/tt.png
 www/icons/flags/bd.png
-www/icons/flags/tv.png
-www/icons/flags/tw.png
 www/icons/flags/be.png
-www/icons/flags/tz.png
-www/icons/flags/ua.png
 www/icons/flags/bf.png
-www/icons/flags/ug.png
-www/icons/flags/uk.png
 www/icons/flags/bg.png
-www/icons/flags/um.png
-www/icons/flags/uy.png
 www/icons/flags/bh.png
-www/icons/flags/vu.png
-www/icons/flags/pg.png
 www/icons/flags/bi.png
-www/icons/flags/uz.png
-www/icons/flags/va.png
 www/icons/flags/biz.png
-www/icons/flags/vc.png
-www/icons/flags/ve.png
 www/icons/flags/bj.png
-www/icons/flags/vg.png
-www/icons/flags/vi.png
 www/icons/flags/bm.png
-www/icons/flags/vn.png
-www/icons/flags/wf.png
 www/icons/flags/bn.png
-www/icons/flags/ws.png
-www/icons/flags/ye.png
 www/icons/flags/bo.png
-www/icons/flags/yt.png
-www/icons/flags/yu.png
 www/icons/flags/br.png
-www/icons/flags/za.png
-www/icons/flags/ze.png
 www/icons/flags/bs.png
-www/icons/flags/zm.png
-www/icons/flags/zw.png
 www/icons/flags/bt.png
 www/icons/flags/bv.png
 www/icons/flags/bw.png
 www/icons/flags/by.png
-www/icons/flags/mo.png
 www/icons/flags/bz.png
 www/icons/flags/ca.png
 www/icons/flags/cc.png
@@ -349,7 +282,9 @@ www/icons/flags/md.png
 www/icons/flags/mg.png
 www/icons/flags/mil.png
 www/icons/flags/mk.png
+www/icons/flags/ml.png
 www/icons/flags/mn.png
+www/icons/flags/mo.png
 www/icons/flags/mq.png
 www/icons/flags/mr.png
 www/icons/flags/mt.png
@@ -358,20 +293,89 @@ www/icons/flags/museum.png
 www/icons/flags/mv.png
 www/icons/flags/mx.png
 www/icons/flags/my.png
+www/icons/flags/mz.png
 www/icons/flags/na.png
 www/icons/flags/name.png
 www/icons/flags/nato.png
+www/icons/flags/nb.png
 www/icons/flags/nc.png
 www/icons/flags/ne.png
 www/icons/flags/net.png
 www/icons/flags/ng.png
 www/icons/flags/ni.png
 www/icons/flags/nl.png
+www/icons/flags/nn.png
 www/icons/flags/no.png
 www/icons/flags/np.png
 www/icons/flags/nt.png
-www/icons/flags/nb.png
-www/icons/flags/nn.png
+www/icons/flags/nu.png
+www/icons/flags/nz.png
+www/icons/flags/om.png
+www/icons/flags/org.png
+www/icons/flags/pa.png
+www/icons/flags/pe.png
+www/icons/flags/pf.png
+www/icons/flags/pg.png
+www/icons/flags/ph.png
+www/icons/flags/pk.png
+www/icons/flags/pl.png
+www/icons/flags/pro.png
+www/icons/flags/pt.png
+www/icons/flags/py.png
+www/icons/flags/qa.png
+www/icons/flags/ro.png
+www/icons/flags/ru.png
+www/icons/flags/rw.png
+www/icons/flags/sa.png
+www/icons/flags/sb.png
+www/icons/flags/se.png
+www/icons/flags/sg.png
+www/icons/flags/si.png
+www/icons/flags/sk.png
+www/icons/flags/sm.png
+www/icons/flags/sn.png
+www/icons/flags/su.png
+www/icons/flags/sv.png
+www/icons/flags/sy.png
+www/icons/flags/sz.png
+www/icons/flags/tc.png
+www/icons/flags/td.png
+www/icons/flags/tf.png
+www/icons/flags/tg.png
+www/icons/flags/th.png
+www/icons/flags/tk.png
+www/icons/flags/tm.png
+www/icons/flags/tn.png
+www/icons/flags/to.png
+www/icons/flags/tr.png
+www/icons/flags/tt.png
+www/icons/flags/tv.png
+www/icons/flags/tw.png
+www/icons/flags/tz.png
+www/icons/flags/ua.png
+www/icons/flags/ug.png
+www/icons/flags/uk.png
+www/icons/flags/um.png
+www/icons/flags/unknown.png
+www/icons/flags/us.png
+www/icons/flags/uy.png
+www/icons/flags/uz.png
+www/icons/flags/va.png
+www/icons/flags/vc.png
+www/icons/flags/ve.png
+www/icons/flags/vg.png
+www/icons/flags/vi.png
+www/icons/flags/vn.png
+www/icons/flags/vu.png
+www/icons/flags/wf.png
+www/icons/flags/ws.png
+www/icons/flags/ye.png
+www/icons/flags/yt.png
+www/icons/flags/yu.png
+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
@@ -387,6 +391,7 @@ www/icons/os/hp.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/netbsd.png
 www/icons/os/netware.png
@@ -401,23 +406,25 @@ www/icons/os/vms.png
 www/icons/os/warp.png
 www/icons/os/webtv.png
 www/icons/os/windows.png
-www/icons/os/linux.png
 www/icons/other/awstats_logo1.png
 www/icons/other/awstats_logo2.png
 www/icons/other/barrehe.png
 www/icons/other/barrehh.png
 www/icons/other/barrehk.png
 www/icons/other/barrehp.png
+www/icons/other/barrehx.png
 www/icons/other/barrevh.png
 www/icons/other/barrevk.png
 www/icons/other/barrevp.png
 www/icons/other/barrevu.png
 www/icons/other/barrevv.png
-@dirrm www/cgi-bin/db
-@dirrm www/cgi-bin/lang
-@dirrm www/icons/browser
-@dirrm www/icons/clock
-@dirrm www/icons/cpu
-@dirrm www/icons/flags
-@dirrm www/icons/os
 @dirrm www/icons/other
+@dirrm www/icons/os
+@dirrm www/icons/flags
+@dirrm www/icons/cpu
+@dirrm www/icons/clock
+@dirrm www/icons/browser
+@dirrm www/cgi-bin/lib
+@dirrm www/cgi-bin/lang
+%%PORTDOCS%%@dirrm share/doc/awstats/images
+%%PORTDOCS%%@dirrm share/doc/awstats
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index e9e183bc8ca7..7d3b18f9992e 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	awstats
-PORTVERSION=	4.0
+PORTVERSION=	4.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,8 +17,8 @@ MAINTAINER=	mchopra@engmail.uwaterloo.ca
 NO_BUILD=	yes
 
 do-install:
-	@${MKDIR} ${PREFIX}/www/cgi-bin/db
 	@${MKDIR} ${PREFIX}/www/cgi-bin/lang
+	@${MKDIR} ${PREFIX}/www/cgi-bin/lib
 	@${MKDIR} ${PREFIX}/www/icons/browser
 	@${MKDIR} ${PREFIX}/www/icons/clock
 	@${MKDIR} ${PREFIX}/www/icons/cpu
@@ -27,8 +27,8 @@ do-install:
 	@${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}/wwwroot/cgi-bin/db/* ${PREFIX}/www/cgi-bin/db
 	${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/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
@@ -39,8 +39,9 @@ do-install:
 	@${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"
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/images && ${CHMOD} -R a+rx ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index ce82eb4c3e42..b2199a0d6f28 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1 +1 @@
-MD5 (awstats-4.0.tgz) = 96ffd8fc7c4d55857053a8c3542a65e0
+MD5 (awstats-4.1.tgz) = 03c0325c955063c192c3c9780a3820f7
diff --git a/www/awstats/pkg-plist b/www/awstats/pkg-plist
index b2840dfcf993..533fdfacdb53 100644
--- a/www/awstats/pkg-plist
+++ b/www/awstats/pkg-plist
@@ -1,3 +1,19 @@
+%%PORTDOCS%%share/doc/awstats/COPYING.TXT
+%%PORTDOCS%%share/doc/awstats/LICENSE.TXT
+%%PORTDOCS%%share/doc/awstats/awstats.htm
+%%PORTDOCS%%share/doc/awstats/awstats.pdf
+%%PORTDOCS%%share/doc/awstats/awstats.xml
+%%PORTDOCS%%share/doc/awstats/awstats_benchmark.html
+%%PORTDOCS%%share/doc/awstats/awstats_changelog.txt
+%%PORTDOCS%%share/doc/awstats/awstats_compare.html
+%%PORTDOCS%%share/doc/awstats/awstats_config.html
+%%PORTDOCS%%share/doc/awstats/awstats_faq.html
+%%PORTDOCS%%share/doc/awstats/awstats_glossary.html
+%%PORTDOCS%%share/doc/awstats/awstats_license.html
+%%PORTDOCS%%share/doc/awstats/awstats_security.html
+%%PORTDOCS%%share/doc/awstats/awstats_setup.html
+%%PORTDOCS%%share/doc/awstats/awstats_tools.html
+%%PORTDOCS%%share/doc/awstats/awstats_what.html
 %%PORTDOCS%%share/doc/awstats/images/awstats.ico
 %%PORTDOCS%%share/doc/awstats/images/awstats_logo1.gif
 %%PORTDOCS%%share/doc/awstats/images/awstats_logo1.png
@@ -14,31 +30,10 @@
 %%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/COPYING.TXT
-%%PORTDOCS%%share/doc/awstats/LICENSE.TXT
-%%PORTDOCS%%share/doc/awstats/awstats.htm
-%%PORTDOCS%%share/doc/awstats/awstats.pdf
-%%PORTDOCS%%share/doc/awstats/awstats.xml
-%%PORTDOCS%%share/doc/awstats/awstats_benchmark.html
-%%PORTDOCS%%share/doc/awstats/awstats_changelog.txt
-%%PORTDOCS%%share/doc/awstats/awstats_compare.html
-%%PORTDOCS%%share/doc/awstats/awstats_config.html
-%%PORTDOCS%%share/doc/awstats/awstats_faq.html
-%%PORTDOCS%%share/doc/awstats/awstats_license.html
-%%PORTDOCS%%share/doc/awstats/awstats_security.html
-%%PORTDOCS%%share/doc/awstats/awstats_setup.html
-%%PORTDOCS%%share/doc/awstats/awstats_what.html
 %%PORTDOCS%%share/doc/awstats/index.html
 %%PORTDOCS%%share/doc/awstats/styles.css
-%%PORTDOCS%%@dirrm share/doc/awstats/images
-%%PORTDOCS%%@dirrm share/doc/awstats
 www/cgi-bin/awstats.model.conf
 www/cgi-bin/awstats.pl
-www/cgi-bin/db/browsers.pl
-www/cgi-bin/db/domains.pl
-www/cgi-bin/db/operating_systems.pl
-www/cgi-bin/db/robots.pl
-www/cgi-bin/db/search_engines.pl
 www/cgi-bin/lang/awstats-ba.txt
 www/cgi-bin/lang/awstats-br.txt
 www/cgi-bin/lang/awstats-cn.txt
@@ -47,6 +42,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-fi.txt
 www/cgi-bin/lang/awstats-fr.txt
 www/cgi-bin/lang/awstats-gr.txt
 www/cgi-bin/lang/awstats-hu.txt
@@ -79,6 +75,7 @@ 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-tr.txt
@@ -86,30 +83,35 @@ 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/icons/browser/netscape.png
-www/icons/browser/msie_large.png
-www/icons/browser/netscape_large.png
-www/icons/browser/konqueror.png
-www/icons/browser/webtv.png
-www/icons/browser/unknown.png
-www/icons/browser/msie.png
-www/icons/browser/omniweb.png
+www/cgi-bin/lib/browsers.pm
+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/icons/browser/adobe.png
+www/icons/browser/amaya.png
+www/icons/browser/da.png
 www/icons/browser/dreamcast.png
-www/icons/browser/mediaplayer.png
+www/icons/browser/getright.png
+www/icons/browser/gozilla.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/netscape.png
+www/icons/browser/netscape_large.png
 www/icons/browser/notavailable.png
-www/icons/browser/pdaphone.png
-www/icons/browser/amaya.png
+www/icons/browser/omniweb.png
 www/icons/browser/opera.png
-www/icons/browser/adobe.png
+www/icons/browser/pdaphone.png
 www/icons/browser/staroffice.png
-www/icons/browser/da.png
-www/icons/browser/webzip.png
-www/icons/browser/getright.png
-www/icons/browser/gozilla.png
 www/icons/browser/teleport.png
+www/icons/browser/unknown.png
 www/icons/browser/webcopier.png
-www/icons/browser/icab.png
+www/icons/browser/webtv.png
+www/icons/browser/webzip.png
 www/icons/clock/hr1.png
 www/icons/clock/hr10.png
 www/icons/clock/hr11.png
@@ -131,112 +133,43 @@ www/icons/cpu/mips.png
 www/icons/cpu/motorola.png
 www/icons/cpu/sun.png
 www/icons/cpu/unknown.png
-www/icons/flags/unknown.png
-www/icons/flags/us.png
 www/icons/flags/ad.png
-www/icons/flags/nu.png
-www/icons/flags/nz.png
 www/icons/flags/ae.png
-www/icons/flags/om.png
-www/icons/flags/org.png
 www/icons/flags/aero.png
-www/icons/flags/pa.png
-www/icons/flags/pe.png
 www/icons/flags/af.png
-www/icons/flags/pf.png
-www/icons/flags/ph.png
 www/icons/flags/ag.png
-www/icons/flags/pk.png
-www/icons/flags/pl.png
 www/icons/flags/ai.png
-www/icons/flags/pro.png
-www/icons/flags/pt.png
 www/icons/flags/al.png
-www/icons/flags/py.png
-www/icons/flags/qa.png
 www/icons/flags/am.png
-www/icons/flags/ro.png
-www/icons/flags/ru.png
 www/icons/flags/an.png
-www/icons/flags/rw.png
-www/icons/flags/sa.png
 www/icons/flags/ao.png
-www/icons/flags/sb.png
-www/icons/flags/se.png
 www/icons/flags/aq.png
-www/icons/flags/sg.png
-www/icons/flags/si.png
 www/icons/flags/ar.png
-www/icons/flags/sk.png
-www/icons/flags/sm.png
 www/icons/flags/arpa.png
-www/icons/flags/sn.png
-www/icons/flags/su.png
 www/icons/flags/as.png
-www/icons/flags/sv.png
-www/icons/flags/sy.png
 www/icons/flags/at.png
-www/icons/flags/sz.png
-www/icons/flags/tc.png
 www/icons/flags/au.png
-www/icons/flags/td.png
-www/icons/flags/tf.png
 www/icons/flags/aw.png
-www/icons/flags/tg.png
-www/icons/flags/th.png
 www/icons/flags/az.png
-www/icons/flags/tk.png
-www/icons/flags/tm.png
 www/icons/flags/ba.png
-www/icons/flags/tn.png
-www/icons/flags/to.png
 www/icons/flags/bb.png
-www/icons/flags/tr.png
-www/icons/flags/tt.png
 www/icons/flags/bd.png
-www/icons/flags/tv.png
-www/icons/flags/tw.png
 www/icons/flags/be.png
-www/icons/flags/tz.png
-www/icons/flags/ua.png
 www/icons/flags/bf.png
-www/icons/flags/ug.png
-www/icons/flags/uk.png
 www/icons/flags/bg.png
-www/icons/flags/um.png
-www/icons/flags/uy.png
 www/icons/flags/bh.png
-www/icons/flags/vu.png
-www/icons/flags/pg.png
 www/icons/flags/bi.png
-www/icons/flags/uz.png
-www/icons/flags/va.png
 www/icons/flags/biz.png
-www/icons/flags/vc.png
-www/icons/flags/ve.png
 www/icons/flags/bj.png
-www/icons/flags/vg.png
-www/icons/flags/vi.png
 www/icons/flags/bm.png
-www/icons/flags/vn.png
-www/icons/flags/wf.png
 www/icons/flags/bn.png
-www/icons/flags/ws.png
-www/icons/flags/ye.png
 www/icons/flags/bo.png
-www/icons/flags/yt.png
-www/icons/flags/yu.png
 www/icons/flags/br.png
-www/icons/flags/za.png
-www/icons/flags/ze.png
 www/icons/flags/bs.png
-www/icons/flags/zm.png
-www/icons/flags/zw.png
 www/icons/flags/bt.png
 www/icons/flags/bv.png
 www/icons/flags/bw.png
 www/icons/flags/by.png
-www/icons/flags/mo.png
 www/icons/flags/bz.png
 www/icons/flags/ca.png
 www/icons/flags/cc.png
@@ -349,7 +282,9 @@ www/icons/flags/md.png
 www/icons/flags/mg.png
 www/icons/flags/mil.png
 www/icons/flags/mk.png
+www/icons/flags/ml.png
 www/icons/flags/mn.png
+www/icons/flags/mo.png
 www/icons/flags/mq.png
 www/icons/flags/mr.png
 www/icons/flags/mt.png
@@ -358,20 +293,89 @@ www/icons/flags/museum.png
 www/icons/flags/mv.png
 www/icons/flags/mx.png
 www/icons/flags/my.png
+www/icons/flags/mz.png
 www/icons/flags/na.png
 www/icons/flags/name.png
 www/icons/flags/nato.png
+www/icons/flags/nb.png
 www/icons/flags/nc.png
 www/icons/flags/ne.png
 www/icons/flags/net.png
 www/icons/flags/ng.png
 www/icons/flags/ni.png
 www/icons/flags/nl.png
+www/icons/flags/nn.png
 www/icons/flags/no.png
 www/icons/flags/np.png
 www/icons/flags/nt.png
-www/icons/flags/nb.png
-www/icons/flags/nn.png
+www/icons/flags/nu.png
+www/icons/flags/nz.png
+www/icons/flags/om.png
+www/icons/flags/org.png
+www/icons/flags/pa.png
+www/icons/flags/pe.png
+www/icons/flags/pf.png
+www/icons/flags/pg.png
+www/icons/flags/ph.png
+www/icons/flags/pk.png
+www/icons/flags/pl.png
+www/icons/flags/pro.png
+www/icons/flags/pt.png
+www/icons/flags/py.png
+www/icons/flags/qa.png
+www/icons/flags/ro.png
+www/icons/flags/ru.png
+www/icons/flags/rw.png
+www/icons/flags/sa.png
+www/icons/flags/sb.png
+www/icons/flags/se.png
+www/icons/flags/sg.png
+www/icons/flags/si.png
+www/icons/flags/sk.png
+www/icons/flags/sm.png
+www/icons/flags/sn.png
+www/icons/flags/su.png
+www/icons/flags/sv.png
+www/icons/flags/sy.png
+www/icons/flags/sz.png
+www/icons/flags/tc.png
+www/icons/flags/td.png
+www/icons/flags/tf.png
+www/icons/flags/tg.png
+www/icons/flags/th.png
+www/icons/flags/tk.png
+www/icons/flags/tm.png
+www/icons/flags/tn.png
+www/icons/flags/to.png
+www/icons/flags/tr.png
+www/icons/flags/tt.png
+www/icons/flags/tv.png
+www/icons/flags/tw.png
+www/icons/flags/tz.png
+www/icons/flags/ua.png
+www/icons/flags/ug.png
+www/icons/flags/uk.png
+www/icons/flags/um.png
+www/icons/flags/unknown.png
+www/icons/flags/us.png
+www/icons/flags/uy.png
+www/icons/flags/uz.png
+www/icons/flags/va.png
+www/icons/flags/vc.png
+www/icons/flags/ve.png
+www/icons/flags/vg.png
+www/icons/flags/vi.png
+www/icons/flags/vn.png
+www/icons/flags/vu.png
+www/icons/flags/wf.png
+www/icons/flags/ws.png
+www/icons/flags/ye.png
+www/icons/flags/yt.png
+www/icons/flags/yu.png
+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
@@ -387,6 +391,7 @@ www/icons/os/hp.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/netbsd.png
 www/icons/os/netware.png
@@ -401,23 +406,25 @@ www/icons/os/vms.png
 www/icons/os/warp.png
 www/icons/os/webtv.png
 www/icons/os/windows.png
-www/icons/os/linux.png
 www/icons/other/awstats_logo1.png
 www/icons/other/awstats_logo2.png
 www/icons/other/barrehe.png
 www/icons/other/barrehh.png
 www/icons/other/barrehk.png
 www/icons/other/barrehp.png
+www/icons/other/barrehx.png
 www/icons/other/barrevh.png
 www/icons/other/barrevk.png
 www/icons/other/barrevp.png
 www/icons/other/barrevu.png
 www/icons/other/barrevv.png
-@dirrm www/cgi-bin/db
-@dirrm www/cgi-bin/lang
-@dirrm www/icons/browser
-@dirrm www/icons/clock
-@dirrm www/icons/cpu
-@dirrm www/icons/flags
-@dirrm www/icons/os
 @dirrm www/icons/other
+@dirrm www/icons/os
+@dirrm www/icons/flags
+@dirrm www/icons/cpu
+@dirrm www/icons/clock
+@dirrm www/icons/browser
+@dirrm www/cgi-bin/lib
+@dirrm www/cgi-bin/lang
+%%PORTDOCS%%@dirrm share/doc/awstats/images
+%%PORTDOCS%%@dirrm share/doc/awstats