- Downgrade from 3.0-RC6 (dev) to 2.5.4 (stable)

- Set PORTEPOCH
- Mark conflict / LATEST_LINK with www/phpsysinfo-dev
- Update pkg-descr
- Update WWW

PR:		126823
Submitted by:	Walter Venable <walt@relnor.com> (maintainer)

5 files changed, 309 insertions, 114 deletions

diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile
index 75897637c6d1..de4b186013a6 100644
--- a/www/phpsysinfo/Makefile
+++ b/www/phpsysinfo/Makefile
@@ -4,14 +4,17 @@
 #
 # $FreeBSD$
 
-PORTNAME=	phpSysInfo
-DISTVERSION=	3.0-RC6
+PORTNAME=	phpsysinfo
+DISTVERSION=	2.5.4
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	walt@relnor.com
-COMMENT=	A php script that displays info about the host being accessed
+COMMENT=	A PHP script for displaying system information
+
+CONFLICTS=	phpsysinfo-3.[0-9]*
+LATEST_LINK=	phpsysinfo-dev
 
 USE_PHP=	pcre xml simplexml
 WANT_PHP_WEB=	yes
diff --git a/www/phpsysinfo/distinfo b/www/phpsysinfo/distinfo
index cbec278f8311..4f3b599821db 100644
--- a/www/phpsysinfo/distinfo
+++ b/www/phpsysinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpSysInfo-3.0-RC6.tar.gz) = 8c63d60734308b40d531b3d2a3a80344
-SHA256 (phpSysInfo-3.0-RC6.tar.gz) = a6822c51b185d1bcc8bc07a53c6345e7ef741fe3a45f54804f2e82191069cd56
-SIZE (phpSysInfo-3.0-RC6.tar.gz) = 203108
+MD5 (phpsysinfo-2.5.4.tar.gz) = 5bf79793255ff24d5f9cbc6a62705aa7
+SHA256 (phpsysinfo-2.5.4.tar.gz) = 421ee80c27c2e13ec1218c45899ab545ee140291b3f4308c630fa6a8ef007330
+SIZE (phpsysinfo-2.5.4.tar.gz) = 221324
diff --git a/www/phpsysinfo/files/patch-includes_os_class_BSD_common_inc_php b/www/phpsysinfo/files/patch-includes_os_class_BSD_common_inc_php
deleted file mode 100644
index caa733c0260e..000000000000
--- a/www/phpsysinfo/files/patch-includes_os_class_BSD_common_inc_php
+++ /dev/null
@@ -1,11 +0,0 @@
---- includes/os/class.BSD.common.inc.php.org	2008-06-05 20:58:52.000000000 +0200
-+++ includes/os/class.BSD.common.inc.php	2008-08-05 22:34:24.000000000 +0200
-@@ -83,7 +83,7 @@
-     }
-   }
-   // get our apache SERVER_NAME or vhost
--  public function hostname() {
-+  public function vhostname() {
-     if (!($result = getenv('SERVER_NAME'))) {
-       $result = "N.A.";
-     }
diff --git a/www/phpsysinfo/pkg-descr b/www/phpsysinfo/pkg-descr
index 1aef2f8d3ce1..c3de48e56a2f 100644
--- a/www/phpsysinfo/pkg-descr
+++ b/www/phpsysinfo/pkg-descr
@@ -1,7 +1,6 @@
-PhpSysInfo is a PHP script that displays infromation about the host being 
-accessed.  It will display things like Uptime, CPU, Memory, SCSI, IDE, PCI, 
-Ethernet, Floppy, and Video Infromation.  It can be customized.  
+phpsysinfo is a PHP script that displays information about the host being
+accessed.
+It will displays things like Uptime, CPU, Memory, SCSI, IDE, PCI, Ethernet,
+Floppy, and Video Information.
 
-WWW: http://sourceforge.net/projects/phpsysinfo/
-
-	-Bob Bomar <bob@fly.homeunix.org>
+WWW: http://phpsysinfo.sourceforge.net
diff --git a/www/phpsysinfo/pkg-plist b/www/phpsysinfo/pkg-plist
index 8ec94cdc52a8..dfbfee43f14a 100644
--- a/www/phpsysinfo/pkg-plist
+++ b/www/phpsysinfo/pkg-plist
@@ -1,26 +1,10 @@
 %%WWWDIR%%/COPYING
 %%WWWDIR%%/ChangeLog
 %%WWWDIR%%/README
-%%WWWDIR%%/README_PLUGIN
 %%WWWDIR%%/config.php
 %%WWWDIR%%/config.php.new
-%%WWWDIR%%/data/index.html
 %%WWWDIR%%/distros.ini
-%%WWWDIR%%/gfx/ajaxLoader.gif
-%%WWWDIR%%/gfx/asc.gif
-%%WWWDIR%%/gfx/attention.gif
-%%WWWDIR%%/gfx/bg.gif
-%%WWWDIR%%/gfx/body.gif
-%%WWWDIR%%/gfx/bullet_toggle_minus.png
-%%WWWDIR%%/gfx/bullet_toggle_plus.png
-%%WWWDIR%%/gfx/close.gif
-%%WWWDIR%%/gfx/desc.gif
-%%WWWDIR%%/gfx/html.gif
-%%WWWDIR%%/gfx/next.gif
-%%WWWDIR%%/gfx/prev.gif
-%%WWWDIR%%/gfx/reload.png
 %%WWWDIR%%/images/Arch.gif
-%%WWWDIR%%/images/Arch.png
 %%WWWDIR%%/images/CentOS.png
 %%WWWDIR%%/images/Cobalt.png
 %%WWWDIR%%/images/Darwin.png
@@ -40,17 +24,57 @@
 %%WWWDIR%%/images/Trustix.gif
 %%WWWDIR%%/images/Ubuntu.gif
 %%WWWDIR%%/images/free-eos.png
-%%WWWDIR%%/images/hlfs.png
 %%WWWDIR%%/images/index.html
 %%WWWDIR%%/images/lfs.png
 %%WWWDIR%%/images/unknown.png
 %%WWWDIR%%/images/xp.gif
-%%WWWDIR%%/includes/class.Error.inc.php
-%%WWWDIR%%/includes/class.psi_plugin.inc.php
-%%WWWDIR%%/includes/class.psi_plugin_interface.inc.php
+%%WWWDIR%%/includes/XPath.class.php
+%%WWWDIR%%/includes/class.Template.inc.php
+%%WWWDIR%%/includes/class.error.inc.php
 %%WWWDIR%%/includes/common_functions.php
 %%WWWDIR%%/includes/index.html
-%%WWWDIR%%/includes/mb/class.coretemp.inc.php
+%%WWWDIR%%/includes/indicator.php
+%%WWWDIR%%/includes/lang/ar_utf8.php
+%%WWWDIR%%/includes/lang/bg.php
+%%WWWDIR%%/includes/lang/big5.php
+%%WWWDIR%%/includes/lang/br.php
+%%WWWDIR%%/includes/lang/ca.php
+%%WWWDIR%%/includes/lang/cn.php
+%%WWWDIR%%/includes/lang/cs.php
+%%WWWDIR%%/includes/lang/ct.php
+%%WWWDIR%%/includes/lang/da.php
+%%WWWDIR%%/includes/lang/de.php
+%%WWWDIR%%/includes/lang/en.php
+%%WWWDIR%%/includes/lang/es.php
+%%WWWDIR%%/includes/lang/et.php
+%%WWWDIR%%/includes/lang/eu.php
+%%WWWDIR%%/includes/lang/fi.php
+%%WWWDIR%%/includes/lang/fr.php
+%%WWWDIR%%/includes/lang/gr.php
+%%WWWDIR%%/includes/lang/he.php
+%%WWWDIR%%/includes/lang/hu.php
+%%WWWDIR%%/includes/lang/id.php
+%%WWWDIR%%/includes/lang/index.html
+%%WWWDIR%%/includes/lang/is.php
+%%WWWDIR%%/includes/lang/it.php
+%%WWWDIR%%/includes/lang/ja.php
+%%WWWDIR%%/includes/lang/jp.php
+%%WWWDIR%%/includes/lang/ko.php
+%%WWWDIR%%/includes/lang/lt.php
+%%WWWDIR%%/includes/lang/lv.php
+%%WWWDIR%%/includes/lang/nl.php
+%%WWWDIR%%/includes/lang/no.php
+%%WWWDIR%%/includes/lang/pa_utf8.php
+%%WWWDIR%%/includes/lang/pl.php
+%%WWWDIR%%/includes/lang/pt-br.php
+%%WWWDIR%%/includes/lang/pt.php
+%%WWWDIR%%/includes/lang/ro.php
+%%WWWDIR%%/includes/lang/ru.php
+%%WWWDIR%%/includes/lang/sk.php
+%%WWWDIR%%/includes/lang/sr.php
+%%WWWDIR%%/includes/lang/sv.php
+%%WWWDIR%%/includes/lang/tr.php
+%%WWWDIR%%/includes/lang/tw.php
 %%WWWDIR%%/includes/mb/class.hddtemp.inc.php
 %%WWWDIR%%/includes/mb/class.healthd.inc.php
 %%WWWDIR%%/includes/mb/class.hwsensors.inc.php
@@ -59,7 +83,6 @@
 %%WWWDIR%%/includes/mb/class.mbmon.inc.php
 %%WWWDIR%%/includes/mb/index.html
 %%WWWDIR%%/includes/os/class.BSD.common.inc.php
-%%WWWDIR%%/includes/os/class.BSD.common.inc.php.orig
 %%WWWDIR%%/includes/os/class.Darwin.inc.php
 %%WWWDIR%%/includes/os/class.FreeBSD.inc.php
 %%WWWDIR%%/includes/os/class.HP-UX.inc.php
@@ -70,81 +93,262 @@
 %%WWWDIR%%/includes/os/class.WINNT.inc.php
 %%WWWDIR%%/includes/os/class.parseProgs.inc.php
 %%WWWDIR%%/includes/os/index.html
-%%WWWDIR%%/includes/redir.php
-%%WWWDIR%%/includes/ups/class.apcupsd.inc.php
-%%WWWDIR%%/includes/ups/index.html
-%%WWWDIR%%/includes/xml.class.php
+%%WWWDIR%%/includes/system_footer.php
+%%WWWDIR%%/includes/system_header.php
+%%WWWDIR%%/includes/xml/filesystems.php
+%%WWWDIR%%/includes/xml/hardware.php
+%%WWWDIR%%/includes/xml/hddtemp.php
+%%WWWDIR%%/includes/xml/index.html
+%%WWWDIR%%/includes/xml/mbinfo.php
+%%WWWDIR%%/includes/xml/memory.php
+%%WWWDIR%%/includes/xml/network.php
+%%WWWDIR%%/includes/xml/vitals.php
 %%WWWDIR%%/index.php
-%%WWWDIR%%/js/README
-%%WWWDIR%%/js/index.html
-%%WWWDIR%%/js/jquery.color.pack.js
-%%WWWDIR%%/js/jquery.mousewheel.pack.js
-%%WWWDIR%%/js/jquery.nyroModal.pack.js
-%%WWWDIR%%/js/jquery.pack.js
-%%WWWDIR%%/js/jquery.tablesorter.pack.js
-%%WWWDIR%%/language/bg.xml
-%%WWWDIR%%/language/cz.xml
-%%WWWDIR%%/language/de.xml
-%%WWWDIR%%/language/en.xml
-%%WWWDIR%%/language/es.xml
-%%WWWDIR%%/language/et.xml
-%%WWWDIR%%/language/fr.xml
-%%WWWDIR%%/language/gl.xml
-%%WWWDIR%%/language/hu.xml
-%%WWWDIR%%/language/it.xml
-%%WWWDIR%%/language/language.php
-%%WWWDIR%%/language/nl.xml
-%%WWWDIR%%/language/no.xml
-%%WWWDIR%%/language/pl.xml
-%%WWWDIR%%/language/pt-br.xml
-%%WWWDIR%%/language/ro.xml
-%%WWWDIR%%/language/ru.xml
-%%WWWDIR%%/language/sc.xml
-%%WWWDIR%%/language/sk.xml
-%%WWWDIR%%/language/sv.xml
-%%WWWDIR%%/language/tw.xml
-%%WWWDIR%%/language/uk.xml
 %%WWWDIR%%/phpsysinfo.dtd
-%%WWWDIR%%/phpsysinfo.js
-%%WWWDIR%%/plugins/index.html
-%%WWWDIR%%/plugins/mdstat/class.mdstat.inc.php
-%%WWWDIR%%/plugins/mdstat/css/mdstat.css
-%%WWWDIR%%/plugins/mdstat/gfx/error.png
-%%WWWDIR%%/plugins/mdstat/gfx/harddrivefail.png
-%%WWWDIR%%/plugins/mdstat/gfx/harddriveok.png
-%%WWWDIR%%/plugins/mdstat/gfx/harddrivespare.png
-%%WWWDIR%%/plugins/mdstat/js/mdstat.js
-%%WWWDIR%%/plugins/mdstat/lang/de.xml
-%%WWWDIR%%/plugins/mdstat/lang/en.xml
-%%WWWDIR%%/templates/aqua.css
-%%WWWDIR%%/templates/aqua/aq_background.gif
-%%WWWDIR%%/templates/clean.css
+%%WWWDIR%%/templates/aq/aq.css
+%%WWWDIR%%/templates/aq/box.tpl
+%%WWWDIR%%/templates/aq/form.tpl
+%%WWWDIR%%/templates/aq/images/aq_background.gif
+%%WWWDIR%%/templates/aq/images/bar_left.gif
+%%WWWDIR%%/templates/aq/images/bar_middle.gif
+%%WWWDIR%%/templates/aq/images/bar_right.gif
+%%WWWDIR%%/templates/aq/images/coininfd.gif
+%%WWWDIR%%/templates/aq/images/coininfg.gif
+%%WWWDIR%%/templates/aq/images/coinsupd.gif
+%%WWWDIR%%/templates/aq/images/coinsupg.gif
+%%WWWDIR%%/templates/aq/images/d.gif
+%%WWWDIR%%/templates/aq/images/fond.gif
+%%WWWDIR%%/templates/aq/images/g.gif
+%%WWWDIR%%/templates/aq/images/index.html
+%%WWWDIR%%/templates/aq/images/inf.gif
+%%WWWDIR%%/templates/aq/images/redbar_left.gif
+%%WWWDIR%%/templates/aq/images/redbar_middle.gif
+%%WWWDIR%%/templates/aq/images/redbar_right.gif
+%%WWWDIR%%/templates/aq/images/space15_15.gif
+%%WWWDIR%%/templates/aq/images/sup.gif
+%%WWWDIR%%/templates/aq/index.html
+%%WWWDIR%%/templates/black/black.css
+%%WWWDIR%%/templates/black/box.tpl
+%%WWWDIR%%/templates/black/form.tpl
+%%WWWDIR%%/templates/black/images/aq_background.gif
+%%WWWDIR%%/templates/black/images/bar_left.gif
+%%WWWDIR%%/templates/black/images/bar_middle.gif
+%%WWWDIR%%/templates/black/images/bar_right.gif
+%%WWWDIR%%/templates/black/images/coininfd.gif
+%%WWWDIR%%/templates/black/images/coininfg.gif
+%%WWWDIR%%/templates/black/images/coinsupd.gif
+%%WWWDIR%%/templates/black/images/coinsupg.gif
+%%WWWDIR%%/templates/black/images/d.gif
+%%WWWDIR%%/templates/black/images/fond.gif
+%%WWWDIR%%/templates/black/images/g.gif
+%%WWWDIR%%/templates/black/images/index.html
+%%WWWDIR%%/templates/black/images/inf.gif
+%%WWWDIR%%/templates/black/images/redbar_left.gif
+%%WWWDIR%%/templates/black/images/redbar_middle.gif
+%%WWWDIR%%/templates/black/images/redbar_right.gif
+%%WWWDIR%%/templates/black/images/space15_15.gif
+%%WWWDIR%%/templates/black/images/sup.gif
+%%WWWDIR%%/templates/black/index.html
+%%WWWDIR%%/templates/blue/blue.css
+%%WWWDIR%%/templates/blue/box.tpl
+%%WWWDIR%%/templates/blue/form.tpl
+%%WWWDIR%%/templates/blue/images/bar_left.gif
+%%WWWDIR%%/templates/blue/images/bar_middle.gif
+%%WWWDIR%%/templates/blue/images/bar_right.gif
+%%WWWDIR%%/templates/blue/images/index.html
+%%WWWDIR%%/templates/blue/images/redbar_left.gif
+%%WWWDIR%%/templates/blue/images/redbar_middle.gif
+%%WWWDIR%%/templates/blue/images/redbar_right.gif
+%%WWWDIR%%/templates/blue/images/trans.gif
+%%WWWDIR%%/templates/blue/index.html
+%%WWWDIR%%/templates/bulix/box.tpl
+%%WWWDIR%%/templates/bulix/bulix.css
+%%WWWDIR%%/templates/bulix/form.tpl
+%%WWWDIR%%/templates/bulix/images/bar_left.gif
+%%WWWDIR%%/templates/bulix/images/bar_middle.gif
+%%WWWDIR%%/templates/bulix/images/bar_right.gif
+%%WWWDIR%%/templates/bulix/images/index.html
+%%WWWDIR%%/templates/bulix/images/left_bar.gif
+%%WWWDIR%%/templates/bulix/images/middle_bar.gif
+%%WWWDIR%%/templates/bulix/images/redbar_left.gif
+%%WWWDIR%%/templates/bulix/images/redbar_middle.gif
+%%WWWDIR%%/templates/bulix/images/redbar_right.gif
+%%WWWDIR%%/templates/bulix/images/right_bar.gif
+%%WWWDIR%%/templates/bulix/images/trans.gif
+%%WWWDIR%%/templates/bulix/index.html
+%%WWWDIR%%/templates/classic/box.tpl
+%%WWWDIR%%/templates/classic/classic.css
+%%WWWDIR%%/templates/classic/form.tpl
+%%WWWDIR%%/templates/classic/images/bar_left.gif
+%%WWWDIR%%/templates/classic/images/bar_middle.gif
+%%WWWDIR%%/templates/classic/images/bar_right.gif
+%%WWWDIR%%/templates/classic/images/index.html
+%%WWWDIR%%/templates/classic/images/redbar_left.gif
+%%WWWDIR%%/templates/classic/images/redbar_middle.gif
+%%WWWDIR%%/templates/classic/images/redbar_right.gif
+%%WWWDIR%%/templates/classic/images/trans.gif
+%%WWWDIR%%/templates/classic/index.html
 %%WWWDIR%%/templates/index.html
-%%WWWDIR%%/templates/jstyle_blue.css
-%%WWWDIR%%/templates/jstyle_green.css
-%%WWWDIR%%/templates/phpsysinfo.css
-%%WWWDIR%%/templates/plugin/index.html
-%%WWWDIR%%/templates/plugin/nyroModal.full.css
-%%WWWDIR%%/templates/two.css
-%%WWWDIR%%/templates/two/gradient.png
-%%WWWDIR%%/xml.php
-@dirrm %%WWWDIR%%/templates/two
-@dirrm %%WWWDIR%%/templates/plugin
-@dirrm %%WWWDIR%%/templates/aqua
+%%WWWDIR%%/templates/kde/box.tpl
+%%WWWDIR%%/templates/kde/form.tpl
+%%WWWDIR%%/templates/kde/images/background.gif
+%%WWWDIR%%/templates/kde/images/bar_left.gif
+%%WWWDIR%%/templates/kde/images/bar_middle.gif
+%%WWWDIR%%/templates/kde/images/bar_right.gif
+%%WWWDIR%%/templates/kde/images/coininfd.gif
+%%WWWDIR%%/templates/kde/images/coininfg.gif
+%%WWWDIR%%/templates/kde/images/coinsupd.gif
+%%WWWDIR%%/templates/kde/images/coinsupg.gif
+%%WWWDIR%%/templates/kde/images/d.gif
+%%WWWDIR%%/templates/kde/images/fond.gif
+%%WWWDIR%%/templates/kde/images/g.gif
+%%WWWDIR%%/templates/kde/images/icons.gif
+%%WWWDIR%%/templates/kde/images/index.html
+%%WWWDIR%%/templates/kde/images/inf.gif
+%%WWWDIR%%/templates/kde/images/nobar_left.gif
+%%WWWDIR%%/templates/kde/images/nobar_middle.gif
+%%WWWDIR%%/templates/kde/images/nobar_right.gif
+%%WWWDIR%%/templates/kde/images/redbar_left.gif
+%%WWWDIR%%/templates/kde/images/redbar_middle.gif
+%%WWWDIR%%/templates/kde/images/redbar_right.gif
+%%WWWDIR%%/templates/kde/images/space15_15.gif
+%%WWWDIR%%/templates/kde/images/sup.gif
+%%WWWDIR%%/templates/kde/images/title_left.gif
+%%WWWDIR%%/templates/kde/images/title_mid.gif
+%%WWWDIR%%/templates/kde/images/title_right.gif
+%%WWWDIR%%/templates/kde/index.html
+%%WWWDIR%%/templates/kde/kde.css
+%%WWWDIR%%/templates/metal/box.tpl
+%%WWWDIR%%/templates/metal/form.tpl
+%%WWWDIR%%/templates/metal/images/bar_left.gif
+%%WWWDIR%%/templates/metal/images/bar_middle.gif
+%%WWWDIR%%/templates/metal/images/bar_right.gif
+%%WWWDIR%%/templates/metal/images/coininfd.gif
+%%WWWDIR%%/templates/metal/images/coininfg.gif
+%%WWWDIR%%/templates/metal/images/coinsupd.gif
+%%WWWDIR%%/templates/metal/images/coinsupg.gif
+%%WWWDIR%%/templates/metal/images/d.gif
+%%WWWDIR%%/templates/metal/images/fond.gif
+%%WWWDIR%%/templates/metal/images/g.gif
+%%WWWDIR%%/templates/metal/images/index.html
+%%WWWDIR%%/templates/metal/images/inf.gif
+%%WWWDIR%%/templates/metal/images/metal_background.gif
+%%WWWDIR%%/templates/metal/images/redbar_left.gif
+%%WWWDIR%%/templates/metal/images/redbar_middle.gif
+%%WWWDIR%%/templates/metal/images/redbar_right.gif
+%%WWWDIR%%/templates/metal/images/space15_15.gif
+%%WWWDIR%%/templates/metal/images/sup.gif
+%%WWWDIR%%/templates/metal/index.html
+%%WWWDIR%%/templates/metal/metal.css
+%%WWWDIR%%/templates/orange/box.tpl
+%%WWWDIR%%/templates/orange/form.tpl
+%%WWWDIR%%/templates/orange/images/bar_left.gif
+%%WWWDIR%%/templates/orange/images/bar_middle.gif
+%%WWWDIR%%/templates/orange/images/bar_right.gif
+%%WWWDIR%%/templates/orange/images/index.html
+%%WWWDIR%%/templates/orange/images/redbar_left.gif
+%%WWWDIR%%/templates/orange/images/redbar_middle.gif
+%%WWWDIR%%/templates/orange/images/redbar_right.gif
+%%WWWDIR%%/templates/orange/images/trans.gif
+%%WWWDIR%%/templates/orange/index.html
+%%WWWDIR%%/templates/orange/orange.css
+%%WWWDIR%%/templates/typo3/box.tpl
+%%WWWDIR%%/templates/typo3/form.tpl
+%%WWWDIR%%/templates/typo3/images/bar_left.gif
+%%WWWDIR%%/templates/typo3/images/bar_middle.gif
+%%WWWDIR%%/templates/typo3/images/bar_right.gif
+%%WWWDIR%%/templates/typo3/images/index.html
+%%WWWDIR%%/templates/typo3/images/redbar_left.gif
+%%WWWDIR%%/templates/typo3/images/redbar_middle.gif
+%%WWWDIR%%/templates/typo3/images/redbar_right.gif
+%%WWWDIR%%/templates/typo3/images/trans.gif
+%%WWWDIR%%/templates/typo3/index.html
+%%WWWDIR%%/templates/typo3/typo3.css
+%%WWWDIR%%/templates/windows_classic/box.tpl
+%%WWWDIR%%/templates/windows_classic/form.tpl
+%%WWWDIR%%/templates/windows_classic/images/bar_left.gif
+%%WWWDIR%%/templates/windows_classic/images/bar_middle.gif
+%%WWWDIR%%/templates/windows_classic/images/bar_right.gif
+%%WWWDIR%%/templates/windows_classic/images/bottom.gif
+%%WWWDIR%%/templates/windows_classic/images/bottom_left_corner.gif
+%%WWWDIR%%/templates/windows_classic/images/bottom_right_corner.gif
+%%WWWDIR%%/templates/windows_classic/images/index.html
+%%WWWDIR%%/templates/windows_classic/images/left.gif
+%%WWWDIR%%/templates/windows_classic/images/middle.gif
+%%WWWDIR%%/templates/windows_classic/images/min_max.gif
+%%WWWDIR%%/templates/windows_classic/images/nobar_left.gif
+%%WWWDIR%%/templates/windows_classic/images/nobar_middle.gif
+%%WWWDIR%%/templates/windows_classic/images/nobar_right.gif
+%%WWWDIR%%/templates/windows_classic/images/redbar_left.gif
+%%WWWDIR%%/templates/windows_classic/images/redbar_middle.gif
+%%WWWDIR%%/templates/windows_classic/images/redbar_right.gif
+%%WWWDIR%%/templates/windows_classic/images/right.gif
+%%WWWDIR%%/templates/windows_classic/images/spacer.gif
+%%WWWDIR%%/templates/windows_classic/images/top.gif
+%%WWWDIR%%/templates/windows_classic/images/upper_left_corner.gif
+%%WWWDIR%%/templates/windows_classic/images/upper_right_corner.gif
+%%WWWDIR%%/templates/windows_classic/images/yellowbar_left.gif
+%%WWWDIR%%/templates/windows_classic/images/yellowbar_middle.gif
+%%WWWDIR%%/templates/windows_classic/images/yellowbar_right.gif
+%%WWWDIR%%/templates/windows_classic/index.html
+%%WWWDIR%%/templates/windows_classic/windows_classic.css
+%%WWWDIR%%/templates/wintendoxp/box.tpl
+%%WWWDIR%%/templates/wintendoxp/form.tpl
+%%WWWDIR%%/templates/wintendoxp/images/aq_background.gif
+%%WWWDIR%%/templates/wintendoxp/images/background.gif
+%%WWWDIR%%/templates/wintendoxp/images/bar_left.gif
+%%WWWDIR%%/templates/wintendoxp/images/bar_middle.gif
+%%WWWDIR%%/templates/wintendoxp/images/bar_right.gif
+%%WWWDIR%%/templates/wintendoxp/images/coininfd.gif
+%%WWWDIR%%/templates/wintendoxp/images/coininfg.gif
+%%WWWDIR%%/templates/wintendoxp/images/coinsupd.gif
+%%WWWDIR%%/templates/wintendoxp/images/coinsupg.gif
+%%WWWDIR%%/templates/wintendoxp/images/d.gif
+%%WWWDIR%%/templates/wintendoxp/images/fond.gif
+%%WWWDIR%%/templates/wintendoxp/images/g.gif
+%%WWWDIR%%/templates/wintendoxp/images/icons.gif
+%%WWWDIR%%/templates/wintendoxp/images/index.html
+%%WWWDIR%%/templates/wintendoxp/images/inf.gif
+%%WWWDIR%%/templates/wintendoxp/images/nobar_left.gif
+%%WWWDIR%%/templates/wintendoxp/images/nobar_middle.gif
+%%WWWDIR%%/templates/wintendoxp/images/nobar_right.gif
+%%WWWDIR%%/templates/wintendoxp/images/redbar_left.gif
+%%WWWDIR%%/templates/wintendoxp/images/redbar_middle.gif
+%%WWWDIR%%/templates/wintendoxp/images/redbar_right.gif
+%%WWWDIR%%/templates/wintendoxp/images/space15_15.gif
+%%WWWDIR%%/templates/wintendoxp/images/sup.gif
+%%WWWDIR%%/templates/wintendoxp/index.html
+%%WWWDIR%%/templates/wintendoxp/wintendoxp.css
+@dirrm %%WWWDIR%%/templates/wintendoxp/images
+@dirrm %%WWWDIR%%/templates/wintendoxp
+@dirrm %%WWWDIR%%/templates/windows_classic/images
+@dirrm %%WWWDIR%%/templates/windows_classic
+@dirrm %%WWWDIR%%/templates/typo3/images
+@dirrm %%WWWDIR%%/templates/typo3
+@dirrm %%WWWDIR%%/templates/orange/images
+@dirrm %%WWWDIR%%/templates/orange
+@dirrm %%WWWDIR%%/templates/mobile/images
+@dirrm %%WWWDIR%%/templates/mobile
+@dirrm %%WWWDIR%%/templates/metal/images
+@dirrm %%WWWDIR%%/templates/metal
+@dirrm %%WWWDIR%%/templates/kde/images
+@dirrm %%WWWDIR%%/templates/kde
+@dirrm %%WWWDIR%%/templates/classic/images
+@dirrm %%WWWDIR%%/templates/classic
+@dirrm %%WWWDIR%%/templates/bulix/images
+@dirrm %%WWWDIR%%/templates/bulix
+@dirrm %%WWWDIR%%/templates/blue/images
+@dirrm %%WWWDIR%%/templates/blue
+@dirrm %%WWWDIR%%/templates/black/images
+@dirrm %%WWWDIR%%/templates/black
+@dirrm %%WWWDIR%%/templates/aq/images
+@dirrm %%WWWDIR%%/templates/aq
 @dirrm %%WWWDIR%%/templates
-@dirrm %%WWWDIR%%/plugins/mdstat/lang
-@dirrm %%WWWDIR%%/plugins/mdstat/js
-@dirrm %%WWWDIR%%/plugins/mdstat/gfx
-@dirrm %%WWWDIR%%/plugins/mdstat/css
-@dirrm %%WWWDIR%%/plugins/mdstat
-@dirrm %%WWWDIR%%/plugins
-@dirrm %%WWWDIR%%/language
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/includes/ups
+@dirrm %%WWWDIR%%/includes/xml
 @dirrm %%WWWDIR%%/includes/os
 @dirrm %%WWWDIR%%/includes/mb
+@dirrm %%WWWDIR%%/includes/lang
 @dirrm %%WWWDIR%%/includes
 @dirrm %%WWWDIR%%/images
 @dirrm %%WWWDIR%%/gfx
-@dirrm %%WWWDIR%%/data
-@dirrmtry %%WWWDIR%%
+@dirrm %%WWWDIR%%