Update rt3 to version 3.4.5. This is _not_ an easy update, although the

changes are apparently minor to a end user (but not for the site
administrator).

It'd very hard and very long to provide a full list of changes.  The main
changes in RT 3.4 are a complete rework of how Custom Fields are handled,
which means there is a lot more flexibility in that area now (including
Custom Fields for users, per-queue, per-transaction).  RT 3.4 is also
supposed to be faster, which certainly is no bad news.

Another bonus of RT 3.4 are the availability of extensions, and I will
commit RTx::Shredder and RTx::RightsMatrix very soon.

Updating RT is not an easy task, be sure to backup your database, and don't
forget to grant the new rights to relevant people.

In pkgsrc, rt3 is also seeing a few changes.  The main one is the situation
of the "local" path, which is now set to /var/rt3, which seems less lame to
me than the previous value.  It could be debated, though.

10 files changed, 268 insertions, 165 deletions

diff --git a/devel/rt3/INSTALL b/devel/rt3/INSTALL
deleted file mode 100644
index ee46f6252cd..00000000000
--- a/devel/rt3/INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2004/08/03 15:33:49 cube Exp $
-
-case $STAGE in
-POST-INSTALL)
-	@ECHO@ "==> Creating additional directories"
-	@MKDIR@ @RTVARDIR@ 2>/dev/null
-	@MKDIR@ @RTVARDIR@/mason_data 2>/dev/null
-	@MKDIR@ @RTVARDIR@/session_data 2>/dev/null
-	@MKDIR@ @RTLOCALDIR@ 2>/dev/null
-	@MKDIR@ @RTLOCALDIR@/etc 2>/dev/null
-	@MKDIR@ @RTLOCALDIR@/lib 2>/dev/null
-	@MKDIR@ @RTLOCALDIR@/po 2>/dev/null
-	@MKDIR@ @RTLOCALDIR@/html 2>/dev/null
-	@ECHO@ "==> Fixing permissions"
-	@CHMOD@ 0770 @RTVARDIR@/mason_data @RTVARDIR@/session_data 2>/dev/null
-	@CHOWN@ @WEBUSER@ @RTVARDIR@/mason_data @RTVARDIR@/session_data 2>/dev/null
-	@CHGRP@ @WEBGROUP@ @RTVARDIR@/mason_data @RTVARDIR@/session_data 2>/dev/null
-	;;
-esac
diff --git a/devel/rt3/MESSAGE b/devel/rt3/MESSAGE
index 95f6d374422..d60edc2692a 100644
--- a/devel/rt3/MESSAGE
+++ b/devel/rt3/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/11/03 23:34:05 cube Exp $
+$NetBSD: MESSAGE,v 1.3 2006/05/01 09:38:08 cube Exp $
 
 You must configure RT by editing ${PKG_SYSCONFDIR}/RT_SiteConfig.pm.
 
@@ -12,5 +12,23 @@ as a user in the ${RT_GROUP} group or as superuser.  In the previous
 command-line, 'dbadmin' stands for the database administrator's username,
 e.g. 'root' for MySQL.
 
+To upgrade the RT database from an older version, look in
+${PREFIX}/share/rt3/etc/upgrade, and for each version newer than the one
+previously used, do the following:
+
+	${PREFIX}/sbin/rt-setup-database --action schema \
+	    --dba dbadmin --prompt-for-dba-password \
+	    --datadir ${RTSHAREDIR}/etc/upgrade/<version>
+	${PREFIX}/sbin/rt-setup-database --action acl \
+	    --dba dbadmin --prompt-for-dba-password \
+	    --datadir ${RTSHAREDIR}/etc/upgrade/<version>
+	${PREFIX}/sbin/rt-setup-database --action insert \
+	    --dba dbadmin --prompt-for-dba-password \
+	    --datadir ${RTSHAREDIR}/etc/upgrade/<version>
+
+You might also want to clear the Mason cache:
+
+	rm -Rf ${RTVARDIR}/mason_data/obj
+
 See also the manual on ${HOMEPAGE}docs.html
 ===========================================================================
diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile
index d649d05f5b6..a1aa983ba88 100644
--- a/devel/rt3/Makefile
+++ b/devel/rt3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/04/19 17:21:35 cube Exp $
+# $NetBSD: Makefile,v 1.18 2006/05/01 09:38:08 cube Exp $
 
-DISTNAME=		rt-3.2.3
-PKGREVISION=		6
+DISTNAME=		rt-3.4.5
+PKGREVISION=		#
 CATEGORIES=		devel
 MASTER_SITES=		http://download.bestpractical.com/pub/rt/release/
 
@@ -17,7 +17,7 @@ DEPENDS+=	p5-Digest-MD5>=2.27:../../security/p5-Digest-MD5
 DEPENDS+=	p5-DBI>=1.37:../../databases/p5-DBI
 DEPENDS+=	p5-Test-Inline>=0.15:../../devel/p5-Test-Inline
 DEPENDS+=	p5-Class-ReturnValue>=0.40:../../devel/p5-Class-ReturnValue
-DEPENDS+=	p5-DBIx-SearchBuilder>=1.19:../../databases/p5-DBIx-SearchBuilder
+DEPENDS+=	p5-DBIx-SearchBuilder>=1.35:../../databases/p5-DBIx-SearchBuilder
 DEPENDS+=	p5-Text-Template>=1.43:../../textproc/p5-Text-Template
 DEPENDS+=	p5-HTML-Parser>=3.35:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
