- Update repo-copied (from www/rt34) port www/rt36 to 3.6.0.

PR:		99660
Submitted by:	Vivek Khera <vivek@khera.org> (maintainer)

7 files changed, 189 insertions, 151 deletions

diff --git a/www/Makefile b/www/Makefile
index 60f8c90a35e9..c551879ae8b3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -885,6 +885,7 @@
     SUBDIR += rt3-elixus
     SUBDIR += rt32
     SUBDIR += rt34
+    SUBDIR += rt36
     SUBDIR += ruboard
     SUBDIR += ruby-amazon
     SUBDIR += ruby-asp
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index 9b4cc37a1029..fe4211d6bfa2 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rt
-PORTVERSION?=	3.4.5
+PORTVERSION?=	3.6.0
 CATEGORIES=	www
 MASTER_SITES?=	http://download.bestpractical.com/pub/rt/release/ \
 		http://download.bestpractical.com/pub/rt/devel/ \
@@ -43,6 +43,7 @@ BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
 		${SITE_PERL}/Test/WWW/Mechanize.pm:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
+		${SITE_PERL}/Test/Expect.pm:${PORTSDIR}/devel/p5-Test-Expect \
 		${SITE_PERL}/Text/Autoformat.pm:${PORTSDIR}/textproc/p5-Text-Autoformat \
 		${SITE_PERL}/Text/Quoted.pm:${PORTSDIR}/textproc/p5-Text-Quoted \
 		${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
@@ -52,14 +53,19 @@ BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \
 		${SITE_PERL}/Tree/Simple.pm:${PORTSDIR}/devel/p5-Tree-Simple \
 		${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize \
-		${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS
+		${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \
+	        ${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
+	        ${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \
+	        ${SITE_PERL}/GD/Text.pm:${PORTSDIR}/graphics/p5-GD-TextUtil \
+	        ${SITE_PERL}/Calendar/Simple.pm:${PORTSDIR}/devel/p5-Calendar-Simple
+
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-LATEST_LINK=	rt34
+LATEST_LINK=	rt36
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	Executes scripts in post-install phase
-APACHE_COMPAT=	yes
+USE_APACHE=	1.3+
 
 CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 		--enable-layout=${LAYOUT} \
@@ -76,7 +82,7 @@ CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
-BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
@@ -85,7 +91,7 @@ DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .if defined(WITH_APACHE2)
-BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
@@ -94,9 +100,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 .endif
 .endif
-.if defined(MULTIPLE_INSTANCES)
-EXTRA_PATCHES+=	${FILESDIR}/multiple*
-.endif
 
 DB_TYPE?=	mysql
 
@@ -137,6 +140,10 @@ UPGRADES=	3.1.0 3.1.15 3.1.17
 .if defined(UPGRADE_RT30) || defined(UPGRADE_RT32)
 UPGRADES+=	3.3.0 3.3.11
 .endif
+.if defined(UPGRADE_RT34)
+UPGRADES+=	3.5.1
+.endif
+
 
 .include <bsd.port.pre.mk>
 
@@ -150,6 +157,7 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "      UPGRADE_RT30                    Upgrading from a RT 3.0 installation"
 	@${ECHO} "      UPGRADE_RT32                    Upgrading from a RT 3.2 installation"
+	@${ECHO} "      UPGRADE_RT34                    Upgrading from a RT 3.4 installation"
 	@${ECHO} "      INITIAL_INSTALL                 Do initialize DB (for initial install only)"
 	@${ECHO} "      WITH_FASTCGI                    Use FastCGI instead of mod_perl"
 	@${ECHO} "      WITH_APACHE2                    Use Apache2 as the web server"
@@ -197,6 +205,9 @@ post-install:
 	@${ECHO} "If you are upgrading from RT 3.2, please enter this now:"
 	@${ECHO} "    make post-install -DUPGRADE_RT32"
 	@${ECHO} ""
+	@${ECHO} "If you are upgrading from RT 3.4, please enter this now:"
+	@${ECHO} "    make post-install -DUPGRADE_RT34"
+	@${ECHO} ""
 	@${ECHO} "If you are initializing a new installation, please do this:"
 	@${ECHO} "    make post-install -DINITIAL_INSTALL"
 	@${ECHO} ""
diff --git a/www/rt36/distinfo b/www/rt36/distinfo
index 271a282807f6..49199e2f8002 100644
--- a/www/rt36/distinfo
+++ b/www/rt36/distinfo
@@ -1,6 +1,6 @@
-MD5 (rt-3.4.5.tar.gz) = 16c8007cba54669e6c9de95cfc680b2a
-SHA256 (rt-3.4.5.tar.gz) = 20eb89af3245b7021e53cdefd0ed0716443c3a4f9e8536e0c2c29b901942e917
-SIZE (rt-3.4.5.tar.gz) = 1410154
-MD5 (rt-3.4.5.tar.gz.sig) = 89f94d757c3c5e1da44c8469accd8278
-SHA256 (rt-3.4.5.tar.gz.sig) = 699aca96072ee082904ad94f518c1120749c1a745d5aa7ea6cf7a8d6b0f8f934
-SIZE (rt-3.4.5.tar.gz.sig) = 65
+MD5 (rt-3.6.0.tar.gz) = b363dab7fa5e1af10d150783c02e3935
+SHA256 (rt-3.6.0.tar.gz) = 22c8e0596f863b7ad016824afbc1090d28a3eb4e24a1a07be222fb67f510ca8b
+SIZE (rt-3.6.0.tar.gz) = 1525865
+MD5 (rt-3.6.0.tar.gz.sig) = d927f2346a90f9e77f99d9daf98bea58
+SHA256 (rt-3.6.0.tar.gz.sig) = f4bf4ac026da9c125c543c26642ebc622205378ac1d5bc1023e801b5a58c0525
+SIZE (rt-3.6.0.tar.gz.sig) = 65
diff --git a/www/rt36/files/multiple-bin-webmux_pl_in b/www/rt36/files/multiple-bin-webmux_pl_in
deleted file mode 100644
index 452c8f6d8c6f..000000000000
--- a/www/rt36/files/multiple-bin-webmux_pl_in
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: bin/webmux.pl.in
---- rt-3.4.2-pristine/bin/webmux.pl.in  2005-05-11 20:36:48.064856616 -0400
-+++ rt-3.4.2/bin/webmux.pl.in   2005-05-11 20:39:43.540180312 -0400
-@@ -64,6 +64,12 @@
- }
-
- use lib ( "@LOCAL_LIB_PATH@", "@RT_LIB_PATH@" );
-+if ($ENV{RT_INSTANCE_PATH}) {
-+    lib->import("$ENV{RT_INSTANCE_PATH}/local/lib");
-+}
-+if ($ENV{RT_VENDOR_PATH}) {
-+    lib->import($ENV{RT_VENDOR_PATH});
-+}
- use RT;
-
- package RT::Mason;
diff --git a/www/rt36/files/multiple-lib-RT_pm_in b/www/rt36/files/multiple-lib-RT_pm_in
deleted file mode 100644
index dbabff75b1f4..000000000000
--- a/www/rt36/files/multiple-lib-RT_pm_in
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: lib/RT.pm.in
---- rt-3.4.2-pristine/lib/RT.pm.in      2005-05-11 20:36:48.098851448 -0400
-+++ rt-3.4.2/lib/RT.pm.in       2005-05-11 20:41:52.026647400 -0400
-@@ -98,6 +98,60 @@
- # via the web interface)
- $MasonSessionDir = '@MASON_SESSION_PATH@';
-
-+=item import
-+
-+Allow override of various internal paths.
-+
-+    RT->import (
-+            RT_INSTANCE_PATH => '/usr/local/rt/stuff',
-+            SITE_CONFIG_FILE => '/etc/stuff.pm',
-+              ...
-+    );
-+
-+If RT_INSTANCE_PATH is set in the arguments (or in %ENV)
-+then it replaces the old value of $BasePath in the following
-+variables:
-+  $SITE_CONFIG_FILE
-+  $LocalPath
-+  $LocalEtcPath
-+  $LocalLexiconPath
-+  $MasonLocalComponentRoot
-+  $MasonDataDir
-+  $MasonSessionDir
-+
-+Beyond that, those individual values can be set explicitly
-+by arguments.
-+
-+=cut
-+
-+sub import {
-+no strict 'refs';
-+    shift;
-+    my %args = @_;
-+    return unless ( scalar (keys %args) || $ENV{RT_INSTANCE_PATH} );
-+
-+    my @variables = qw (
-+        SITE_CONFIG_FILE
-+        LocalPath
-+        LocalEtcPath
-+        LocalLexiconPath
-+        MasonLocalComponentRoot
-+        MasonDataDir
-+        MasonSessionDir
-+    );
-+
-+    my $RT_INSTANCE_PATH = $args{RT_INSTANCE_PATH} || $ENV{RT_INSTANCE_PATH};
-+    if ($RT_INSTANCE_PATH) {
-+        foreach my $vref (@variables) {
-+            $$vref =~ s/^\Q$BasePath\E/$RT_INSTANCE_PATH/;
-+        }
-+    }
-+    foreach my $vref (@variables) {
-+        $$vref = $args{$vref} if defined ( $args{$vref} );
-+    }
-+
-+use strict 'refs';
-+}
-
diff --git a/www/rt36/files/multiple-sbin-rt-setup-database_in b/www/rt36/files/multiple-sbin-rt-setup-database_in
deleted file mode 100644
index 069500761b77..000000000000
--- a/www/rt36/files/multiple-sbin-rt-setup-database_in
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: sbin/rt-setup-database.in
---- rt-3.4.2-pristine/sbin/rt-setup-database.in 2005-05-11 20:36:48.128846888 -0400
-+++ rt-3.4.2/sbin/rt-setup-database.in  2005-05-11 20:45:35.800628584 -0400
-@@ -50,11 +50,17 @@
-   qw(@Groups @Users @ACL @Queues @ScripActions @ScripConditions @Templates @CustomFields @Scrips);
-
- use lib "@RT_LIB_PATH@";
-+## RT_INSTANCE_PATH can be passed on command line.
-+## Can change where RT_SiteConfig is read from.
-+my $RT_INSTANCE_PATH;
-+BEGIN {
-+    $RT_INSTANCE_PATH = shift || $ENV{RT_INSTANCE_PATH};
-+}
-
- #This drags in  RT's config.pm
- # We do it in a begin block because RT::Handle needs to know the type to do its
- # inheritance
--use RT;
-+use RT (RT_INSTANCE_PATH => $RT_INSTANCE_PATH);
- use Carp;
- use RT::User;
- use RT::CurrentUser;
diff --git a/www/rt36/pkg-plist b/www/rt36/pkg-plist
index 895f04d9695d..5aaf8bdf7783 100644
--- a/www/rt36/pkg-plist
+++ b/www/rt36/pkg-plist
@@ -115,21 +115,23 @@
 %%RTPLIST%%/lib/RT/Interface/REST.pm
 %%RTPLIST%%/lib/RT/Interface/Web.pm
 %%RTPLIST%%/lib/RT/Interface/Web/Handler.pm
-%%RTPLIST%%/lib/RT/Interface/Web/Standalone.pm
+%%RTPLIST%%/lib/RT/Interface/Web/Menu.pm
+%%RTPLIST%%/lib/RT/Interface/Web/Menu/Item.pm
 %%RTPLIST%%/lib/RT/Interface/Web/QueryBuilder.pm
 %%RTPLIST%%/lib/RT/Interface/Web/QueryBuilder/Tree.pm
+%%RTPLIST%%/lib/RT/Interface/Web/Standalone.pm
 %%RTPLIST%%/lib/RT/Link.pm
 %%RTPLIST%%/lib/RT/Link_Overlay.pm
 %%RTPLIST%%/lib/RT/Links.pm
 %%RTPLIST%%/lib/RT/Links_Overlay.pm
-%%RTPLIST%%/lib/RT/ObjectCustomFields.pm
-%%RTPLIST%%/lib/RT/ObjectCustomFields_Overlay.pm
 %%RTPLIST%%/lib/RT/ObjectCustomField.pm
-%%RTPLIST%%/lib/RT/ObjectCustomFieldValues.pm
 %%RTPLIST%%/lib/RT/ObjectCustomFieldValue.pm
-%%RTPLIST%%/lib/RT/ObjectCustomField_Overlay.pm
-%%RTPLIST%%/lib/RT/ObjectCustomFieldValues_Overlay.pm
 %%RTPLIST%%/lib/RT/ObjectCustomFieldValue_Overlay.pm
+%%RTPLIST%%/lib/RT/ObjectCustomFieldValues.pm
+%%RTPLIST%%/lib/RT/ObjectCustomFieldValues_Overlay.pm
+%%RTPLIST%%/lib/RT/ObjectCustomField_Overlay.pm
+%%RTPLIST%%/lib/RT/ObjectCustomFields.pm
+%%RTPLIST%%/lib/RT/ObjectCustomFields_Overlay.pm
 %%RTPLIST%%/lib/RT/Principal.pm
 %%RTPLIST%%/lib/RT/Principal_Overlay.pm
 %%RTPLIST%%/lib/RT/Principals.pm
@@ -139,6 +141,9 @@
 %%RTPLIST%%/lib/RT/Queues.pm
 %%RTPLIST%%/lib/RT/Queues_Overlay.pm
 %%RTPLIST%%/lib/RT/Record.pm
+%%RTPLIST%%/lib/RT/Reminders.pm
+%%RTPLIST%%/lib/RT/Report/Tickets.pm
+%%RTPLIST%%/lib/RT/Report/Tickets/Entry.pm
 %%RTPLIST%%/lib/RT/SavedSearch.pm
 %%RTPLIST%%/lib/RT/SavedSearches.pm
 %%RTPLIST%%/lib/RT/Scrip.pm
@@ -156,6 +161,7 @@
 %%RTPLIST%%/lib/RT/Search/ActiveTicketsInQueue.pm
 %%RTPLIST%%/lib/RT/Search/FromSQL.pm
 %%RTPLIST%%/lib/RT/Search/Generic.pm
+%%RTPLIST%%/lib/RT/Search/Googleish.pm
 %%RTPLIST%%/lib/RT/SearchBuilder.pm
 %%RTPLIST%%/lib/RT/StyleGuide.pod
 %%RTPLIST%%/lib/RT/System.pm
@@ -181,6 +187,7 @@
 %%RTPLIST%%/lib/RT/Users.pm
 %%RTPLIST%%/lib/RT/Users_Overlay.pm
 %%RTPLIST%%/lib/t/00smoke.t
+%%RTPLIST%%/lib/t/create_data.pl
 %%RTPLIST%%/lib/t/data/8859-15-message-series/dir
 %%RTPLIST%%/lib/t/data/8859-15-message-series/msg1
 %%RTPLIST%%/lib/t/data/8859-15-message-series/msg2
@@ -217,22 +224,37 @@
 %%RTPLIST%%/lib/t/regression/13-attribute-tests.t
 %%RTPLIST%%/lib/t/regression/14linking.t
 %%RTPLIST%%/lib/t/regression/14merge.t
+%%RTPLIST%%/lib/t/regression/15cf_combo_cascade.t
+%%RTPLIST%%/lib/t/regression/15cf_pattern.t
 %%RTPLIST%%/lib/t/regression/15cf_single_values_are_single.t
 %%RTPLIST%%/lib/t/regression/16-transaction_cf_tests.t
+%%RTPLIST%%/lib/t/regression/17custom_search.t
 %%RTPLIST%%/lib/t/regression/17multiple_deleg_revocation.t
+%%RTPLIST%%/lib/t/regression/18custom_frontpage.t
 %%RTPLIST%%/lib/t/regression/18stale_delegations_cleanup.t
 %%RTPLIST%%/lib/t/regression/19-rtname.t
+%%RTPLIST%%/lib/t/regression/19quicksearch.t
+%%RTPLIST%%/lib/t/regression/20-sort-by-requestor.t
 %%RTPLIST%%/lib/t/regression/20savedsearch.t
 %%RTPLIST%%/lib/t/regression/21query-builder.t
 %%RTPLIST%%/lib/t/regression/22search_tix_by_txn.t
 %%RTPLIST%%/lib/t/regression/22search_tix_by_watcher.t
+%%RTPLIST%%/lib/t/regression/23-batch-upload-csv.t
+%%RTPLIST%%/lib/t/regression/23cfsort.t
+%%RTPLIST%%/lib/t/regression/24pawsort.t
+%%RTPLIST%%/lib/t/regression/25scrip_order.t
+%%RTPLIST%%/lib/t/regression/26command_line.t
 %%RTPLIST%%/lib/t/regression/mime_tests
 %%RTPLIST%%/lib/t/setup_regression.t
-%%RTPLIST%%/lib/t/create_data.pl
+%%RTPLIST%%/sbin/rt-dump-database
 %%RTPLIST%%/sbin/rt-setup-database
 %%RTPLIST%%/sbin/rt-test-dependencies
-%%RTPLIST%%/sbin/rt-dump-database
 %%RTPLIST%%/share/doc/README
+%%RTPLIST%%/share/html/Admin/CustomFields/GroupRights.html
+%%RTPLIST%%/share/html/Admin/CustomFields/Modify.html
+%%RTPLIST%%/share/html/Admin/CustomFields/Objects.html
+%%RTPLIST%%/share/html/Admin/CustomFields/UserRights.html
+%%RTPLIST%%/share/html/Admin/CustomFields/index.html
 %%RTPLIST%%/share/html/Admin/Elements/AddCustomFieldValue
 %%RTPLIST%%/share/html/Admin/Elements/CreateUserCalled
 %%RTPLIST%%/share/html/Admin/Elements/CustomFieldTabs
@@ -251,8 +273,8 @@
 %%RTPLIST%%/share/html/Admin/Elements/ListGlobalScrips
 %%RTPLIST%%/share/html/Admin/Elements/ModifyTemplate
 %%RTPLIST%%/share/html/Admin/Elements/ObjectCustomFields
-%%RTPLIST%%/share/html/Admin/Elements/PickObjects
 %%RTPLIST%%/share/html/Admin/Elements/PickCustomFields
+%%RTPLIST%%/share/html/Admin/Elements/PickObjects
 %%RTPLIST%%/share/html/Admin/Elements/QueueRightsForUser
 %%RTPLIST%%/share/html/Admin/Elements/QueueTabs
 %%RTPLIST%%/share/html/Admin/Elements/SelectCustomFieldLookupType
@@ -274,6 +296,11 @@
 %%RTPLIST%%/share/html/Admin/Elements/Tabs
 %%RTPLIST%%/share/html/Admin/Elements/ToolTabs
 %%RTPLIST%%/share/html/Admin/Elements/UserTabs
+%%RTPLIST%%/share/html/Admin/Global/CustomFields/Groups.html
+%%RTPLIST%%/share/html/Admin/Global/CustomFields/Queue-Tickets.html
+%%RTPLIST%%/share/html/Admin/Global/CustomFields/Queue-Transactions.html
+%%RTPLIST%%/share/html/Admin/Global/CustomFields/Users.html
+%%RTPLIST%%/share/html/Admin/Global/CustomFields/index.html
 %%RTPLIST%%/share/html/Admin/Global/GroupRights.html
 %%RTPLIST%%/share/html/Admin/Global/Scrip.html
 %%RTPLIST%%/share/html/Admin/Global/Scrips.html
@@ -281,16 +308,6 @@
 %%RTPLIST%%/share/html/Admin/Global/Templates.html
 %%RTPLIST%%/share/html/Admin/Global/UserRights.html
 %%RTPLIST%%/share/html/Admin/Global/index.html
-%%RTPLIST%%/share/html/Admin/Global/CustomFields/Groups.html
-%%RTPLIST%%/share/html/Admin/Global/CustomFields/Users.html
-%%RTPLIST%%/share/html/Admin/Global/CustomFields/index.html
-%%RTPLIST%%/share/html/Admin/Global/CustomFields/Queue-Transactions.html
-%%RTPLIST%%/share/html/Admin/Global/CustomFields/Queue-Tickets.html
-%%RTPLIST%%/share/html/Admin/CustomFields/GroupRights.html
-%%RTPLIST%%/share/html/Admin/CustomFields/UserRights.html
-%%RTPLIST%%/share/html/Admin/CustomFields/Modify.html
-%%RTPLIST%%/share/html/Admin/CustomFields/index.html
-%%RTPLIST%%/share/html/Admin/CustomFields/Objects.html
 %%RTPLIST%%/share/html/Admin/Groups/CustomFields.html
 %%RTPLIST%%/share/html/Admin/Groups/GroupRights.html
 %%RTPLIST%%/share/html/Admin/Groups/History.html
@@ -298,11 +315,6 @@
 %%RTPLIST%%/share/html/Admin/Groups/Modify.html
 %%RTPLIST%%/share/html/Admin/Groups/UserRights.html
 %%RTPLIST%%/share/html/Admin/Groups/index.html
-%%RTPLIST%%/share/html/Admin/Users/CustomFields.html
-%%RTPLIST%%/share/html/Admin/Users/Memberships.html
-%%RTPLIST%%/share/html/Admin/Users/Modify.html
-%%RTPLIST%%/share/html/Admin/Users/History.html
-%%RTPLIST%%/share/html/Admin/Users/index.html
 %%RTPLIST%%/share/html/Admin/Queues/CustomField.html
 %%RTPLIST%%/share/html/Admin/Queues/CustomFields.html
 %%RTPLIST%%/share/html/Admin/Queues/GroupRights.html
@@ -316,6 +328,11 @@
 %%RTPLIST%%/share/html/Admin/Queues/index.html
 %%RTPLIST%%/share/html/Admin/Tools/Configuration.html
 %%RTPLIST%%/share/html/Admin/Tools/index.html
+%%RTPLIST%%/share/html/Admin/Users/CustomFields.html
+%%RTPLIST%%/share/html/Admin/Users/History.html
+%%RTPLIST%%/share/html/Admin/Users/Memberships.html
+%%RTPLIST%%/share/html/Admin/Users/Modify.html
+%%RTPLIST%%/share/html/Admin/Users/index.html
 %%RTPLIST%%/share/html/Admin/autohandler
 %%RTPLIST%%/share/html/Admin/index.html
 %%RTPLIST%%/share/html/Approvals/Display.html
@@ -324,40 +341,48 @@
 %%RTPLIST%%/share/html/Approvals/Elements/ShowDependency
 %%RTPLIST%%/share/html/Approvals/Elements/Tabs
 %%RTPLIST%%/share/html/Approvals/index.html
-%%RTPLIST%%/share/html/Download/Tabular/dhandler
 %%RTPLIST%%/share/html/Download/CustomFieldValue/dhandler
+%%RTPLIST%%/share/html/Download/Tabular/dhandler
 %%RTPLIST%%/share/html/Elements/BevelBoxRaisedEnd
 %%RTPLIST%%/share/html/Elements/BevelBoxRaisedStart
 %%RTPLIST%%/share/html/Elements/Callback
 %%RTPLIST%%/share/html/Elements/Checkbox
+%%RTPLIST%%/share/html/Elements/CollectionAsTable/Header
 %%RTPLIST%%/share/html/Elements/CollectionAsTable/ParseFormat
 %%RTPLIST%%/share/html/Elements/CollectionAsTable/Row
-%%RTPLIST%%/share/html/Elements/CollectionAsTable/Header
 %%RTPLIST%%/share/html/Elements/CreateTicket
-%%RTPLIST%%/share/html/Elements/EditLinks
 %%RTPLIST%%/share/html/Elements/EditCustomField
-%%RTPLIST%%/share/html/Elements/EditCustomFieldImage
-%%RTPLIST%%/share/html/Elements/EditCustomFieldSelect
 %%RTPLIST%%/share/html/Elements/EditCustomFieldBinary
+%%RTPLIST%%/share/html/Elements/EditCustomFieldCombobox
 %%RTPLIST%%/share/html/Elements/EditCustomFieldFreeform
+%%RTPLIST%%/share/html/Elements/EditCustomFieldImage
+%%RTPLIST%%/share/html/Elements/EditCustomFieldSelect
 %%RTPLIST%%/share/html/Elements/EditCustomFieldText
 %%RTPLIST%%/share/html/Elements/EditCustomFieldWikitext
+%%RTPLIST%%/share/html/Elements/EditLinks
 %%RTPLIST%%/share/html/Elements/Error
 %%RTPLIST%%/share/html/Elements/Footer
 %%RTPLIST%%/share/html/Elements/GotoTicket
 %%RTPLIST%%/share/html/Elements/Header
 %%RTPLIST%%/share/html/Elements/ListActions
 %%RTPLIST%%/share/html/Elements/Login
+%%RTPLIST%%/share/html/Elements/Logo
 %%RTPLIST%%/share/html/Elements/Menu
 %%RTPLIST%%/share/html/Elements/MessageBox
+%%RTPLIST%%/share/html/Elements/MyAdminQueues
+%%RTPLIST%%/share/html/Elements/MyRT
+%%RTPLIST%%/share/html/Elements/MyReminders
 %%RTPLIST%%/share/html/Elements/MyRequests
+%%RTPLIST%%/share/html/Elements/MySupportQueues
 %%RTPLIST%%/share/html/Elements/MyTickets
 %%RTPLIST%%/share/html/Elements/PageLayout
 %%RTPLIST%%/share/html/Elements/QueryString
+%%RTPLIST%%/share/html/Elements/QueueSummary
 %%RTPLIST%%/share/html/Elements/QuickCreate
 %%RTPLIST%%/share/html/Elements/Quicksearch
 %%RTPLIST%%/share/html/Elements/RT__Ticket/ColumnMap
 %%RTPLIST%%/share/html/Elements/Refresh
+%%RTPLIST%%/share/html/Elements/RefreshHomepage
 %%RTPLIST%%/share/html/Elements/ScrubHTML
 %%RTPLIST%%/share/html/Elements/Section
 %%RTPLIST%%/share/html/Elements/SelectAttachmentField
@@ -380,16 +405,18 @@
 %%RTPLIST%%/share/html/Elements/SelectStatus
 %%RTPLIST%%/share/html/Elements/SelectTicketSortBy
 %%RTPLIST%%/share/html/Elements/SelectTicketTypes
+%%RTPLIST%%/share/html/Elements/SelectTimeUnits
 %%RTPLIST%%/share/html/Elements/SelectUsers
 %%RTPLIST%%/share/html/Elements/SelectWatcherType
 %%RTPLIST%%/share/html/Elements/SetupSessionCookie
-%%RTPLIST%%/share/html/Elements/ShowCustomFields
 %%RTPLIST%%/share/html/Elements/ShowCustomFieldBinary
 %%RTPLIST%%/share/html/Elements/ShowCustomFieldImage
 %%RTPLIST%%/share/html/Elements/ShowCustomFieldWikitext
+%%RTPLIST%%/share/html/Elements/ShowCustomFields
 %%RTPLIST%%/share/html/Elements/ShowLink
 %%RTPLIST%%/share/html/Elements/ShowLinks
 %%RTPLIST%%/share/html/Elements/ShowMemberships
+%%RTPLIST%%/share/html/Elements/ShowSearch
 %%RTPLIST%%/share/html/Elements/SimpleSearch
 %%RTPLIST%%/share/html/Elements/Submit
 %%RTPLIST%%/share/html/Elements/Tabs
@@ -397,20 +424,85 @@
 %%RTPLIST%%/share/html/Elements/TitleBox
 %%RTPLIST%%/share/html/Elements/TitleBoxEnd
 %%RTPLIST%%/share/html/Elements/TitleBoxStart
+%%RTPLIST%%/share/html/Elements/ValidateCustomFields
+%%RTPLIST%%/share/html/Helpers/CalPopup.html
 %%RTPLIST%%/share/html/NoAuth/Logout.html
 %%RTPLIST%%/share/html/NoAuth/Reminder.html
+%%RTPLIST%%/share/html/NoAuth/ahah.js
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/body.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/footer.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/forms.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/header.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/login.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/main.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/misc.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/nav.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/quickbar.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/ticket.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/titlebox.css
+%%RTPLIST%%/share/html/NoAuth/css/3.4-compat/transactions.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/approvals.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/body.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/footer.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/forms.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/header.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/login.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/logo.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/main.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/misc.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/nav.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/quickbar.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/ticket.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/titlebox.css
+%%RTPLIST%%/share/html/NoAuth/css/3.5-default/transactions.css
+%%RTPLIST%%/share/html/NoAuth/css/autohandler
+%%RTPLIST%%/share/html/NoAuth/css/print.css
 %%RTPLIST%%/share/html/NoAuth/images/autohandler
 %%RTPLIST%%/share/html/NoAuth/images/bplogo.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cb-light.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cb.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cbr-b2g.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cbr-b2lb.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cbr-gray.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cbr-trans.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/cbr.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ct-light.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ct.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ctr-b2g.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ctr-b2lb.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ctr-gray.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ctr-trans.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/ctr.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/dark-arrow-up.png
+%%RTPLIST%%/share/html/NoAuth/images/css/dark-arrow.png
+%%RTPLIST%%/share/html/NoAuth/images/css/light-arrow-up.png
+%%RTPLIST%%/share/html/NoAuth/images/css/light-arrow.png
+%%RTPLIST%%/share/html/NoAuth/images/css/rolldown-arrow.gif
+%%RTPLIST%%/share/html/NoAuth/images/css/rolldown-arrow.png
+%%RTPLIST%%/share/html/NoAuth/images/css/rollup-arrow.gif
 %%RTPLIST%%/share/html/NoAuth/images/favicon.png
-%%RTPLIST%%/share/html/NoAuth/images/space.gif
-%%RTPLIST%%/share/html/NoAuth/printrt.css
-%%RTPLIST%%/share/html/NoAuth/webrt.css
+%%RTPLIST%%/share/html/NoAuth/js/ahah.js
+%%RTPLIST%%/share/html/NoAuth/js/autohandler
+%%RTPLIST%%/share/html/NoAuth/js/cascaded.js
+%%RTPLIST%%/share/html/NoAuth/js/class.js
+%%RTPLIST%%/share/html/NoAuth/js/combobox.js
+%%RTPLIST%%/share/html/NoAuth/js/list.js
+%%RTPLIST%%/share/html/NoAuth/js/titlebox-state.js
+%%RTPLIST%%/share/html/NoAuth/js/util.js
+%%RTPLIST%%/share/html/Prefs/Elements/Tabs
+%%RTPLIST%%/share/html/Prefs/MyRT.html
+%%RTPLIST%%/share/html/Prefs/Quicksearch.html
+%%RTPLIST%%/share/html/Prefs/Search.html
+%%RTPLIST%%/share/html/Prefs/SearchOptions.html
 %%RTPLIST%%/share/html/REST/1.0/Forms/queue/default
 %%RTPLIST%%/share/html/REST/1.0/Forms/queue/ns
 %%RTPLIST%%/share/html/REST/1.0/Forms/ticket/attachments
+%%RTPLIST%%/share/html/REST/1.0/Forms/ticket/comment
 %%RTPLIST%%/share/html/REST/1.0/Forms/ticket/default
 %%RTPLIST%%/share/html/REST/1.0/Forms/ticket/history
 %%RTPLIST%%/share/html/REST/1.0/Forms/ticket/links
+%%RTPLIST%%/share/html/REST/1.0/Forms/ticket/merge
+%%RTPLIST%%/share/html/REST/1.0/Forms/ticket/take
 %%RTPLIST%%/share/html/REST/1.0/Forms/user/default
 %%RTPLIST%%/share/html/REST/1.0/Forms/user/ns
 %%RTPLIST%%/share/html/REST/1.0/NoAuth/mail-gateway
@@ -424,8 +516,11 @@
 %%RTPLIST%%/share/html/REST/1.0/ticket/merge
 %%RTPLIST%%/share/html/Search/Build.html
 %%RTPLIST%%/share/html/Search/Bulk.html
+%%RTPLIST%%/share/html/Search/Chart
+%%RTPLIST%%/share/html/Search/Chart.html
 %%RTPLIST%%/share/html/Search/Edit.html
 %%RTPLIST%%/share/html/Search/Elements/BuildFormatString
+%%RTPLIST%%/share/html/Search/Elements/Chart
 %%RTPLIST%%/share/html/Search/Elements/DisplayOptions
 %%RTPLIST%%/share/html/Search/Elements/EditFormat
 %%RTPLIST%%/share/html/Search/Elements/EditQuery
@@ -435,8 +530,11 @@
 %%RTPLIST%%/share/html/Search/Elements/PickCFs
 %%RTPLIST%%/share/html/Search/Elements/PickCriteria
 %%RTPLIST%%/share/html/Search/Elements/SearchPrivacy
+%%RTPLIST%%/share/html/Search/Elements/SearchesForObject
 %%RTPLIST%%/share/html/Search/Elements/SelectAndOr
+%%RTPLIST%%/share/html/Search/Elements/SelectChartType
 %%RTPLIST%%/share/html/Search/Elements/SelectGroup
+%%RTPLIST%%/share/html/Search/Elements/SelectGroupBy
 %%RTPLIST%%/share/html/Search/Elements/SelectLinks
 %%RTPLIST%%/share/html/Search/Elements/SelectPersonType
 %%RTPLIST%%/share/html/Search/Elements/SelectSearchObject
@@ -444,6 +542,7 @@
 %%RTPLIST%%/share/html/Search/Results.html
 %%RTPLIST%%/share/html/Search/Results.rdf
 %%RTPLIST%%/share/html/Search/Results.tsv
+%%RTPLIST%%/share/html/Search/Simple.html
 %%RTPLIST%%/share/html/SelfService/Attachment/dhandler
 %%RTPLIST%%/share/html/SelfService/Closed.html
 %%RTPLIST%%/share/html/SelfService/Create.html
@@ -471,6 +570,7 @@
 %%RTPLIST%%/share/html/Ticket/Elements/FindAttachments
 %%RTPLIST%%/share/html/Ticket/Elements/LoadTextAttachments
 %%RTPLIST%%/share/html/Ticket/Elements/PreviewScrips
+%%RTPLIST%%/share/html/Ticket/Elements/Reminders
 %%RTPLIST%%/share/html/Ticket/Elements/ShowAttachments
 %%RTPLIST%%/share/html/Ticket/Elements/ShowBasics
 %%RTPLIST%%/share/html/Ticket/Elements/ShowCustomFields
@@ -478,14 +578,13 @@
 %%RTPLIST%%/share/html/Ticket/Elements/ShowDependencies
 %%RTPLIST%%/share/html/Ticket/Elements/ShowGroupMembers
 %%RTPLIST%%/share/html/Ticket/Elements/ShowHistory
-%%RTPLIST%%/share/html/Ticket/Elements/ShowMemberOf
 %%RTPLIST%%/share/html/Ticket/Elements/ShowMembers
 %%RTPLIST%%/share/html/Ticket/Elements/ShowMessageHeaders
 %%RTPLIST%%/share/html/Ticket/Elements/ShowMessageStanza
 %%RTPLIST%%/share/html/Ticket/Elements/ShowPeople
-%%RTPLIST%%/share/html/Ticket/Elements/ShowReferences
 %%RTPLIST%%/share/html/Ticket/Elements/ShowRequestor
 %%RTPLIST%%/share/html/Ticket/Elements/ShowSummary
+%%RTPLIST%%/share/html/Ticket/Elements/ShowTime
 %%RTPLIST%%/share/html/Ticket/Elements/ShowTransaction
 %%RTPLIST%%/share/html/Ticket/Elements/ShowTransactionAttachments
 %%RTPLIST%%/share/html/Ticket/Elements/ShowUserEntry
@@ -496,11 +595,18 @@
 %%RTPLIST%%/share/html/Ticket/ModifyDates.html
 %%RTPLIST%%/share/html/Ticket/ModifyLinks.html
 %%RTPLIST%%/share/html/Ticket/ModifyPeople.html
+%%RTPLIST%%/share/html/Ticket/Reminders.html
 %%RTPLIST%%/share/html/Ticket/ShowEmailRecord.html
 %%RTPLIST%%/share/html/Ticket/Update.html
 %%RTPLIST%%/share/html/Tools/Elements/Tabs
 %%RTPLIST%%/share/html/Tools/MyDay.html
 %%RTPLIST%%/share/html/Tools/Offline.html
+%%RTPLIST%%/share/html/Tools/Reports/CreatedByDates.html
+%%RTPLIST%%/share/html/Tools/Reports/Elements/Tabs
+%%RTPLIST%%/share/html/Tools/Reports/ResolvedByDates.html
+%%RTPLIST%%/share/html/Tools/Reports/ResolvedByOwner.html
+%%RTPLIST%%/share/html/Tools/Reports/index.html
+%%RTPLIST%%/share/html/Tools/index.html
 %%RTPLIST%%/share/html/User/Delegation.html
 %%RTPLIST%%/share/html/User/Elements/DelegateRights
 %%RTPLIST%%/share/html/User/Elements/GroupTabs
@@ -509,13 +615,22 @@
 %%RTPLIST%%/share/html/User/Groups/Modify.html
 %%RTPLIST%%/share/html/User/Groups/index.html
 %%RTPLIST%%/share/html/User/Prefs.html
+%%RTPLIST%%/share/html/Widgets/ComboBox
+%%RTPLIST%%/share/html/Widgets/SelectionBox
+%%RTPLIST%%/share/html/Widgets/TitleBox
+%%RTPLIST%%/share/html/Widgets/TitleBoxEnd
+%%RTPLIST%%/share/html/Widgets/TitleBoxStart
 %%RTPLIST%%/share/html/autohandler
 %%RTPLIST%%/share/html/index.html
 %%RTPLIST%%/share/html/l
 @unexec rm -R %%RT_PATH%%/var 2> /dev/null || true
+
+@dirrm %%RTPLIST%%/share/html/Widgets
 @dirrm %%RTPLIST%%/share/html/User/Groups
 @dirrm %%RTPLIST%%/share/html/User/Elements
 @dirrm %%RTPLIST%%/share/html/User
+@dirrm %%RTPLIST%%/share/html/Tools/Reports/Elements
+@dirrm %%RTPLIST%%/share/html/Tools/Reports
 @dirrm %%RTPLIST%%/share/html/Tools/Elements
 @dirrm %%RTPLIST%%/share/html/Tools
 @dirrm %%RTPLIST%%/share/html/Ticket/Elements
@@ -535,8 +650,16 @@
 @dirrm %%RTPLIST%%/share/html/REST/1.0/Forms
 @dirrm %%RTPLIST%%/share/html/REST/1.0
 @dirrm %%RTPLIST%%/share/html/REST
+@dirrm %%RTPLIST%%/share/html/Prefs/Elements
+@dirrm %%RTPLIST%%/share/html/Prefs
+@dirrm %%RTPLIST%%/share/html/NoAuth/js
+@dirrm %%RTPLIST%%/share/html/NoAuth/images/css
 @dirrm %%RTPLIST%%/share/html/NoAuth/images
+@dirrm %%RTPLIST%%/share/html/NoAuth/css/3.5-default
+@dirrm %%RTPLIST%%/share/html/NoAuth/css/3.4-compat
+@dirrm %%RTPLIST%%/share/html/NoAuth/css
 @dirrm %%RTPLIST%%/share/html/NoAuth
+@dirrm %%RTPLIST%%/share/html/Helpers
 @dirrm %%RTPLIST%%/share/html/Elements/RT__Ticket
 @dirrm %%RTPLIST%%/share/html/Elements/CollectionAsTable
 @dirrm %%RTPLIST%%/share/html/Elements
@@ -551,8 +674,8 @@
 @dirrm %%RTPLIST%%/share/html/Admin/Groups
 @dirrm %%RTPLIST%%/share/html/Admin/Global/CustomFields
 @dirrm %%RTPLIST%%/share/html/Admin/Global
-@dirrm %%RTPLIST%%/share/html/Admin/CustomFields
 @dirrm %%RTPLIST%%/share/html/Admin/Elements
+@dirrm %%RTPLIST%%/share/html/Admin/CustomFields
 @dirrm %%RTPLIST%%/share/html/Admin
 @dirrm %%RTPLIST%%/share/html
 @dirrm %%RTPLIST%%/share/doc
@@ -569,7 +692,10 @@
 @dirrm %%RTPLIST%%/lib/t
 @dirrm %%RTPLIST%%/lib/RT/URI
 @dirrm %%RTPLIST%%/lib/RT/Search
+@dirrm %%RTPLIST%%/lib/RT/Report/Tickets
+@dirrm %%RTPLIST%%/lib/RT/Report
 @dirrm %%RTPLIST%%/lib/RT/Interface/Web/QueryBuilder
+@dirrm %%RTPLIST%%/lib/RT/Interface/Web/Menu
 @dirrm %%RTPLIST%%/lib/RT/Interface/Web
 @dirrm %%RTPLIST%%/lib/RT/Interface/Email/Filter
 @dirrm %%RTPLIST%%/lib/RT/Interface/Email/Auth