16 files changed, 552 insertions, 624 deletions

diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index 79cb67ae6e26..c243e0944029 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	flyspray
-PORTVERSION=	0.9.8
+PORTVERSION=	0.9.9
 CATEGORIES=	devel
-MASTER_SITES=	http://flyspray.rocks.cc/files/
+MASTER_SITES=	http://www.flyspray.org/
 
 MAINTAINER=	nick@foobar.org
 COMMENT=	A simple, easy-to-use web based bug tracking system
@@ -16,10 +16,12 @@ COMMENT=	A simple, easy-to-use web based bug tracking system
 RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
 
 USE_PHP=	mysql pcre session
+USE_ZIP=	yes
 WANT_PHP_WEB=	yes
 
 NO_BUILD=	yes
 
+NO_WRKSUBDIR=	yes
 FLYSPRAYDIR=	${PREFIX}/share/${PORTNAME}
 ATTACHMENTDIR=	${DBDIR}/${PORTNAME}/attachments
 DBDIR=		/var/db
@@ -30,14 +32,12 @@ DOC_FILES=	AUTHORS.txt BUGS.txt CHANGELOG.txt INSTALL.txt \
 		licences/ADOdb.licence.txt \
 		licences/Flyspray.licence.txt \
 		licences/NuvolaIcons.licence.txt \
-		licences/class.jabber.php.licence.txt \
-		licences/jsCalendar.licence.txt \
-		licences/phpMarkdown.licence.txt \
-		licences/phpmailer.licence.txt \
+		licences/jsCalendar.licence.txt
 
-FLYSPRAY_FILES=	.htaccess favicon.ico header.php index.php \
-		remote-client.php remote.php docs/licences/gnu_lgpl.html \
-		includes lang scripts setup sql themes
+FLYSPRAY_FILES=	cache docs/licences/gnu_lgpl.html \
+		favicon.ico feed.php header.php htaccess.dist includes \
+		index.php javascript lang plugins robots.txt schedule.php \
+		scripts setup templates themes
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
@@ -51,8 +51,6 @@ post-patch:
 do-install:
 	@${MKDIR} ${FLYSPRAYDIR}
 	${CHMOD} 755 ${FLYSPRAYDIR}
-	${INSTALL_DATA} ${WRKSRC}/flyspray.conf.php \
-		${FLYSPRAYDIR}/flyspray.conf.php-dist
 	${TOUCH} ${FLYSPRAYDIR}/flyspray.conf.php
 	cd ${WRKSRC} && \
 		tar cf - ${FLYSPRAY_FILES} | \
@@ -62,6 +60,7 @@ do-install:
 	@${MKDIR} ${ATTACHMENTDIR}
 	${CHMOD} 750 ${ATTACHMENTDIR}
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${ATTACHMENTDIR}
+	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/cache
 	${CHOWN} ${WWWOWN}:${WWWGRP} ${FLYSPRAYDIR}/flyspray.conf.php
 
 post-install: install-doc
diff --git a/devel/flyspray/distinfo b/devel/flyspray/distinfo
index 6788629d9203..c1019df92ded 100644
--- a/devel/flyspray/distinfo
+++ b/devel/flyspray/distinfo
@@ -1,3 +1,3 @@
-MD5 (flyspray-0.9.8.tar.gz) = e034c2f1638cca65c41c7cb3590e2014
-SHA256 (flyspray-0.9.8.tar.gz) = 0aba36c36092e2e8e843239245b8e39ea56c31286683a7d2ca9a458fdd08c4fa
-SIZE (flyspray-0.9.8.tar.gz) = 385283
+MD5 (flyspray-0.9.9.zip) = f6c8e3c2b79caa85d27d8cffa253ee63
+SHA256 (flyspray-0.9.9.zip) = 567efbe2742724cc264d908db4c5769248b7e78942cecfe658607c473aa3553d
+SIZE (flyspray-0.9.9.zip) = 1406199
diff --git a/devel/flyspray/files/README.FreeBSD b/devel/flyspray/files/README.FreeBSD
index e15315cc0289..00d9def764c1 100644
--- a/devel/flyspray/files/README.FreeBSD
+++ b/devel/flyspray/files/README.FreeBSD
@@ -10,7 +10,7 @@ Configuration Instructions for Flyspray
 
 # mysqladmin -u root -p create flyspray
 
-2) Insert the following configuration command into your Apache httpd.conf:
+2) Insert the following configuration into your Apache httpd.conf:
 
 	Alias "/flyspray/" "%%FLYSPRAYDIR%%/"
         <Directory %%FLYSPRAYDIR%%>
@@ -20,19 +20,25 @@ Configuration Instructions for Flyspray
                 Allow from all
         </Directory>
 
-3) Point your browser to http://yourserver.com/flyspray/ and you should
-   see the Flyspray setup script!
+3) Point your browser to http://yourserver.example.com/flyspray/setup/ and you should
+   see the Flyspray installer.
 
-4) Click on the admin links to set up your Options and lists.
+4) Once the setup procedure has been completed, you must remove the "setup"
+   directory:
 
-5) Close the sample task, and begin adding your own.
+# rm -rf %%FLYSPRAYDIR%%/setup/
 
-6) Report any bugs you find back to http://flyspray.rocks.cc/bts/ or the
-   mailing list linked from the Flyspray homepage.
+5) Log in using the Admin account you just created, and click on the admin
+   links to set up your Options and lists.
 
+6) Close the sample task, and begin adding your own.
 
-Upgrading from Flyspray 0.9.7
-=============================
+7) Report any bugs you find back to http://bugs.flyspray.org/ or the mailing
+   list linked from the Flyspray homepage.
+
+
+Upgrading from previous versions of Flyspray
+============================================
 
 You can upgrade from a previous version of Flyspray by doing the following:
 
@@ -41,12 +47,15 @@ You can upgrade from a previous version of Flyspray by doing the following:
 1) back up your old flyspray task database using "mysqldump".  No, really,
    you seriously run the risk of losing data if you don't do this.
 
-2) load http://yourserver.com/flyspray/ in your browser and follow the
-   installation instructions.  On the "Database setup" page, set the
-   "Install/Upgrade" field to "Upgrade 0.9.7 - 0.9.8" and enter your
-   database parameters.
+2) load http://yourserver.example.com/flyspray/setup/upgrade.php in your
+   browser and follow the instructions.  If upgrading from 0.9.9beta2,
+   manually change the value of "fs_ver" in the {dbprefix}prefs table of
+   your Flyspray DB to "0.9.9 dev".  You can do this using the folowing SQL
+   command:
+
+sql> update flyspray_prefs set pref_value = "0.9.9 dev" where pref_name = "fs_ver";
 