@@ -34,6 +34,7 @@ DEPENDS+=	p5-Text-Autoformat>=1.04:../../textproc/p5-Text-Autoformat
 DEPENDS+=	p5-Text-Quoted>=1.5:../../textproc/p5-Text-Quoted
 DEPENDS+=	p5-Tree-Simple>=1.04:../../devel/p5-Tree-Simple
 DEPENDS+=	p5-Module-Versions-Report-[0-9]*:../../devel/p5-Module-Versions-Report
+DEPENDS+=	p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
 
 # Mason dependencies:
 DEPENDS+=	p5-Params-Validate>=0.02:../../devel/p5-Params-Validate
@@ -44,12 +45,16 @@ DEPENDS+=	p5-MLDBM>=2.01:../../databases/p5-MLDBM
 DEPENDS+=	p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw
 DEPENDS+=	p5-Storable>=2.08:../../devel/p5-Storable
 DEPENDS+=	p5-Apache-Session>=1.53:../../www/p5-Apache-Session
-DEPENDS+=	p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
+DEPENDS+=	p5-XML-RSS>=1.05:../../textproc/p5-XML-RSS
+DEPENDS+=	p5-HTTP-Server-Simple>=0.07:../../www/p5-HTTP-Server-Simple
+DEPENDS+=	p5-HTTP-Server-Simple-Mason>=0.09:../../www/p5-HTTP-Server-Simple-Mason
+DEPENDS+=	p5-Text-WikiFormat>=0.72:../../textproc/p5-Text-WikiFormat
 
 # Mailgate dependencies:
 DEPENDS+=	p5-HTML-Tree>=3.18:../../www/p5-HTML-Tree
 DEPENDS+=	p5-HTML-Format>=2.03:../../www/p5-HTML-Format
 DEPENDS+=	p5-libwww>=5.76:../../www/p5-libwww
+DEPENDS+=	p5-Module-Refresh>=0.03:../../devel/p5-Module-Refresh
 
 # Front-end dependencies:
 .if !empty(PKG_OPTIONS:Mmodperl1)
@@ -64,16 +69,23 @@ DEPENDS+=	p5-FCGI>=0.67:../../www/p5-FCGI
 # Back-end dependencies
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=	p5-DBD-mysql>=2.1018:../../databases/p5-DBD-mysql
-_RT_DB_TYPE=		mysql
+_RT_DB_TYPE=	mysql
 .elif !empty(PKG_OPTIONS:Mpgsql)
-DEPENDS+=	p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
-_RT_DB_TYPE=		Pg
+DEPENDS+=	p5-DBD-postgresql>=1.41:../../databases/p5-DBD-postgresql
+_RT_DB_TYPE=	Pg
+.elif !empty(PKG_OPTIONS:Moracle)
+DEPENDS+=	p5-DBD-Oracle-[0-9]*:../../databases/p5-DBD-Oracle
+_RT_DB_TYPE=	Oracle
+.elif !empty(PKG_OPTIONS:Msqlite)
+DEPENDS+=	p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite
+_RT_DB_TYPE=	SQLite
 .endif
 
 # Dev dependencies:
 DEPENDS+=	p5-Regexp-Common>=2.113:../../textproc/p5-Regexp-Common
 DEPENDS+=	{p5-Apache-Test-[0-9]*,ap2-perl>=2.0.1}:../../www/p5-Apache-Test
 DEPENDS+=	p5-WWW-Mechanize>=0.72:../../www/p5-WWW-Mechanize
+DEPENDS+=	p5-Test-WWW-Mechanize-[0-9]*:../../www/p5-Test-WWW-Mechanize
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -88,9 +100,9 @@ CONFIGURE_ARGS+=	--with-db-type=${_RT_DB_TYPE:Q}
 CONFIGURE_ARGS+=	--with-web-user=${APACHE_USER:Q}
 CONFIGURE_ARGS+=	--with-web-group=${APACHE_GROUP:Q}
 
-MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
-MESSAGE_SUBST+=		RT_GROUP=${RT_GROUP}
-MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE:Q}
+MESSAGE_SUBST+=		RT_GROUP=${RT_GROUP:Q}
+MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 .include "Makefile.install"
 
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index 5bf3bc8d3ad..5ed1bed4410 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,53 +1,67 @@
-# $NetBSD: Makefile.install,v 1.4 2006/04/12 20:05:19 joerg Exp $
+# $NetBSD: Makefile.install,v 1.5 2006/05/01 09:38:08 cube Exp $
 
-RT_SHARE_DIR=		${PREFIX}/share/rt3
-RT_EXAMPLE_DIR= 	${PREFIX}/share/examples/rt3
-RT_LIB_DIR=		${PREFIX}/lib/rt3
-RT_VAR_DIR=		${VARBASE}/spool/rt3
-RT_LOCAL_DIR?=		${RT_SHARE_DIR}/local
-RT_HTML_DIR=		${RT_SHARE_DIR}/html
-RT_DOC_DIR=		${PREFIX}/share/doc/rt3
+.include "dirs.mk"
 
-BUILD_DEFS+=		RT_LOCAL_DIR
+OWN_DIRS+=		${RT_VAR_DIR} ${RT_LOCAL_DIR} ${RT_LOCAL_DIR}/etc
+OWN_DIRS+=		${RT_LOCAL_DIR}/lib ${RT_LOCAL_DIR}/po
+OWN_DIRS+=		${RT_LOCAL_DIR}/html
+REQD_DIRS+=		${RT_HTML_DIR}/Callbacks
 
-REQD_DIRS+=		${RT_LOCAL_DIR} ${RT_SHARE_DIR}
-OWN_DIRS+=		${RT_VAR_DIR}
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data/cache	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data/etc	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/mason_data/obj	${APACHE_USER}	${APACHE_GROUP}	0770
+OWN_DIRS_PERMS+=	${RT_VAR_DIR}/session_data	${APACHE_USER}	${APACHE_GROUP}	0770
 
 SUBST_CLASSES+=		prefix
 SUBST_FILES.prefix=	config.layout