-5) That's it! flyspray has been upgraded to 0.9.8.  If you messed up the
-   sequence of commands, you will probably have lost data in the process,
-   and may need to re-install your database from your backup.  You did
-   take a backup, right?
+3) That's it! Flyspray has been upgraded to 0.9.9.  If you messed up
+   somehow, you will probably have lost data in the process, and may need to
+   re-install your database from your backup, but that's ok because you took
+   a backup, right?
diff --git a/devel/flyspray/files/patch-.htaccess b/devel/flyspray/files/patch-.htaccess
deleted file mode 100644
index 0e853bb3bfa2..000000000000
--- a/devel/flyspray/files/patch-.htaccess
+++ /dev/null
@@ -1,20 +0,0 @@
---- .htaccess.orig	Tue Nov  1 13:13:20 2005
-+++ .htaccess	Tue Nov  1 13:13:20 2005
-@@ -5,6 +5,8 @@
- <IfModule mod_rewrite.c>
- RewriteEngine on
- 
-+ReWriteBase /flyspray
-+
- RewriteRule ^.*\?do=admin&area=prefs$ index.php?do=admin&area=prefs [L]
- 
- RewriteRule ^([0-9]+)$ index.php?do=details&id=$1 [L]
-@@ -12,7 +14,7 @@
- RewriteRule ^task/([0-9]+)comment([0-9]+)$ index.php?do=details&id=$1comment$2 [L]
- RewriteRule ^task/([0-9]+)/depends$ index.php?do=depends&id=$1 [L]
- RewriteRule ^task/([0-9]+)/edit$ index.php?do=details&id=$1&edit=yep [L]
--
-+RewriteRule ^task/([0-9]+)/depends&prune=([0-9]+)$ index.php?do=depends&id=$1&prune=$2 [L]
- RewriteRule ^newtask$ index.php?do=newtask [L]
- RewriteRule ^newtask/proj([0-9]+)$ index.php?do=newtask&project=$1 [L]
- 
diff --git a/devel/flyspray/files/patch-docs-CHANGELOG.txt b/devel/flyspray/files/patch-docs-CHANGELOG.txt
deleted file mode 100644
index 7c473f5bc675..000000000000
--- a/devel/flyspray/files/patch-docs-CHANGELOG.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- docs/CHANGELOG.txt.orig	Sun Oct 23 01:22:26 2005
-+++ docs/CHANGELOG.txt	Sun Oct 30 07:11:06 2005
-@@ -1,4 +1,14 @@
--0.9.8 - 23 October 2005
-+0.9.8 update1 - 30 October 05
-+
-+FIXED - Lack of .htaccess rewrite rule for dependency graphs
-+FIXED - Cross Site Scripting security hole
-+FIXED - Project selector permission query
-+FIXED - Date range for Reports
-+FIXED - Bugs with language pack function
-+FIXED - error_reporting() in header.php
-+
-+
-+0.9.8 - 23 October 05
- 
- NEW - Full-featured installer
- NEW - Address rewriting for human-readable URLs
diff --git a/devel/flyspray/files/patch-header.php b/devel/flyspray/files/patch-header.php
deleted file mode 100644
index 5d859479235b..000000000000
--- a/devel/flyspray/files/patch-header.php
+++ /dev/null
@@ -1,16 +0,0 @@
---- header.php.orig	Sun Oct 23 01:11:14 2005
-+++ header.php	Wed Oct 26 04:16:53 2005
-@@ -4,8 +4,11 @@
- // move flyspray.conf.php to a directory where a browser can't access it.
- // (RECOMMENDED).
- 
--// Turn off PHP notices
--error_reporting(E_ALL & -E_NOTICE);
-+// You might like to uncomment the next line if you are receiving lots of
-+// PHP NOTICE errors.  We are in the process of making Flyspray stop making
-+// these errors, but this will help hide them until we are finished.
-+
-+//error_reporting(E_ALL & ~E_NOTICE);
- 
- // Check PHP Version (Must Be at least 4.3)
- // For 0.9.9, this should redirect to the error page
diff --git a/devel/flyspray/files/patch-includes-functions.inc.php b/devel/flyspray/files/patch-includes-functions.inc.php
deleted file mode 100644
index 6210c3372274..000000000000
--- a/devel/flyspray/files/patch-includes-functions.inc.php
+++ /dev/null
@@ -1,78 +0,0 @@
---- includes/functions.inc.php.orig	Sun Oct 23 09:03:37 2005
-+++ includes/functions.inc.php	Sun Oct 30 10:51:12 2005
-@@ -18,19 +18,31 @@
-    */
-    function get_language_pack($lang, $module)
-    {
--      $before = get_defined_vars();
-+      // MC: functions module is in functions.*inc*.php
-+      if ($module == 'functions') {
-+          $module .= '.inc';
-+      }
-+
-+      $before   = get_defined_vars();
-       require_once("lang/en/$module.php");
-       $after_en = get_defined_vars();
--      $new_var = array_keys(array_diff($after_en, $before));
--      $new_var_name = @$new_var[1];
--      $new_var['en'] = @$$new_var_name;
--      if (file_exists("lang/$lang/$module.php"))
--      {
--         require_once("lang/$lang/$module.php");
--      }
--      $new_var[$lang] = @$$new_var_name;
-+      $new_var  = array_keys(array_diff($after_en, $before));
- 
--      $$new_var_name = @array_merge($new_var['en'], $new_var[$lang]);
-+      if (isset($new_var[1])) {
-+          list(, $new_var_name) = $new_var;
-+          $new_var['en'] = $$new_var_name;
-+
-+          if (file_exists("lang/$lang/$module.php")) {
-+             require_once("lang/$lang/$module.php");
-+          }
-+          $new_var[$lang] = $$new_var_name;
-+          // $$new_var_name  = array_merge($new_var['en'], $new_var[$lang]);
-+          $$new_var_name  = $new_var['en'];
-+          $merge_ref      =& $$new_var_name;
-+          foreach ($new_var[$lang] as $key => $val) {
-+              $merge_ref[$key] = $val;
-+          }
-+      }
-    }
- 
-    /**   Redirects the browser to the page in $url
-@@ -189,17 +201,19 @@
- 
-       $status_id = $get_details['item_status'];
- 
--      require("lang/$lang/status.php");
-+      global $status_list, $severity_list, $priority_list;
-+      $this->get_language_pack($lang, 'status');
-+      $this->get_language_pack($lang, 'severity');
-+      $this->get_language_pack($lang, 'priority');
-+
-       $tmp_array = array("status_name" => $status_list[$status_id]);
-       $get_details = $get_details + $tmp_array;
- 
-       $severity_id = $get_details['task_severity'];
--      require("lang/$lang/severity.php");
-       $tmp_array = array("severity_name" => $severity_list[$severity_id]);
-       $get_details = $get_details + $tmp_array;
- 
-       $priority_id = $get_details['task_priority'];
--      require("lang/$lang/priority.php");
-       $tmp_array = array("priority_name" => $priority_list[$priority_id]);
-       $get_details = $get_details + $tmp_array;
- 
-@@ -301,8 +315,9 @@
-       global $db;
-       global $dbprefix;
-       global $lang;
-+      global $functions_text;
- 
--      require("lang/$lang/functions.inc.php");
-+      $this->get_language_pack($lang, 'functions');
- 
-       // Just in case $perpage is something weird, like 0, fix it here:
-       if ($perpage < 1) { $perpage = ($totalcount > 0 ? $totalcount : 1); }
diff --git a/devel/flyspray/files/patch-includes-regexp.php b/devel/flyspray/files/patch-includes-regexp.php
deleted file mode 100644
index 6cbbac084616..000000000000
--- a/devel/flyspray/files/patch-includes-regexp.php
+++ /dev/null
@@ -1,94 +0,0 @@
---- includes/regexp.php.orig	Sun Jul 24 12:00:47 2005
-+++ includes/regexp.php	Wed Oct 26 23:03:01 2005
-@@ -55,6 +55,20 @@
- 
- };
- 
-+if (isset($_GET['sort2']) && !empty($_GET['sort2']))
-+{
-+    // Yes. Now check its regex format for safety -- Limited range
-+    if (preg_match ("/^(asc|desc)$/", $_GET['sort2'])) {
-+
-+      // continue;
-+    } else {
-+
-+      $fs->Redirect($fs->CreateURL('error', null));
-+//         print "Sorting request is invalid."; exit;
-+    };
-+
-+};
-+
- if (isset($_GET['project']) && !empty($_GET['project'])) {
- 
-     // Yes. Now check its regex format for safety -- Numbers only
-@@ -69,6 +83,21 @@
-     };
- };
- 
-+if (isset($_GET['type']) && !empty($_GET['type'])) {
-+
-+    // Yes. Now check its regex format for safety -- Numbers only
-+    if (preg_match ("/^\d+$/", $_GET['type'])) {
-+
-+      // continue;
-+
-+    } else {
-+
-+      $fs->Redirect($fs->CreateURL('error', null));
-+//         print "Tasktype request is invalid."; exit;
-+    };
-+};
-+
-+
- if (isset($_GET['page']) && !empty($_GET['page']))
- {
-     // Yes. Now check its regex format for safety -- Numbers only
-@@ -324,4 +353,48 @@
- //         print "Magic URL is invalid."; exit;
-     };
- };
-+
-+if (isset($_GET['tasks']) && !empty($_GET['tasks']))
-+{
-+    // Yes. Now check its regex format for safety -- Limited range
-+    if (preg_match ("/^(all|assigned|reported|watched)$/", $_GET['tasks'])) {
-+
-+      // continue;
-+    } else {
-+
-+      $fs->Redirect($fs->CreateURL('error', null));
-+//         print "Tasks request is invalid."; exit;
-+    };
-+
-+};
-+
-+if (isset($_GET['due']) && !empty($_GET['due'])) {
-+
-+    // Yes. Now check its regex format for safety -- Numbers only
-+    if (preg_match ("/^\d+$/", $_GET['due'])) {
-+
-+       // continue;
-+    } else {
-+
-+      $fs->Redirect($fs->CreateURL('error', null));
-+//         print "Due version request is invalid."; exit;
-+    };
-+};
-+
-+if (isset($_GET['string']) && !empty($_GET['string'])) {
-+
-+    // Yes. Now check its regex format for safety -- Numbers only
-+    if (preg_match ("!<.*>!", $_GET['string'])) {
-+      $fs->Redirect($fs->CreateURL('error', null));
-+    };
-+};
-+
-+if (isset($_GET['PHPSESSID']) && !empty($_GET['PHPSESSID'])) {
-+
-+    // Yes. Now check its regex format for safety -- Numbers only
-+    if (preg_match ("!<.*>!", $_GET['PHPSESSID'])) {
-+      $fs->Redirect($fs->CreateURL('error', null));
-+    };
-+};
-+
- ?>
diff --git a/devel/flyspray/files/patch-index.php b/devel/flyspray/files/patch-index.php
deleted file mode 100644
index 3edb77ad5e08..000000000000
--- a/devel/flyspray/files/patch-index.php
+++ /dev/null
@@ -1,29 +0,0 @@
---- index.php.orig	Sat Oct 22 13:40:26 2005
-+++ index.php	Thu Oct 27 00:09:01 2005
-@@ -384,15 +384,17 @@
-       // or, if the user is logged in
-       } elseif (isset($_COOKIE['flyspray_userid']))
-       {
--         $get_projects = $db->Query("SELECT DISTINCT p.*
--                                     FROM {$dbprefix}users_in_groups uig
--                                     LEFT JOIN {$dbprefix}groups g ON uig.group_id = g.group_id,
--                                     {$dbprefix}projects p
--                                     WHERE ((uig.user_id = ?
--                                     AND g.view_tasks = '1')
--                                     OR p.others_view = '1')
--                                     AND p.project_is_active = '1'
--                                     GROUP BY p.project_id",
-+         $get_projects = $db->Query("SELECT p.* FROM {$dbprefix}projects p
-+                                     LEFT JOIN {$dbprefix}groups g
-+				     ON p.project_id=g.belongs_to_project
-+				     AND g.view_tasks=1
-+                                     LEFT JOIN {$dbprefix}users_in_groups uig
-+				     ON uig.group_id = g.group_id 
-+				     AND uig.user_id = ?
-+                                     WHERE p.project_is_active='1'
-+				     AND (p.others_view 
-+				     OR uig.user_id IS NOT NULL)
-+				     ORDER BY p.project_title",
-                                      array($current_user['user_id'])
-                                    );
-       // Anonymous users
diff --git a/devel/flyspray/files/patch-remote.php b/devel/flyspray/files/patch-remote.php
deleted file mode 100644
index 81f39cbc86af..000000000000
--- a/devel/flyspray/files/patch-remote.php
+++ /dev/null
@@ -1,10 +0,0 @@
---- remote.php.orig	Thu Aug 25 01:53:36 2005
-+++ remote.php	Wed Oct 26 23:03:01 2005
-@@ -564,6 +564,7 @@
- {
-    global $fs;
-    global $db;
-+   global $dbprefix;
-    include_once('includes/notify.inc.php');
-    $notify = new Notifications;
- 
diff --git a/devel/flyspray/files/patch-scripts-details.php b/devel/flyspray/files/patch-scripts-details.php
deleted file mode 100644
index 8b9cdf33f7e0..000000000000
--- a/devel/flyspray/files/patch-scripts-details.php
+++ /dev/null
@@ -1,60 +0,0 @@
---- scripts/details.php.orig	Sat Oct 22 13:41:22 2005
-+++ scripts/details.php	Thu Oct 27 00:09:01 2005
-@@ -91,17 +91,19 @@
-          } elseif (isset($_COOKIE['flyspray_userid']))
-          {
- 
--                     $get_projects = $db->Query("SELECT DISTINCT p.*
--                                     FROM {$dbprefix}users_in_groups uig
--                                     LEFT JOIN {$dbprefix}groups g ON uig.group_id = g.group_id,
--                                     {$dbprefix}projects p
--                                     WHERE ((uig.user_id = ?
--                                     AND g.view_tasks = '1')
--                                     OR p.others_view = '1')
--                                     AND p.project_is_active = '1'
--                                     ORDER BY p.project_title",
--                                     array($current_user['user_id'])
--                                   );
-+	   $get_projects = $db->Query("SELECT p.* FROM {$dbprefix}projects p
-+                                       LEFT JOIN {$dbprefix}groups g
-+                                       ON p.project_id=g.belongs_to_project
-+                                       AND g.view_tasks=1
-+                                       LEFT JOIN {$dbprefix}users_in_groups uig
-+                                       ON uig.group_id = g.group_id
-+                                       AND uig.user_id = ?
-+                                       WHERE p.project_is_active='1'
-+                                       AND (p.others_view
-+                                       OR uig.user_id IS NOT NULL)
-+                                       ORDER BY p.project_title",
-+				       array($current_user['user_id'])
-+				      );
- 
-          } else
-          {
-@@ -242,7 +244,7 @@
-                   <select id="status" name="item_status">
-                   <?php
-                   // let's get a list of statuses and compare it to the saved one
--                  require("lang/$lang/status.php");
-+                  $fs->get_language_pack($lang, 'status');
-                   foreach($status_list as $key => $val)
-                   {
-                      if ($task_details['item_status'] == $key)
-@@ -319,7 +321,7 @@
-                   <select id="severity" name="task_severity">
-                   <?php
-                   // Get list of severities
--                  require("lang/$lang/severity.php");
-+                  $fs->get_language_pack($lang, 'severity');
-                   foreach($severity_list as $key => $val)
-                   {
-                      if ($task_details['task_severity'] == $key)
-@@ -340,7 +342,7 @@
-                   <select id="priority" name="task_priority">
-                   <?php
-                   // Get list of priorities
--                  require("lang/$lang/priority.php");
-+                  $fs->get_language_pack($lang, 'priority');
-                   foreach($priority_list as $key => $val)
-                   {
-                      if ($task_details['task_priority'] == $key)
diff --git a/devel/flyspray/files/patch-scripts-index.php b/devel/flyspray/files/patch-scripts-index.php
deleted file mode 100644
index f5abe7cbe62c..000000000000
--- a/devel/flyspray/files/patch-scripts-index.php
+++ /dev/null
@@ -1,67 +0,0 @@
---- scripts/index.php.orig	Sat Oct 22 13:41:49 2005
-+++ scripts/index.php	Thu Oct 27 00:09:01 2005
-@@ -129,14 +129,16 @@
-    // Those who aren't super users get this more restrictive query
-    } elseif (isset($_COOKIE['flyspray_userid']))
-    {
--       $check_projects = $db->Query("SELECT p.project_id
--                                     FROM {$dbprefix}users_in_groups uig
--                                     LEFT JOIN {$dbprefix}groups g ON uig.group_id = g.group_id,
--                                     {$dbprefix}projects p
--                                     WHERE ((uig.user_id = ?
--                                     AND g.view_tasks = '1')
--                                     OR p.others_view = '1')
--                                     AND p.project_is_active = '1'
-+       $check_projects = $db->Query("SELECT p.* FROM {$dbprefix}projects p
-+                                     LEFT JOIN {$dbprefix}groups g
-+                                     ON p.project_id=g.belongs_to_project
-+                                     AND g.view_tasks=1
-+                                     LEFT JOIN {$dbprefix}users_in_groups uig
-+                                     ON uig.group_id = g.group_id
-+                                     AND uig.user_id = ?
-+                                     WHERE p.project_is_active='1'
-+                                     AND (p.others_view
-+                                     OR uig.user_id IS NOT NULL)
-                                      ORDER BY p.project_title",
-                                      array($current_user['user_id'])
-                                    );
-@@ -334,7 +336,7 @@
-     <select name="sev">
-       <option value=""><?php echo $index_text['allseverities'];?></option>
-       <?php
--      require("lang/$lang/severity.php");
-+      $fs->get_language_pack($lang, 'severity');
-       foreach($severity_list as $key => $val)
-       {
-          if (isset($_GET['sev']) && $_GET['sev'] == $key)
-@@ -430,7 +432,7 @@
-       <option value="all" <?php if (isset($_GET['status']) && $_GET['status'] == 'all') echo 'selected="selected"';?>><?php echo $index_text['allstatuses'];?></option>
-       <option value="" <?php if ((isset($_GET['status']) && empty($_GET['status'])) OR !isset($_GET['status'])) { echo "selected=\"selected\"";}?>><?php echo $index_text['allopentasks'];?></option>
-       <?php
--      require("lang/$lang/status.php");
-+      $fs->get_language_pack($lang, 'status');
-       foreach($status_list as $key => $val)
-       {
-          if (isset($_GET['status']) && $_GET['status'] == $key)
-@@ -739,18 +741,18 @@
-       {
-          // Get the full status name
-          $status_id = $task_details['item_status'];
--         require("lang/$lang/status.php");
-+         $fs->get_language_pack($lang, 'status');
-          $status = $status_list[$status_id];
-       }
- 
-       // Get the full severity name
-       $severity_id = $task_details['task_severity'];
--      require("lang/$lang/severity.php");
-+      $fs->get_language_pack($lang, 'severity');
-       $severity = $severity_list[$severity_id];
- 
-       // Get the full priority name
-       $priority_id = $task_details['task_priority'];
--      require("lang/$lang/priority.php");
-+      $fs->get_language_pack($lang, 'priority');
-       $priority = $priority_list[$priority_id];
- 
-       // see if it's been assigned
diff --git a/devel/flyspray/files/patch-scripts-newtask.php b/devel/flyspray/files/patch-scripts-newtask.php
deleted file mode 100644
index e4b0c315be61..000000000000
--- a/devel/flyspray/files/patch-scripts-newtask.php
+++ /dev/null
@@ -1,29 +0,0 @@
---- scripts/newtask.php.orig	Thu Sep 29 21:43:25 2005
-+++ scripts/newtask.php	Wed Oct 26 23:03:01 2005
-@@ -104,7 +104,7 @@
-             <select id="itemstatus" name="item_status" <?php if ($permissions['modify_all_tasks'] != "1") echo ' disabled="disabled"';?>>
-             <?php
-             // Get list of statuses
--            require("lang/$lang/status.php");
-+            $fs->get_language_pack($lang, 'status');
-             foreach($status_list as $key => $val)
-             {
-                if ($key == '2')
-@@ -177,7 +177,7 @@
-             <select id="taskseverity" class="adminlist" name="task_severity">
-             <?php
-             // Get list of severities
--            require("lang/$lang/severity.php");
-+            $fs->get_language_pack($lang, 'severity');
-             foreach($severity_list as $key => $val)
-             {
-                if ($key == '2')
-@@ -198,7 +198,7 @@
-             <select id="task_priority" name="task_priority" <?php if ($permissions['modify_all_tasks'] != "1") echo ' disabled="disabled"';?>>
-             <?php
-             // Get list of statuses
--            require("lang/$lang/priority.php");
-+            $fs->get_language_pack($lang, 'priority');
-             foreach($priority_list as $key => $val)
-             {
-                if ($key == '2')
diff --git a/devel/flyspray/files/patch-scripts-reports.php b/devel/flyspray/files/patch-scripts-reports.php
deleted file mode 100644
index 0264562fb49f..000000000000
--- a/devel/flyspray/files/patch-scripts-reports.php
+++ /dev/null
@@ -1,17 +0,0 @@
---- scripts/reports.php.orig	Mon Oct  3 12:51:02 2005
-+++ scripts/reports.php	Thu Oct 27 00:09:01 2005
-@@ -353,9 +353,12 @@
-         $date = 'from';
-         $fromdate = $_REQUEST['fromdate'];
-         $todate = $_REQUEST['todate'];
--
-+	if (!isset($fromdate) || $fromdate=="") { $fromdate = date("d-M-Y"); }
-+	if (!isset($todate) || $todate=="") { $todate = date("d-M-Y"); }
-+	
-         $ufromdate = strtotime($fromdate);
--        $utodate = strtotime($todate);
-+	// Add 24 hours to the end to make it include that date
-+        $utodate = strtotime($todate) + 86400;
- 
-         $wheredate = "AND h.event_date > {$ufromdate} AND h.event_date < {$utodate}";
-         break;
diff --git a/devel/flyspray/pkg-descr b/devel/flyspray/pkg-descr
index c195cbff9d7f..eacf2ba5554c 100644
--- a/devel/flyspray/pkg-descr
+++ b/devel/flyspray/pkg-descr
@@ -19,4 +19,4 @@ Features include:
     * File attachments
     * CSS themes
 
-WWW: http://flyspray.rocks.cc/
+WWW: http://www.flyspray.org/
diff --git a/devel/flyspray/pkg-plist b/devel/flyspray/pkg-plist
index 6eb2d44e2c98..10385c1c5066 100644
--- a/devel/flyspray/pkg-plist
+++ b/devel/flyspray/pkg-plist
@@ -1,181 +1,506 @@
-%%DATADIR%%/.htaccess
 %%DATADIR%%/adodb
 %%DATADIR%%/attachments
+%%DATADIR%%/cache/index.html
 %%DATADIR%%/docs/licences/gnu_lgpl.html
 %%DATADIR%%/favicon.ico
-%%DATADIR%%/flyspray.conf.php
-%%DATADIR%%/flyspray.conf.php-dist
+%%DATADIR%%/feed.php
 %%DATADIR%%/header.php
-%%DATADIR%%/includes/archive_tar.php
-%%DATADIR%%/includes/backend.inc.php
-%%DATADIR%%/includes/class.jabber.php
-%%DATADIR%%/includes/class.phpmailer.php
-%%DATADIR%%/includes/class.smtp.php
-%%DATADIR%%/includes/db.inc.php
-%%DATADIR%%/includes/functions.inc.php
-%%DATADIR%%/includes/functions.js
-%%DATADIR%%/includes/gzip_compress.php
-%%DATADIR%%/includes/ie_hover.js
-%%DATADIR%%/includes/jscalendar/calendar-blue.css
-%%DATADIR%%/includes/jscalendar/calendar-blue2.css
-%%DATADIR%%/includes/jscalendar/calendar-brown.css
-%%DATADIR%%/includes/jscalendar/calendar-green.css
-%%DATADIR%%/includes/jscalendar/calendar-setup.js
-%%DATADIR%%/includes/jscalendar/calendar-setup_stripped.js
-%%DATADIR%%/includes/jscalendar/calendar-system.css
-%%DATADIR%%/includes/jscalendar/calendar-tas.css
-%%DATADIR%%/includes/jscalendar/calendar-win2k-1.css
-%%DATADIR%%/includes/jscalendar/calendar-win2k-2.css
-%%DATADIR%%/includes/jscalendar/calendar-win2k-cold-1.css
-%%DATADIR%%/includes/jscalendar/calendar-win2k-cold-2.css
-%%DATADIR%%/includes/jscalendar/calendar.js
-%%DATADIR%%/includes/jscalendar/calendar.php
-%%DATADIR%%/includes/jscalendar/calendar_stripped.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-af.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-al.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-bg.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-big5-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-big5.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-br.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-ca.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-cs-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-cs-win.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-da.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-de.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-du.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-el.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-en.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-es.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-fi.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-fr.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-he-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-hr-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-hr.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-hu.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-it.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-jp.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-ko-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-ko.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-lt-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-lt.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-lv.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-nl.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-no.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-pl-utf8.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-pl.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-pt.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-ro.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-ru.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-ru_win_.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-si.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-sk.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-sp.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-sv.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-tr.js
-%%DATADIR%%/includes/jscalendar/lang/calendar-zh.js
-%%DATADIR%%/includes/jscalendar/lang/cn_utf8.js
-%%DATADIR%%/includes/jscalendar/menuarrow.gif
-%%DATADIR%%/includes/jscalendar/menuarrow2.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/active-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/dark-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/hover-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/menuarrow.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/normal-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/rowhover-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/status-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/theme.css
-%%DATADIR%%/includes/jscalendar/skins/aqua/title-bg.gif
-%%DATADIR%%/includes/jscalendar/skins/aqua/today-bg.gif
-%%DATADIR%%/includes/markdown.php
-%%DATADIR%%/includes/notify.inc.php
-%%DATADIR%%/includes/regexp.php
-%%DATADIR%%/includes/styleswitcher.js
-%%DATADIR%%/includes/tabs.js
-%%DATADIR%%/includes/template.php
-%%DATADIR%%/includes/version.php
-%%DATADIR%%/includes/xmlrpc.inc
-%%DATADIR%%/includes/xmlrpcs.inc
+%%DATADIR%%/htaccess.dist
+%%DATADIR%%/flyspray.conf.php
+%%DATADIR%%/includes/.htaccess
+%%DATADIR%%/includes/class.backend.php
+%%DATADIR%%/includes/class.database.php
+%%DATADIR%%/includes/class.flyspray.php
+%%DATADIR%%/includes/class.gpc.php
+%%DATADIR%%/includes/class.jabber2.php
+%%DATADIR%%/includes/class.notify.php
+%%DATADIR%%/includes/class.project.php
+%%DATADIR%%/includes/class.tpl.php
+%%DATADIR%%/includes/class.user.php
+%%DATADIR%%/includes/constants.inc.php
+%%DATADIR%%/includes/events.inc.php
+%%DATADIR%%/includes/external/Validate.php
+%%DATADIR%%/includes/external/swift-mailer/CREDITS
+%%DATADIR%%/includes/external/swift-mailer/LICENSE
+%%DATADIR%%/includes/external/swift-mailer/README
+%%DATADIR%%/includes/external/swift-mailer/Swift.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/CRAMMD5.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/LOGIN.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/PLAIN.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/POP3SMTP_.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator/README
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Multi.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/NativeMail.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Rotator.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/SMTP.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Connection/Sendmail.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/AntiFlood.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/ConnectionRotator.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Errors.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Example.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Plugin/Template.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Stream.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Stream/MailProxy.php
+%%DATADIR%%/includes/external/swift-mailer/Swift/Stream/Processor.php
+%%DATADIR%%/includes/external/swift-mailer/VERSION
+%%DATADIR%%/includes/fix.inc.php
+%%DATADIR%%/includes/i18n.inc.php
+%%DATADIR%%/includes/modify.inc.php
+%%DATADIR%%/includes/utf8.inc.php
 %%DATADIR%%/index.php
-%%DATADIR%%/lang/en/admin.php
-%%DATADIR%%/lang/en/authenticate.php
-%%DATADIR%%/lang/en/chpass.php
-%%DATADIR%%/lang/en/details.php
-%%DATADIR%%/lang/en/functions.inc.php
-%%DATADIR%%/lang/en/index.php
-%%DATADIR%%/lang/en/loginbox.php
-%%DATADIR%%/lang/en/main.php
-%%DATADIR%%/lang/en/modify.php
-%%DATADIR%%/lang/en/newgroup.php
-%%DATADIR%%/lang/en/newproject.php
-%%DATADIR%%/lang/en/newtask.php
-%%DATADIR%%/lang/en/newuser.php
-%%DATADIR%%/lang/en/notify.inc.php
-%%DATADIR%%/lang/en/pm.php
-%%DATADIR%%/lang/en/priority.php
-%%DATADIR%%/lang/en/register.php
-%%DATADIR%%/lang/en/reports.php
-%%DATADIR%%/lang/en/severity.php
-%%DATADIR%%/lang/en/status.php
-%%DATADIR%%/lang/langdiff.php
-%%DATADIR%%/remote-client.php
-%%DATADIR%%/remote.php
+%%DATADIR%%/javascript/callbacks/checkrelated.php
+%%DATADIR%%/javascript/callbacks/checksave.php
+%%DATADIR%%/javascript/callbacks/deletesearches.php
+%%DATADIR%%/javascript/callbacks/gethistory.php
+%%DATADIR%%/javascript/callbacks/getpreview.php
+%%DATADIR%%/javascript/callbacks/getsearches.php
+%%DATADIR%%/javascript/callbacks/savesearches.php
+%%DATADIR%%/javascript/callbacks/searchnames.php
+%%DATADIR%%/javascript/callbacks/useradd.php
+%%DATADIR%%/javascript/callbacks/usersearch.php
+%%DATADIR%%/javascript/details.js
+%%DATADIR%%/javascript/functions.js
+%%DATADIR%%/javascript/index.js
+%%DATADIR%%/javascript/jscalendar/calendar-blue.css
+%%DATADIR%%/javascript/jscalendar/calendar-blue2.css
+%%DATADIR%%/javascript/jscalendar/calendar-brown.css
+%%DATADIR%%/javascript/jscalendar/calendar-green.css
+%%DATADIR%%/javascript/jscalendar/calendar-setup.js
+%%DATADIR%%/javascript/jscalendar/calendar-setup_stripped.js
+%%DATADIR%%/javascript/jscalendar/calendar-system.css
+%%DATADIR%%/javascript/jscalendar/calendar-tas.css
+%%DATADIR%%/javascript/jscalendar/calendar-win2k-1.css
+%%DATADIR%%/javascript/jscalendar/calendar-win2k-2.css
+%%DATADIR%%/javascript/jscalendar/calendar-win2k-cold-1.css
+%%DATADIR%%/javascript/jscalendar/calendar-win2k-cold-2.css
+%%DATADIR%%/javascript/jscalendar/calendar.js
+%%DATADIR%%/javascript/jscalendar/calendar.php
+%%DATADIR%%/javascript/jscalendar/calendar_stripped.js
+%%DATADIR%%/javascript/jscalendar/img.gif
+%%DATADIR%%/javascript/jscalendar/lang/calendar-af.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-al.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-bg.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-big5-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-big5.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-br.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ca.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-cs-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-cs-win.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-da.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-de.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-du.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-el.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-en.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-es.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-fi.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-fr.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-he-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-hr-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-hr.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-hu.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-it.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ja.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-jp.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ko-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ko.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-lt-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-lt.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-lv.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-nl.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-no.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-pl-utf8.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-pl.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-pt.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ro.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ru.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-ru_win_.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-si.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-sk.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-sp.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-sv.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-tr.js
+%%DATADIR%%/javascript/jscalendar/lang/calendar-zh.js
+%%DATADIR%%/javascript/jscalendar/lang/cn_utf8.js
+%%DATADIR%%/javascript/jscalendar/menuarrow.gif
+%%DATADIR%%/javascript/jscalendar/menuarrow2.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/active-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/dark-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/hover-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/menuarrow.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/normal-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/rowhover-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/status-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/theme.css
+%%DATADIR%%/javascript/jscalendar/skins/aqua/title-bg.gif
+%%DATADIR%%/javascript/jscalendar/skins/aqua/today-bg.gif
+%%DATADIR%%/javascript/prototype/prototype.js
+%%DATADIR%%/javascript/script.aculo.us/builder.js
+%%DATADIR%%/javascript/script.aculo.us/controls.js
+%%DATADIR%%/javascript/script.aculo.us/dragdrop.js
+%%DATADIR%%/javascript/script.aculo.us/effects.js
+%%DATADIR%%/javascript/script.aculo.us/javascripttest.rb
+%%DATADIR%%/javascript/script.aculo.us/scriptaculous.js
+%%DATADIR%%/javascript/script.aculo.us/slider.js
+%%DATADIR%%/javascript/script.aculo.us/unittest.js
+%%DATADIR%%/javascript/tablecontrol.js
+%%DATADIR%%/javascript/tabs.js
+%%DATADIR%%/lang/.langdiff.php
+%%DATADIR%%/lang/.langedit.php
+%%DATADIR%%/lang/bg.php
+%%DATADIR%%/lang/de.php
+%%DATADIR%%/lang/en.php
+%%DATADIR%%/lang/es.php
+%%DATADIR%%/lang/fr.php
+%%DATADIR%%/lang/it.php
+%%DATADIR%%/lang/ja.php
+%%DATADIR%%/lang/nl.php
+%%DATADIR%%/lang/pl.php
+%%DATADIR%%/lang/pt_br.php
+%%DATADIR%%/lang/ru.php
+%%DATADIR%%/lang/zh_cn.php
+%%DATADIR%%/plugins/.htaccess
+%%DATADIR%%/plugins/dokuwiki/conf/.htaccess
+%%DATADIR%%/plugins/dokuwiki/conf/acronyms.conf
+%%DATADIR%%/plugins/dokuwiki/conf/dokuwiki.php
+%%DATADIR%%/plugins/dokuwiki/conf/entities.conf
+%%DATADIR%%/plugins/dokuwiki/conf/interwiki.conf
+%%DATADIR%%/plugins/dokuwiki/conf/mime.conf
+%%DATADIR%%/plugins/dokuwiki/conf/smileys.conf
+%%DATADIR%%/plugins/dokuwiki/dokuwiki_constants.inc.php
+%%DATADIR%%/plugins/dokuwiki/dokuwiki_formattext.inc.php
+%%DATADIR%%/plugins/dokuwiki/img/divider.gif
+%%DATADIR%%/plugins/dokuwiki/img/email.png
+%%DATADIR%%/plugins/dokuwiki/img/format-text-bold.png
+%%DATADIR%%/plugins/dokuwiki/img/format-text-italic.png
+%%DATADIR%%/plugins/dokuwiki/img/format-text-strikethrough.png
+%%DATADIR%%/plugins/dokuwiki/img/format-text-underline.png
+%%DATADIR%%/plugins/dokuwiki/img/h1.gif
+%%DATADIR%%/plugins/dokuwiki/img/h2.gif
+%%DATADIR%%/plugins/dokuwiki/img/h3.gif
+%%DATADIR%%/plugins/dokuwiki/img/hr.gif
+%%DATADIR%%/plugins/dokuwiki/img/image-x-generic.png
+%%DATADIR%%/plugins/dokuwiki/img/img.gif
+%%DATADIR%%/plugins/dokuwiki/img/network.png
+%%DATADIR%%/plugins/dokuwiki/img/ol.gif
+%%DATADIR%%/plugins/dokuwiki/img/source.png
+%%DATADIR%%/plugins/dokuwiki/img/source_php.png
+%%DATADIR%%/plugins/dokuwiki/img/text-html.png
+%%DATADIR%%/plugins/dokuwiki/img/ul.gif
+%%DATADIR%%/plugins/dokuwiki/inc/HTTPClient.php
+%%DATADIR%%/plugins/dokuwiki/inc/JpegMeta.php
+%%DATADIR%%/plugins/dokuwiki/inc/cache.php
+%%DATADIR%%/plugins/dokuwiki/inc/common.php
+%%DATADIR%%/plugins/dokuwiki/inc/confutils.php
+%%DATADIR%%/plugins/dokuwiki/inc/events.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/actionscript-french.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/actionscript.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/ada.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/apache.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/applescript.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/asm.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/asp.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/autoit.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/bash.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/c.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/c_mac.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/caddcl.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/cadlisp.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/cpp.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/csharp.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/css.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/d.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/delphi.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/diff.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/div.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/dos.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/eiffel.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/freebasic.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/gml.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/html4strict.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/ini.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/inno.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/java.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/javascript.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/lisp.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/lua.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/matlab.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/mpasm.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/nsis.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/objc.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/ocaml-brief.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/ocaml.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/oobas.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/oracle8.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/pascal.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/perl.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/php-brief.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/php.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/python.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/qbasic.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/ruby.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/scheme.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/sdlbasic.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/smarty.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/sql.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/vb.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/vbnet.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/vhdl.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/visualfoxpro.php
+%%DATADIR%%/plugins/dokuwiki/inc/geshi/xml.php
+%%DATADIR%%/plugins/dokuwiki/inc/html.php
+%%DATADIR%%/plugins/dokuwiki/inc/infoutils.php
+%%DATADIR%%/plugins/dokuwiki/inc/init.php
+%%DATADIR%%/plugins/dokuwiki/inc/io.php
+%%DATADIR%%/plugins/dokuwiki/inc/pageutils.php
+%%DATADIR%%/plugins/dokuwiki/inc/parser/handler.php
+%%DATADIR%%/plugins/dokuwiki/inc/parser/lexer.php
+%%DATADIR%%/plugins/dokuwiki/inc/parser/parser.php
+%%DATADIR%%/plugins/dokuwiki/inc/parser/renderer.php
+%%DATADIR%%/plugins/dokuwiki/inc/parser/xhtml.php
+%%DATADIR%%/plugins/dokuwiki/inc/parserutils.php
+%%DATADIR%%/plugins/dokuwiki/inc/pluginutils.php
+%%DATADIR%%/plugins/dokuwiki/inc/utf8.php
+%%DATADIR%%/plugins/dokuwiki/lib/exe/fetch.php
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/bz2.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/conf.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/deb.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/doc.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/file.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/file.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/gif.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/gz.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/htm.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/html.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/index.php
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/jpeg.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/jpg.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/odc.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/odf.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/odg.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/odi.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/odp.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/ods.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/odt.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/pdf.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/png.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/ppt.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/ps.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/rpm.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/rtf.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/swf.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/sxc.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/sxd.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/sxi.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/sxw.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/tar.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/tgz.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/txt.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/xls.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/xml.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/fileicons/zip.png
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/amazon.de.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/amazon.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/amazon.uk.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/bug.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/coral.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/doku.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/google.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/meatball.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/phpfn.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/sb.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/wiki.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/wp.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/wpde.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/interwiki/wpmeta.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/delete.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/fixme.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_arrow.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_biggrin.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_confused.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_cool.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_cry.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_doubt.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_doubt2.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_eek.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_evil.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_exclaim.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_frown.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_fun.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_idea.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_kaddi.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_lol.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_mrgreen.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_neutral.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_question.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_razz.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_redface.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_rolleyes.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_sad.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_silenced.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_smile.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_smile2.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_surprised.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_twisted.gif
+%%DATADIR%%/plugins/dokuwiki/lib/images/smileys/icon_wink.gif
+%%DATADIR%%/plugins/dokuwiki/lib/plugins/changelinks/syntax.php
+%%DATADIR%%/plugins/dokuwiki/lib/plugins/fslink/syntax.php
+%%DATADIR%%/plugins/dokuwiki/lib/plugins/syntax.php
+%%DATADIR%%/robots.txt
+%%DATADIR%%/schedule.php
 %%DATADIR%%/scripts/admin.php
 %%DATADIR%%/scripts/authenticate.php
-%%DATADIR%%/scripts/chproject.php
-%%DATADIR%%/scripts/daemon.php
 %%DATADIR%%/scripts/depends.php
 %%DATADIR%%/scripts/details.php
 %%DATADIR%%/scripts/editcomment.php
-%%DATADIR%%/scripts/error.php
 %%DATADIR%%/scripts/index.php
-%%DATADIR%%/scripts/loginbox.php
 %%DATADIR%%/scripts/lostpw.php
-%%DATADIR%%/scripts/modify.php
 %%DATADIR%%/scripts/myprofile.php
-%%DATADIR%%/scripts/newgroup.php
 %%DATADIR%%/scripts/newtask.php
-%%DATADIR%%/scripts/newuser.php
 %%DATADIR%%/scripts/pm.php
 %%DATADIR%%/scripts/register.php
 %%DATADIR%%/scripts/reports.php
-%%DATADIR%%/scripts/rss.php
-%%DATADIR%%/scripts/rss2.php
-%%DATADIR%%/scripts/schedule.php
+%%DATADIR%%/scripts/roadmap.php
+%%DATADIR%%/scripts/toplevel.php
+%%DATADIR%%/scripts/user.php
+%%DATADIR%%/setup/array_combine.php
+%%DATADIR%%/setup/exportdb.php
 %%DATADIR%%/setup/images/exclamation.png
 %%DATADIR%%/setup/images/title.png
 %%DATADIR%%/setup/index.php
 %%DATADIR%%/setup/styles/setup.css
 %%DATADIR%%/setup/styles/theme.css
-%%DATADIR%%/setup/templates/administration.tpl.php
-%%DATADIR%%/setup/templates/complete_install.tpl.php
-%%DATADIR%%/setup/templates/database.tpl.php
-%%DATADIR%%/setup/templates/license.tpl.php
-%%DATADIR%%/setup/templates/pre_install.tpl.php
-%%DATADIR%%/setup/templates/structure.tpl.php
-%%DATADIR%%/sql/flyspray-0.9.8.mysql
-%%DATADIR%%/sql/flyspray-0.9.8.pgsql
-%%DATADIR%%/sql/flyspray.conf.skel
-%%DATADIR%%/sql/upgrade_0.9.7_to_0.9.8.mysql
-%%DATADIR%%/sql/upgrade_0.9.7_to_0.9.8.pgsql
+%%DATADIR%%/setup/templates/administration.tpl
+%%DATADIR%%/setup/templates/complete_install.tpl
+%%DATADIR%%/setup/templates/database.tpl
+%%DATADIR%%/setup/templates/license.tpl
+%%DATADIR%%/setup/templates/pre_install.tpl
+%%DATADIR%%/setup/templates/structure.tpl
+%%DATADIR%%/setup/templates/upgrade.tpl
+%%DATADIR%%/setup/upgrade.php
+%%DATADIR%%/setup/upgrade/0.9.9/add_data.php
+%%DATADIR%%/setup/upgrade/0.9.9/add_duplicates.php
+%%DATADIR%%/setup/upgrade/0.9.9/add_searches.php
+%%DATADIR%%/setup/upgrade/0.9.9/clean_unique.php
+%%DATADIR%%/setup/upgrade/0.9.9/convert_categories.php
+%%DATADIR%%/setup/upgrade/0.9.9/convert_private.php
+%%DATADIR%%/setup/upgrade/0.9.9/flyspray-begin.xml
+%%DATADIR%%/setup/upgrade/0.9.9/flyspray-final.xml
+%%DATADIR%%/setup/upgrade/0.9.9/flyspray-install.xml
+%%DATADIR%%/setup/upgrade/0.9.9/flyspray.conf.php
+%%DATADIR%%/setup/upgrade/0.9.9/rename_columns.php
+%%DATADIR%%/setup/upgrade/0.9.9/upgrade.info
+%%DATADIR%%/setup/upgrade/0.9.9/upgrade_assignments.php
+%%DATADIR%%/templates/.htaccess
+%%DATADIR%%/templates/admin.cat.tpl
+%%DATADIR%%/templates/admin.editgroup.tpl
+%%DATADIR%%/templates/admin.groups.tpl
+%%DATADIR%%/templates/admin.menu.tpl
+%%DATADIR%%/templates/admin.newgroup.tpl
+%%DATADIR%%/templates/admin.newproject.tpl
+%%DATADIR%%/templates/admin.newuser.tpl
+%%DATADIR%%/templates/admin.os.tpl
+%%DATADIR%%/templates/admin.prefs.tpl
+%%DATADIR%%/templates/admin.resolution.tpl
+%%DATADIR%%/templates/admin.status.tpl
+%%DATADIR%%/templates/admin.tasktype.tpl
+%%DATADIR%%/templates/admin.users.tpl
+%%DATADIR%%/templates/admin.version.tpl
+%%DATADIR%%/templates/common.attachments.tpl
+%%DATADIR%%/templates/common.cat.tpl
+%%DATADIR%%/templates/common.datepicker.tpl
+%%DATADIR%%/templates/common.dualselect.tpl
+%%DATADIR%%/templates/common.editattachments.tpl
+%%DATADIR%%/templates/common.editgroup.tpl
+%%DATADIR%%/templates/common.list.tpl
+%%DATADIR%%/templates/common.multiuserselect.tpl
+%%DATADIR%%/templates/common.newgroup.tpl
+%%DATADIR%%/templates/common.newuser.tpl
+%%DATADIR%%/templates/common.profile.tpl
+%%DATADIR%%/templates/common.userselect.tpl
+%%DATADIR%%/templates/depends.tpl
+%%DATADIR%%/templates/details.edit.tpl
+%%DATADIR%%/templates/details.tabs.comment.tpl
+%%DATADIR%%/templates/details.tabs.history.callback.tpl
+%%DATADIR%%/templates/details.tabs.history.tpl
+%%DATADIR%%/templates/details.tabs.notifs.tpl
+%%DATADIR%%/templates/details.tabs.related.tpl
+%%DATADIR%%/templates/details.tabs.remind.tpl
+%%DATADIR%%/templates/details.tabs.tpl
+%%DATADIR%%/templates/details.view.tpl
+%%DATADIR%%/templates/editcomment.tpl
+%%DATADIR%%/templates/feed.atom.tpl
+%%DATADIR%%/templates/feed.rss1.tpl
+%%DATADIR%%/templates/feed.rss2.tpl
+%%DATADIR%%/templates/footer.tpl
+%%DATADIR%%/templates/header.tpl
+%%DATADIR%%/templates/index.tpl
+%%DATADIR%%/templates/links.searches.tpl
+%%DATADIR%%/templates/links.tpl
+%%DATADIR%%/templates/loginbox.tpl
+%%DATADIR%%/templates/lostpw.step1.tpl
+%%DATADIR%%/templates/lostpw.step2.tpl
+%%DATADIR%%/templates/myprofile.tpl
+%%DATADIR%%/templates/newtask.tpl
+%%DATADIR%%/templates/pm.cat.tpl
+%%DATADIR%%/templates/pm.editgroup.tpl
+%%DATADIR%%/templates/pm.groups.tpl
+%%DATADIR%%/templates/pm.menu.tpl
+%%DATADIR%%/templates/pm.newgroup.tpl
+%%DATADIR%%/templates/pm.os.tpl
+%%DATADIR%%/templates/pm.pendingreq.tpl
+%%DATADIR%%/templates/pm.prefs.tpl
+%%DATADIR%%/templates/pm.resolution.tpl
+%%DATADIR%%/templates/pm.status.tpl
+%%DATADIR%%/templates/pm.tasktype.tpl
+%%DATADIR%%/templates/pm.version.tpl
+%%DATADIR%%/templates/profile.tpl
+%%DATADIR%%/templates/register.magic.tpl
+%%DATADIR%%/templates/register.no-magic.tpl
+%%DATADIR%%/templates/register.ok.tpl
+%%DATADIR%%/templates/reports.tpl
+%%DATADIR%%/templates/roadmap.text.tpl
+%%DATADIR%%/templates/roadmap.tpl
+%%DATADIR%%/templates/toplevel.tpl
+%%DATADIR%%/themes/Bluey/active_border.png
+%%DATADIR%%/themes/Bluey/ajax_load.gif
 %%DATADIR%%/themes/Bluey/asc.png
+%%DATADIR%%/themes/Bluey/attachment-big.png
 %%DATADIR%%/themes/Bluey/attachment.png
 %%DATADIR%%/themes/Bluey/button-over.png
 %%DATADIR%%/themes/Bluey/button.png
-%%DATADIR%%/themes/Bluey/calendar.png
+%%DATADIR%%/themes/Bluey/button_cancel.png
+%%DATADIR%%/themes/Bluey/button_ok.png
+%%DATADIR%%/themes/Bluey/caret.gif
 %%DATADIR%%/themes/Bluey/comment.png
 %%DATADIR%%/themes/Bluey/desc.png
+%%DATADIR%%/themes/Bluey/down.png
+%%DATADIR%%/themes/Bluey/dropdown.png
+%%DATADIR%%/themes/Bluey/edit_add.png
+%%DATADIR%%/themes/Bluey/edit_remove.png
+%%DATADIR%%/themes/Bluey/em.png
+%%DATADIR%%/themes/Bluey/favicon.ico
 %%DATADIR%%/themes/Bluey/frown.png
+%%DATADIR%%/themes/Bluey/ie.css
 %%DATADIR%%/themes/Bluey/index.html
-%%DATADIR%%/themes/Bluey/menu/comment.png
+%%DATADIR%%/themes/Bluey/kaboodleloop.png
+%%DATADIR%%/themes/Bluey/kgpg_edit.png
+%%DATADIR%%/themes/Bluey/klipper_dock.png
+%%DATADIR%%/themes/Bluey/kuser.png
+%%DATADIR%%/themes/Bluey/left.png
+%%DATADIR%%/themes/Bluey/link_icon.gif
+%%DATADIR%%/themes/Bluey/menu/date.png
 %%DATADIR%%/themes/Bluey/menu/editmydetails.png
-%%DATADIR%%/themes/Bluey/menu/lists.png
+%%DATADIR%%/themes/Bluey/menu/folder_home.png
+%%DATADIR%%/themes/Bluey/menu/help.png
+%%DATADIR%%/themes/Bluey/menu/kdmconfig.png
+%%DATADIR%%/themes/Bluey/menu/kmenuedit.png
 %%DATADIR%%/themes/Bluey/menu/logout.png
 %%DATADIR%%/themes/Bluey/menu/newtask.png
 %%DATADIR%%/themes/Bluey/menu/options.png
 %%DATADIR%%/themes/Bluey/menu/projectprefs.png
 %%DATADIR%%/themes/Bluey/menu/reports.png
 %%DATADIR%%/themes/Bluey/menu/search.png
-%%DATADIR%%/themes/Bluey/menu/usersandgroups.png
 %%DATADIR%%/themes/Bluey/mime/application.png
 %%DATADIR%%/themes/Bluey/mime/application/octet-stream.png
 %%DATADIR%%/themes/Bluey/mime/application/pdf.png
@@ -197,12 +522,15 @@
 %%DATADIR%%/themes/Bluey/percent-70.png
 %%DATADIR%%/themes/Bluey/percent-80.png
 %%DATADIR%%/themes/Bluey/percent-90.png
+%%DATADIR%%/themes/Bluey/personal.png
 %%DATADIR%%/themes/Bluey/prev.png
+%%DATADIR%%/themes/Bluey/right.png
 %%DATADIR%%/themes/Bluey/smile.png
-%%DATADIR%%/themes/Bluey/tab-active.png
-%%DATADIR%%/themes/Bluey/tab-notactive.png
 %%DATADIR%%/themes/Bluey/theme.css
+%%DATADIR%%/themes/Bluey/theme_print.css
 %%DATADIR%%/themes/Bluey/title.png
+%%DATADIR%%/themes/Bluey/up.png
+%%DATADIR%%/themes/Bluey/x-office-calendar.png
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
@@ -213,32 +541,62 @@
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING.txt
 %%PORTDOCS%%%%DOCSDIR%%/ADOdb.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/Flyspray.licence.txt
-%%PORTDOCS%%%%DOCSDIR%%/class.jabber.php.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/NuvolaIcons.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/jsCalendar.licence.txt
-%%PORTDOCS%%%%DOCSDIR%%/phpMarkdown.licence.txt
-%%PORTDOCS%%%%DOCSDIR%%/phpmailer.licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/cache/dokuwiki
+@dirrm %%DATADIR%%/cache
 @dirrm %%DATADIR%%/docs/licences
 @dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/includes/jscalendar/lang
-@dirrm %%DATADIR%%/includes/jscalendar/skins/aqua
-@dirrm %%DATADIR%%/includes/jscalendar/skins
-@dirrm %%DATADIR%%/includes/jscalendar
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Authenticator
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Connection
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Plugin
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift/Stream
+@dirrm %%DATADIR%%/includes/external/swift-mailer/Swift
+@dirrm %%DATADIR%%/includes/external/swift-mailer
+@dirrm %%DATADIR%%/includes/external
 @dirrm %%DATADIR%%/includes
-@dirrm %%DATADIR%%/lang/en
+@dirrm %%DATADIR%%/javascript/callbacks
+@dirrm %%DATADIR%%/javascript/jscalendar/lang
+@dirrm %%DATADIR%%/javascript/jscalendar/skins/aqua
+@dirrm %%DATADIR%%/javascript/jscalendar/skins
+@dirrm %%DATADIR%%/javascript/jscalendar
+@dirrm %%DATADIR%%/javascript/prototype
+@dirrm %%DATADIR%%/javascript/script.aculo.us
+@dirrm %%DATADIR%%/javascript
 @dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/plugins/dokuwiki/conf
+@dirrm %%DATADIR%%/plugins/dokuwiki/img
+@dirrm %%DATADIR%%/plugins/dokuwiki/inc/geshi
+@dirrm %%DATADIR%%/plugins/dokuwiki/inc/parser
+@dirrm %%DATADIR%%/plugins/dokuwiki/inc
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/exe
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/images/fileicons
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/images/interwiki
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/images/smileys
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/images
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins/changelinks
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins/fslink
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib/plugins
+@dirrm %%DATADIR%%/plugins/dokuwiki/lib
+@dirrm %%DATADIR%%/plugins/dokuwiki
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/setup/styles
 @dirrm %%DATADIR%%/setup/images
+@dirrm %%DATADIR%%/setup/styles
 @dirrm %%DATADIR%%/setup/templates
+@dirrm %%DATADIR%%/setup/upgrade/0.9.9
+@dirrm %%DATADIR%%/setup/upgrade
 @dirrm %%DATADIR%%/setup
-@dirrm %%DATADIR%%/sql
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/themes/Bluey/menu
 @dirrm %%DATADIR%%/themes/Bluey/mime/application
+@dirrm %%DATADIR%%/themes/Bluey/mime/audio
+@dirrm %%DATADIR%%/themes/Bluey/mime/image
 @dirrm %%DATADIR%%/themes/Bluey/mime/text
+@dirrm %%DATADIR%%/themes/Bluey/mime/video
 @dirrm %%DATADIR%%/themes/Bluey/mime
-@dirrm %%DATADIR%%/themes/Bluey/menu
 @dirrm %%DATADIR%%/themes/Bluey
 @dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%
+@dirrm %%DATADIR%%/