-SUBST_SED.prefix=	-e s,@PREFIX@,${PREFIX},		\
-			-e s,@PKGSYSCONFDIR@,${PKG_SYSCONFDIR},	\
-			-e s,@RTLIBDIR@,${RT_LIB_DIR},		\
-			-e s,@RTSHAREDIR@,${RT_SHARE_DIR},	\
-			-e s,@RTHTMLDIR@,${RT_HTML_DIR},	\
-			-e s,@RTDOCDIR@,${RT_DOC_DIR},		\
-			-e s,@RTVARDIR@,${RT_VAR_DIR},		\
-			-e s,@RTLOCALDIR@,${RT_LOCAL_DIR},
+SUBST_SED.prefix=	-e s,@PREFIX@,${PREFIX},
+SUBST_SED.prefix+=	-e s,@PKGSYSCONFDIR@,${PKG_SYSCONFDIR},
+SUBST_SED.prefix+=	-e s,@RTLIBDIR@,${RT_LIB_DIR},
+SUBST_SED.prefix+=	-e s,@RTSHAREDIR@,${RT_SHARE_DIR},
+SUBST_SED.prefix+=	-e s,@RTHTMLDIR@,${RT_HTML_DIR},
+SUBST_SED.prefix+=	-e s,@RTDOCDIR@,${RT_DOC_DIR},
+SUBST_SED.prefix+=	-e s,@RTVARDIR@,${RT_VAR_DIR},
+SUBST_SED.prefix+=	-e s,@RTLOCALDIR@,${RT_LOCAL_DIR},
 SUBST_STAGE.prefix=	pre-configure
 
+SUBST_CLASSES+=		etcpath
+SUBST_FILES.etcpath=	sbin/rt-setup-database.in
+SUBST_SED.etcpath=	-e 's,\$$RT::EtcPath,"${RT_SHARE_DIR}/etc",'
+SUBST_STAGE.etcpath=	post-patch
+
 RT_CONFIG_FILES=	RT_Config.pm RT_SiteConfig.pm
-RT_SUPPORT_FILES=	acl.Informix acl.Oracle acl.Pg acl.Sybase acl.mysql		\
-			initialdata schema.Informix schema.Oracle schema.Pg		\
-			schema.Sybase schema.mysql
 
 .for _file_ in ${RT_CONFIG_FILES}
-CONF_FILES_PERMS+=	${RT_EXAMPLE_DIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
-${ROOT_USER} ${RT_GROUP} 0550
-.endfor
-.for _file_ in ${RT_SUPPORT_FILES}
-CONF_FILES_PERMS+=	${RT_EXAMPLE_DIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
-${ROOT_USER} ${RT_GROUP} 0500
+CONF_FILES_PERMS+=	${RT_EXAMPLE_DIR}/${_file_}	\
+			${PKG_SYSCONFDIR}/${_file_}	\
+			${ROOT_USER} ${RT_GROUP} 0550
 .endfor
 
-FILES_SUBST+=		RTVARDIR=${RT_VAR_DIR:Q} RTLOCALDIR=${RT_LOCAL_DIR:Q}
-FILES_SUBST+=		WEBUSER=${APACHE_USER:Q} WEBGROUP=${APACHE_GROUP:Q}
+RT_ETC_FILES=		acl.Oracle acl.Pg acl.mysql constraints.mysql	\
+			drop.Oracle initialdata schema.Oracle schema.Pg	\
+			schema.SQLite schema.mysql
+RT_UPGRADE_DIRS=	3.3.0 3.3.11
+
+MESSAGE_SUBST+=		RTVARDIR=${RT_VAR_DIR:Q} RTSHAREDIR=${RT_SHARE_DIR:Q}
 
 do-install:
 	@${ECHO} "=> Configuration files"
 	${INSTALL_DATA_DIR} ${RT_EXAMPLE_DIR}
-.for _file_ in ${RT_CONFIG_FILES} ${RT_SUPPORT_FILES}
+.for _file_ in ${RT_CONFIG_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${_file_} ${RT_EXAMPLE_DIR}
 .endfor
+	${INSTALL_DATA_DIR} ${RT_SHARE_DIR}/etc
+.for _file_ in ${RT_ETC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/etc/${_file_} ${RT_SHARE_DIR}/etc
+.endfor
+	${INSTALL_DATA_DIR} ${RT_SHARE_DIR}/etc/upgrade
+.for _dir_ in ${RT_UPGRADE_DIRS}
+	${INSTALL_DATA_DIR} ${RT_SHARE_DIR}/etc/upgrade/${_dir_}
+	cd ${WRKSRC}/etc/upgrade/${_dir_} &&						\
+		${FIND} . -type f ! -name '*.orig' 2>/dev/null | 			\
+		${PAX} -rw ${RT_SHARE_DIR}/etc/upgrade/${_dir_}
+.endfor
 	@${ECHO} "=> Libraries"
 	${INSTALL_DATA_DIR} ${RT_LIB_DIR}
 	cd ${WRKSRC}/lib && ${FIND} . -type f ! -name '*.orig' 2>/dev/null | ${PAX} -rw ${RT_LIB_DIR}
diff --git a/devel/rt3/PLIST b/devel/rt3/PLIST
index be39000e142..deaa171cc8e 100644
--- a/devel/rt3/PLIST
+++ b/devel/rt3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/03/24 17:04:12 cube Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/01 09:38:08 cube Exp $
 bin/mason_handler.fcgi
 bin/mason_handler.scgi
 bin/mason_handler.svc
@@ -52,6 +52,7 @@ lib/rt3/RT/Condition/UserDefined.pm
 lib/rt3/RT/CurrentUser.pm
 lib/rt3/RT/CustomField.pm
 lib/rt3/RT/CustomFieldValue.pm
+lib/rt3/RT/CustomFieldValue_Overlay.pm
 lib/rt3/RT/CustomFieldValues.pm
 lib/rt3/RT/CustomFieldValues_Overlay.pm
 lib/rt3/RT/CustomField_Overlay.pm
@@ -74,13 +75,13 @@ lib/rt3/RT/I18N/cs.po
 lib/rt3/RT/I18N/da.po
 lib/rt3/RT/I18N/de.po
 lib/rt3/RT/I18N/en.po
-lib/rt3/RT/I18N/en_malkovich.po
 lib/rt3/RT/I18N/es.po
 lib/rt3/RT/I18N/fi.po
 lib/rt3/RT/I18N/fr.po
 lib/rt3/RT/I18N/he.po
 lib/rt3/RT/I18N/hu.po
 lib/rt3/RT/I18N/i_default.pm
+lib/rt3/RT/I18N/id.po
 lib/rt3/RT/I18N/it.po
 lib/rt3/RT/I18N/ja.po
 lib/rt3/RT/I18N/nl.po
@@ -98,10 +99,21 @@ lib/rt3/RT/Interface/Email/Filter/SpamAssassin.pm
 lib/rt3/RT/Interface/REST.pm
 lib/rt3/RT/Interface/Web.pm
 lib/rt3/RT/Interface/Web/Handler.pm
+lib/rt3/RT/Interface/Web/QueryBuilder.pm
+lib/rt3/RT/Interface/Web/QueryBuilder/Tree.pm
+lib/rt3/RT/Interface/Web/Standalone.pm
 lib/rt3/RT/Link.pm
 lib/rt3/RT/Link_Overlay.pm
 lib/rt3/RT/Links.pm
 lib/rt3/RT/Links_Overlay.pm
+lib/rt3/RT/ObjectCustomField.pm
+lib/rt3/RT/ObjectCustomFieldValue.pm
+lib/rt3/RT/ObjectCustomFieldValue_Overlay.pm
+lib/rt3/RT/ObjectCustomFieldValues.pm
+lib/rt3/RT/ObjectCustomFieldValues_Overlay.pm
+lib/rt3/RT/ObjectCustomField_Overlay.pm
+lib/rt3/RT/ObjectCustomFields.pm
+lib/rt3/RT/ObjectCustomFields_Overlay.pm
 lib/rt3/RT/Principal.pm
 lib/rt3/RT/Principal_Overlay.pm
 lib/rt3/RT/Principals.pm
@@ -111,6 +123,8 @@ lib/rt3/RT/Queue_Overlay.pm
 lib/rt3/RT/Queues.pm
 lib/rt3/RT/Queues_Overlay.pm
 lib/rt3/RT/Record.pm
+lib/rt3/RT/SavedSearch.pm
+lib/rt3/RT/SavedSearches.pm
 lib/rt3/RT/Scrip.pm
 lib/rt3/RT/ScripAction.pm
 lib/rt3/RT/ScripAction_Overlay.pm
@@ -134,10 +148,6 @@ lib/rt3/RT/Template_Overlay.pm
 lib/rt3/RT/Templates.pm
 lib/rt3/RT/Templates_Overlay.pm
 lib/rt3/RT/Ticket.pm
-lib/rt3/RT/TicketCustomFieldValue.pm
-lib/rt3/RT/TicketCustomFieldValue_Overlay.pm
-lib/rt3/RT/TicketCustomFieldValues.pm
-lib/rt3/RT/TicketCustomFieldValues_Overlay.pm
 lib/rt3/RT/Ticket_Overlay.pm
 lib/rt3/RT/Tickets.pm
 lib/rt3/RT/Tickets_Overlay.pm
@@ -149,22 +159,13 @@ lib/rt3/RT/Transactions_Overlay.pm
 lib/rt3/RT/URI.pm
 lib/rt3/RT/URI/base.pm
 lib/rt3/RT/URI/fsck_com_rt.pm
+lib/rt3/RT/URI/t.pm
 lib/rt3/RT/User.pm
 lib/rt3/RT/User_Overlay.pm
 lib/rt3/RT/Users.pm
 lib/rt3/RT/Users_Overlay.pm
 lib/rt3/t/00smoke.t
-lib/rt3/t/00smoke.t.in
-lib/rt3/t/01harness.t
-lib/rt3/t/01harness.t.in
-lib/rt3/t/02regression.t
-lib/rt3/t/02regression.t.in
-lib/rt3/t/03web.pl
-lib/rt3/t/03web.pl.in
-lib/rt3/t/04_send_email.pl
-lib/rt3/t/04_send_email.pl.in
-lib/rt3/t/05cronsupport.pl
-lib/rt3/t/05cronsupport.pl.in
+lib/rt3/t/create_data.pl
 lib/rt3/t/data/8859-15-message-series/dir
 lib/rt3/t/data/8859-15-message-series/msg1
 lib/rt3/t/data/8859-15-message-series/msg2
@@ -185,26 +186,74 @@ lib/rt3/t/data/rt-send-cc
 lib/rt3/t/data/russian-subject-no-content-type
 lib/rt3/t/data/text-html-in-russian
 lib/rt3/t/data/text-html-with-umlaut
-lib/rt3/t/regression/00placeholder
+lib/rt3/t/regression/01ticket_link_searching.t
+lib/rt3/t/regression/02basic_web.t
+lib/rt3/t/regression/03web_compiliation_errors.t
+lib/rt3/t/regression/04send_email.t
+lib/rt3/t/regression/05cronsupport.t
+lib/rt3/t/regression/06mailgateway.t
+lib/rt3/t/regression/07acl.t
+lib/rt3/t/regression/07rights.t
+lib/rt3/t/regression/08web_cf_access.t
+lib/rt3/t/regression/09record_cf_api.t
+lib/rt3/t/regression/10merge.t
+lib/rt3/t/regression/11-template-insert.t
+lib/rt3/t/regression/12-search.t
+lib/rt3/t/regression/13-attribute-tests.t
+lib/rt3/t/regression/14linking.t
+lib/rt3/t/regression/14merge.t
+lib/rt3/t/regression/15cf_single_values_are_single.t
+lib/rt3/t/regression/16-transaction_cf_tests.t
+lib/rt3/t/regression/17multiple_deleg_revocation.t
+lib/rt3/t/regression/18stale_delegations_cleanup.t
+lib/rt3/t/regression/19-rtname.t
+lib/rt3/t/regression/20savedsearch.t
+lib/rt3/t/regression/21query-builder.t
+lib/rt3/t/regression/22search_tix_by_txn.t
+lib/rt3/t/regression/22search_tix_by_watcher.t
 lib/rt3/t/regression/mime_tests
+lib/rt3/t/setup_regression.t
 sbin/rt-setup-database
 sbin/rt-test-dependencies
 share/doc/rt3/README
 share/examples/rt3/RT_Config.pm
 share/examples/rt3/RT_SiteConfig.pm
-share/examples/rt3/acl.Informix
-share/examples/rt3/acl.Oracle
-share/examples/rt3/acl.Pg
-share/examples/rt3/acl.Sybase
-share/examples/rt3/acl.mysql
-share/examples/rt3/initialdata
-share/examples/rt3/schema.Informix
-share/examples/rt3/schema.Oracle
-share/examples/rt3/schema.Pg
-share/examples/rt3/schema.Sybase
-share/examples/rt3/schema.mysql
+share/rt3/etc/acl.Oracle
+share/rt3/etc/acl.Pg
+share/rt3/etc/acl.mysql
+share/rt3/etc/constraints.mysql
+share/rt3/etc/drop.Oracle
+share/rt3/etc/initialdata
+share/rt3/etc/schema.Oracle
+share/rt3/etc/schema.Pg
+share/rt3/etc/schema.SQLite
+share/rt3/etc/schema.mysql
+share/rt3/etc/upgrade/3.3.0/schema.Oracle
+share/rt3/etc/upgrade/3.3.0/acl.SQLite
+share/rt3/etc/upgrade/3.3.0/acl.Oracle
+share/rt3/etc/upgrade/3.3.0/acl.mysql
+share/rt3/etc/upgrade/3.3.0/acl.Pg
+share/rt3/etc/upgrade/3.3.0/schema.mysql
+share/rt3/etc/upgrade/3.3.0/schema.Pg
+share/rt3/etc/upgrade/3.3.0/acl.Informix
+share/rt3/etc/upgrade/3.3.0/content
+share/rt3/etc/upgrade/3.3.11/schema.SQLite
+share/rt3/etc/upgrade/3.3.11/acl.SQLite
+share/rt3/etc/upgrade/3.3.11/schema.Oracle
+share/rt3/etc/upgrade/3.3.11/acl.Oracle
+share/rt3/etc/upgrade/3.3.11/acl.mysql
+share/rt3/etc/upgrade/3.3.11/acl.Pg
+share/rt3/etc/upgrade/3.3.11/schema.mysql
+share/rt3/etc/upgrade/3.3.11/schema.Pg
+share/rt3/etc/upgrade/3.3.11/content
+share/rt3/html/Admin/CustomFields/GroupRights.html
+share/rt3/html/Admin/CustomFields/Modify.html
+share/rt3/html/Admin/CustomFields/Objects.html
+share/rt3/html/Admin/CustomFields/UserRights.html
+share/rt3/html/Admin/CustomFields/index.html
 share/rt3/html/Admin/Elements/AddCustomFieldValue
 share/rt3/html/Admin/Elements/CreateUserCalled
+share/rt3/html/Admin/Elements/CustomFieldTabs
 share/rt3/html/Admin/Elements/EditCustomField
 share/rt3/html/Admin/Elements/EditCustomFieldValues
 share/rt3/html/Admin/Elements/EditCustomFields
@@ -213,13 +262,18 @@ share/rt3/html/Admin/Elements/EditScrip
 share/rt3/html/Admin/Elements/EditScrips
 share/rt3/html/Admin/Elements/EditTemplates
 share/rt3/html/Admin/Elements/EditUserComments
+share/rt3/html/Admin/Elements/GlobalCustomFieldTabs
 share/rt3/html/Admin/Elements/GroupTabs
 share/rt3/html/Admin/Elements/Header
 share/rt3/html/Admin/Elements/ListGlobalCustomFields
 share/rt3/html/Admin/Elements/ListGlobalScrips
 share/rt3/html/Admin/Elements/ModifyTemplate
+share/rt3/html/Admin/Elements/ObjectCustomFields
+share/rt3/html/Admin/Elements/PickCustomFields
+share/rt3/html/Admin/Elements/PickObjects
 share/rt3/html/Admin/Elements/QueueRightsForUser
 share/rt3/html/Admin/Elements/QueueTabs
+share/rt3/html/Admin/Elements/SelectCustomFieldLookupType
 share/rt3/html/Admin/Elements/SelectCustomFieldType
 share/rt3/html/Admin/Elements/SelectGroups
 share/rt3/html/Admin/Elements/SelectModifyGroup
@@ -238,8 +292,11 @@ share/rt3/html/Admin/Elements/SystemTabs
 share/rt3/html/Admin/Elements/Tabs
 share/rt3/html/Admin/Elements/ToolTabs
 share/rt3/html/Admin/Elements/UserTabs
-share/rt3/html/Admin/Global/CustomField.html
-share/rt3/html/Admin/Global/CustomFields.html
+share/rt3/html/Admin/Global/CustomFields/Groups.html
+share/rt3/html/Admin/Global/CustomFields/Queue-Tickets.html
+share/rt3/html/Admin/Global/CustomFields/Queue-Transactions.html
+share/rt3/html/Admin/Global/CustomFields/Users.html
+share/rt3/html/Admin/Global/CustomFields/index.html
 share/rt3/html/Admin/Global/GroupRights.html
 share/rt3/html/Admin/Global/Scrip.html
 share/rt3/html/Admin/Global/Scrips.html
@@ -247,7 +304,9 @@ share/rt3/html/Admin/Global/Template.html
 share/rt3/html/Admin/Global/Templates.html
 share/rt3/html/Admin/Global/UserRights.html
 share/rt3/html/Admin/Global/index.html
+share/rt3/html/Admin/Groups/CustomFields.html
 share/rt3/html/Admin/Groups/GroupRights.html
+share/rt3/html/Admin/Groups/History.html
 share/rt3/html/Admin/Groups/Members.html
 share/rt3/html/Admin/Groups/Modify.html
 share/rt3/html/Admin/Groups/UserRights.html
@@ -265,8 +324,12 @@ share/rt3/html/Admin/Queues/UserRights.html
 share/rt3/html/Admin/Queues/index.html
 share/rt3/html/Admin/Tools/Configuration.html
 share/rt3/html/Admin/Tools/index.html
+share/rt3/html/Admin/Users/CustomFields.html
+share/rt3/html/Admin/Users/History.html
+share/rt3/html/Admin/Users/Memberships.html
 share/rt3/html/Admin/Users/Modify.html
 share/rt3/html/Admin/Users/index.html
+share/rt3/html/Admin/autohandler
 share/rt3/html/Admin/index.html
 share/rt3/html/Approvals/Display.html
 share/rt3/html/Approvals/Elements/Approve
@@ -274,14 +337,23 @@ share/rt3/html/Approvals/Elements/PendingMyApproval
 share/rt3/html/Approvals/Elements/ShowDependency
 share/rt3/html/Approvals/Elements/Tabs
 share/rt3/html/Approvals/index.html
+share/rt3/html/Download/CustomFieldValue/dhandler
+share/rt3/html/Download/Tabular/dhandler
 share/rt3/html/Elements/BevelBoxRaisedEnd
 share/rt3/html/Elements/BevelBoxRaisedStart
 share/rt3/html/Elements/Callback
 share/rt3/html/Elements/Checkbox
+share/rt3/html/Elements/CollectionAsTable/Header
 share/rt3/html/Elements/CollectionAsTable/ParseFormat
 share/rt3/html/Elements/CollectionAsTable/Row
-share/rt3/html/Elements/CollectionAsTable/Header
 share/rt3/html/Elements/CreateTicket
+share/rt3/html/Elements/EditCustomField
+share/rt3/html/Elements/EditCustomFieldBinary
+share/rt3/html/Elements/EditCustomFieldFreeform
+share/rt3/html/Elements/EditCustomFieldImage
+share/rt3/html/Elements/EditCustomFieldSelect
+share/rt3/html/Elements/EditCustomFieldText
+share/rt3/html/Elements/EditCustomFieldWikitext
 share/rt3/html/Elements/EditLinks
 share/rt3/html/Elements/Error
 share/rt3/html/Elements/Footer
@@ -297,8 +369,8 @@ share/rt3/html/Elements/PageLayout
 share/rt3/html/Elements/QueryString
 share/rt3/html/Elements/QuickCreate
 share/rt3/html/Elements/Quicksearch
-share/rt3/html/Elements/Refresh
 share/rt3/html/Elements/RT__Ticket/ColumnMap
+share/rt3/html/Elements/Refresh
 share/rt3/html/Elements/ScrubHTML
 share/rt3/html/Elements/Section
 share/rt3/html/Elements/SelectAttachmentField
@@ -324,8 +396,13 @@ share/rt3/html/Elements/SelectTicketTypes
 share/rt3/html/Elements/SelectUsers
 share/rt3/html/Elements/SelectWatcherType
 share/rt3/html/Elements/SetupSessionCookie
+share/rt3/html/Elements/ShowCustomFieldBinary
+share/rt3/html/Elements/ShowCustomFieldImage
+share/rt3/html/Elements/ShowCustomFieldWikitext
+share/rt3/html/Elements/ShowCustomFields
 share/rt3/html/Elements/ShowLink
 share/rt3/html/Elements/ShowLinks
+share/rt3/html/Elements/ShowMemberships
 share/rt3/html/Elements/SimpleSearch
 share/rt3/html/Elements/Submit
 share/rt3/html/Elements/Tabs
@@ -336,14 +413,10 @@ share/rt3/html/Elements/TitleBoxStart
 share/rt3/html/NoAuth/Logout.html
 share/rt3/html/NoAuth/Reminder.html
 share/rt3/html/NoAuth/images/autohandler
-share/rt3/html/NoAuth/images/back_home.gif
 share/rt3/html/NoAuth/images/bplogo.gif
 share/rt3/html/NoAuth/images/favicon.png
-share/rt3/html/NoAuth/images/head_requestracker.gif
-share/rt3/html/NoAuth/images/rt.jpg
 share/rt3/html/NoAuth/images/space.gif
-share/rt3/html/NoAuth/images/spacer.gif
-share/rt3/html/NoAuth/images/squares_blue.gif
+share/rt3/html/NoAuth/printrt.css
 share/rt3/html/NoAuth/webrt.css
 share/rt3/html/REST/1.0/Forms/queue/default
 share/rt3/html/REST/1.0/Forms/queue/ns
@@ -368,6 +441,7 @@ share/rt3/html/Search/Edit.html
 share/rt3/html/Search/Elements/BuildFormatString
 share/rt3/html/Search/Elements/DisplayOptions
 share/rt3/html/Search/Elements/EditFormat
+share/rt3/html/Search/Elements/EditQuery
 share/rt3/html/Search/Elements/EditSearches
 share/rt3/html/Search/Elements/NewListActions
 share/rt3/html/Search/Elements/PickBasics
@@ -375,6 +449,7 @@ share/rt3/html/Search/Elements/PickCFs
 share/rt3/html/Search/Elements/PickCriteria
 share/rt3/html/Search/Elements/SearchPrivacy
 share/rt3/html/Search/Elements/SelectAndOr
+share/rt3/html/Search/Elements/SelectGroup
 share/rt3/html/Search/Elements/SelectLinks
 share/rt3/html/Search/Elements/SelectPersonType
 share/rt3/html/Search/Elements/SelectSearchObject
@@ -385,6 +460,7 @@ share/rt3/html/Search/Results.tsv
 share/rt3/html/SelfService/Attachment/dhandler
 share/rt3/html/SelfService/Closed.html
 share/rt3/html/SelfService/Create.html
+share/rt3/html/SelfService/CreateTicketInQueue.html
 share/rt3/html/SelfService/Display.html
 share/rt3/html/SelfService/Elements/GotoTicket
 share/rt3/html/SelfService/Elements/Header
@@ -449,29 +525,6 @@ share/rt3/html/User/Prefs.html
 share/rt3/html/autohandler
 share/rt3/html/index.html
 share/rt3/html/l
-@exec ${MKDIR} %D/share/rt3/local 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/rt3/local/etc 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/rt3/local/html 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/rt3/local/lib 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/rt3/local/po 2>/dev/null || ${TRUE}
-@dirrm lib/rt3/t/regression
-@dirrm lib/rt3/t/data/8859-15-message-series
-@dirrm lib/rt3/t/data
-@dirrm lib/rt3/t
-@dirrm lib/rt3/RT/URI
-@dirrm lib/rt3/RT/Search
-@dirrm lib/rt3/RT/Interface/Web
-@dirrm lib/rt3/RT/Interface/Email/Filter
-@dirrm lib/rt3/RT/Interface/Email/Auth
-@dirrm lib/rt3/RT/Interface/Email
-@dirrm lib/rt3/RT/Interface
-@dirrm lib/rt3/RT/I18N
-@dirrm lib/rt3/RT/Condition
-@dirrm lib/rt3/RT/Action
-@dirrm lib/rt3/RT
-@dirrm lib/rt3
-@dirrm share/doc/rt3
-@dirrm share/examples/rt3
 @dirrm share/rt3/html/User/Groups
 @dirrm share/rt3/html/User/Elements
 @dirrm share/rt3/html/User
@@ -496,16 +549,47 @@ share/rt3/html/l
 @dirrm share/rt3/html/REST
 @dirrm share/rt3/html/NoAuth/images
 @dirrm share/rt3/html/NoAuth
-@dirrm share/rt3/html/Elements/CollectionAsTable
 @dirrm share/rt3/html/Elements/RT__Ticket
+@dirrm share/rt3/html/Elements/CollectionAsTable
 @dirrm share/rt3/html/Elements
+@dirrm share/rt3/html/Download/Tabular
+@dirrm share/rt3/html/Download/CustomFieldValue
+@dirrm share/rt3/html/Download
+@dirrm share/rt3/html/Callbacks
 @dirrm share/rt3/html/Approvals/Elements
 @dirrm share/rt3/html/Approvals
 @dirrm share/rt3/html/Admin/Users
 @dirrm share/rt3/html/Admin/Tools
 @dirrm share/rt3/html/Admin/Queues
 @dirrm share/rt3/html/Admin/Groups
+@dirrm share/rt3/html/Admin/Global/CustomFields
 @dirrm share/rt3/html/Admin/Global
 @dirrm share/rt3/html/Admin/Elements
+@dirrm share/rt3/html/Admin/CustomFields
 @dirrm share/rt3/html/Admin
 @dirrm share/rt3/html
+@dirrm share/rt3/etc/upgrade/3.3.11
+@dirrm share/rt3/etc/upgrade/3.3.0
+@dirrm share/rt3/etc/upgrade
+@dirrm share/rt3/etc/upgrade
+@dirrm share/rt3/etc
+@dirrm share/rt3
+@dirrm share/examples/rt3
+@dirrm share/doc/rt3
+@dirrm lib/rt3/t/regression
+@dirrm lib/rt3/t/data/8859-15-message-series
+@dirrm lib/rt3/t/data
+@dirrm lib/rt3/t
+@dirrm lib/rt3/RT/URI
+@dirrm lib/rt3/RT/Search
+@dirrm lib/rt3/RT/Interface/Web/QueryBuilder
+@dirrm lib/rt3/RT/Interface/Web
+@dirrm lib/rt3/RT/Interface/Email/Filter
+@dirrm lib/rt3/RT/Interface/Email/Auth
+@dirrm lib/rt3/RT/Interface/Email
+@dirrm lib/rt3/RT/Interface
+@dirrm lib/rt3/RT/I18N
+@dirrm lib/rt3/RT/Condition
+@dirrm lib/rt3/RT/Action
+@dirrm lib/rt3/RT
+@dirrm lib/rt3
diff --git a/devel/rt3/dirs.mk b/devel/rt3/dirs.mk
new file mode 100644
index 00000000000..49577f34259
--- /dev/null
+++ b/devel/rt3/dirs.mk
@@ -0,0 +1,15 @@
+# $NetBSD: dirs.mk,v 1.1 2006/05/01 09:38:08 cube Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+RT_LOCAL_DIR?=		${VARBASE}/rt3
+BUILD_DEFS+=		RT_LOCAL_DIR
+
+RT_DOC_DIR=	${LOCALBASE}/share/doc/rt3
+RT_EXAMPLE_DIR= ${LOCALBASE}/share/examples/rt3
+RT_LIB_DIR=	${LOCALBASE}/lib/rt3
+RT_SHARE_DIR=	${LOCALBASE}/share/rt3
+RT_VAR_DIR=	${VARBASE}/spool/rt3
+
+RT_HTML_DIR=	${RT_SHARE_DIR}/html
+RT_I18N_DIR=	${RT_LIB_DIR}/I18N
diff --git a/devel/rt3/distinfo b/devel/rt3/distinfo
index 42550eaa99a..d3101d693f3 100644
--- a/devel/rt3/distinfo
+++ b/devel/rt3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/09/21 21:23:46 cube Exp $
+$NetBSD: distinfo,v 1.6 2006/05/01 09:38:08 cube Exp $
 
-SHA1 (rt-3.2.3.tar.gz) = 100cb67f5ef716c0d32421f7d153c3b7a7d86c7f
-RMD160 (rt-3.2.3.tar.gz) = 538bbe07bcff5fcc19fa0e435c304f716158d69b
-Size (rt-3.2.3.tar.gz) = 1272638 bytes
+SHA1 (rt-3.4.5.tar.gz) = a2609ffc168829a179bea70006e57aee6d6367f9
+RMD160 (rt-3.4.5.tar.gz) = aa86f6cd4039ce6f6fdfaabf0e2807e93d0786b5
+Size (rt-3.4.5.tar.gz) = 1410154 bytes
 SHA1 (patch-aa) = 4d29c290658144dcd7aa08d87649681dd2549b43
-SHA1 (patch-ab) = 7cb3cb06444f29b4a1a0fcc47abb250336acf0ab
+SHA1 (patch-ac) = efa7095fe10e313a1578a1d739a8e77244c2ba6e
diff --git a/devel/rt3/options.mk b/devel/rt3/options.mk
index c0405db4c8a..11f306dc89f 100644
--- a/devel/rt3/options.mk
+++ b/devel/rt3/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2005/09/08 13:43:05 cube Exp $
+# $NetBSD: options.mk,v 1.2 2006/05/01 09:38:08 cube Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rt
 PKG_OPTIONS_REQUIRED_GROUPS=	backend frontend
-PKG_OPTIONS_GROUP.backend=	mysql pgsql
+PKG_OPTIONS_GROUP.backend=	mysql oracle pgsql sqlite
 PKG_OPTIONS_GROUP.frontend=	modperl1 modperl2 \
 				fastcgi
 PKG_SUGGESTED_OPTIONS=	mysql fastcgi
diff --git a/devel/rt3/patches/patch-ab b/devel/rt3/patches/patch-ab
deleted file mode 100644
index ee6f03d11e0..00000000000
--- a/devel/rt3/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/09/21 21:23:46 cube Exp $
-
---- html/Elements/Callback.orig	2004-07-29 02:08:11.000000000 +0200
-+++ html/Elements/Callback
-@@ -49,7 +49,7 @@ my (%cache, $check);
- <%init>
- # checks for inode change time for each callback directory
- my $new_check = join(
--    $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->resolver->comp_root_array
-+    $;, map { $_->[1] => (stat("$_->[1]/Callbacks"))[10] } $m->interp->comp_root_array
- ) or return;
- 
- $Page = $m->callers(1)->path unless ($Page);
-@@ -64,8 +64,18 @@ else {
- 
- if (!$callbacks) {
-     my $path = "/Callbacks/*$Page/$_CallbackName";
--    $callbacks = [ $m->interp->resolver->glob_path($path) ];
--    @$callbacks = grep !/^\.|~$/, @$callbacks; #skip backup files
-+
-+    my @roots = map { $_->[1] } $m->interp->comp_root_array;
-+    my %seen;
-+
-+    for my $root (@roots) {
-+            push @$callbacks,
-+            # Skip backup files, files without a leading package name,
-+            # and files we've already seen
-+            grep {     !/^\.|~$/
-+                   and not $seen{$_}++ }
-+                 $m->interp->resolver->glob_path($path, $root);
-+    }
- 
-     #skip files without a package
-     my $invalid_base = "/Callbacks/$Page/$_CallbackName";
diff --git a/devel/rt3/patches/patch-ac b/devel/rt3/patches/patch-ac
new file mode 100644
index 00000000000..e6909f38631
--- /dev/null
+++ b/devel/rt3/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/05/01 09:38:08 cube Exp $
+
+--- configure.orig	2006-04-19 19:37:22.000000000 +0200
++++ configure
+@@ -2039,7 +2039,7 @@ if test "${with_my_user_group+set}" = se
+ fi;
+ 
+ # Test for valid database names
+-if  test "$DB_TYPE" == "mysql" ; then
++if  test "$DB_TYPE" = "mysql" ; then
+    echo "$as_me:$LINENO: checking if database name is valid" >&5
+ echo $ECHO_N "checking if database name is valid... $ECHO_C" >&6
+           if  echo $DB_DATABASE | $AWK '/-/ { exit 1 }' ; then