4 files changed, 157 insertions, 139 deletions

diff --git a/devel/otrs/Makefile b/devel/otrs/Makefile
index 00f002008ab9..171dbde6ad47 100644
--- a/devel/otrs/Makefile
+++ b/devel/otrs/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	otrs
-PORTVERSION=	2.1.7
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.otrs.org/pub/otrs/ \
 		ftp://ftp.samurai.com/pub/otrs/ \
 		http://ftp.gwdg.de/pub/misc/otrs/ \
 		http://mirror.xaranet.de/otrs/
 
-MAINTAINER=	snb@threerings.net
+MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Open Ticket Request System
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+		${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff \
 		${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/Date/Pcalc.pm:${PORTSDIR}/devel/p5-Date-Pcalc \
@@ -27,10 +27,12 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/Net/POP3.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
 		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/PDF/API2.pm:${PORTSDIR}/textproc/p5-PDF-API2 \
+		${SITE_PERL}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \
 		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -54,11 +56,11 @@ PM_DIRS_LIST=	Kernel Kernel/Config Kernel/Config/Files Kernel/Language \
 		Kernel/Output/HTML/Standard System System/Auth System/AuthSession \
 		System/Crypt System/CustomerAuth System/CustomerUser \
 		System/CustomerUser/ System/
-DOCS_DIRS_LIST=	"" manual/en/pdf
+DOCS_DIRS_LIST=	"" manual/en
 DOCS_FILES_LIST=	C* INSTALL RE* TODO UPGRADING
 
 SCRIPTS_DIRS_LIST=	"" database test tools
-CLEAN_CPAN_DIRS=	Authen Date Email IO Mail MIME XML auto
+CLEAN_CPAN_DIRS=	Algorithm Authen Crypt Date Email IO Mail MIME Text XML auto
 CLEAN_FILES=	scripts/apache2-httpd.include.conf scripts/suse* \
 		scripts/redhat* scripts/DBUpdate*
 
@@ -66,10 +68,6 @@ USE_APACHE=	YES
 
 .include <bsd.port.pre.mk>
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=	perl 5.6 or newer required. Install lang/perl5.8 or lang/perl5 and try again
-.endif
-
 .ifdef WITH_MYSQL
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 USE_MYSQL=	yes
@@ -155,4 +153,10 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
+x-generate-plist:
+	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+	| ${SED} -E '\
+		s=share/doc/${PORTNAME}=%%DOCSDIR%%=; \
+	')> temp-pkg-plist
+
 .include <bsd.port.post.mk>
diff --git a/devel/otrs/distinfo b/devel/otrs/distinfo
index 94c10c583bca..a207bedce5f4 100644
--- a/devel/otrs/distinfo
+++ b/devel/otrs/distinfo
@@ -1,3 +1,3 @@
-MD5 (otrs-2.1.7.tar.gz) = 2646432d4d00bbe5e5284e4f242a553a
-SHA256 (otrs-2.1.7.tar.gz) = 881abeb102b7ca0bc793ea3764266c82deb264a657e5115c6abf0b996322eb20
-SIZE (otrs-2.1.7.tar.gz) = 13078593
+MD5 (otrs-2.2.1.tar.gz) = df6d53895b6303fb7bbc2f1db189a257
+SHA256 (otrs-2.2.1.tar.gz) = aba818433e0ace2c0db8d1421396ebeceed935cbae05b9bbb266f4a0d6da4682
+SIZE (otrs-2.2.1.tar.gz) = 13008818
diff --git a/devel/otrs/files/pkg-message.in b/devel/otrs/files/pkg-message.in
index a2efd85d32d3..0b20fa957fba 100644
--- a/devel/otrs/files/pkg-message.in
+++ b/devel/otrs/files/pkg-message.in
@@ -3,7 +3,7 @@ OTRS is now installed.
 
 The rest of installation must be completed manually.
 
-Please see http://doc.otrs.org/2.1/en/html/ and/or documentation in 
+Please see http://doc.otrs.org/2.2/en/html/ and/or documentation in 
 %%DOCSDIR%% for further instructions, particularly regarding 
 configuring your web server, database, cron scripts, and receiving emails.
 
diff --git a/devel/otrs/pkg-plist b/devel/otrs/pkg-plist
index fb3a06e30272..b36133ef306e 100644
--- a/devel/otrs/pkg-plist
+++ b/devel/otrs/pkg-plist
@@ -3,6 +3,7 @@ otrs/.mailfilter.dist
 otrs/.procmailrc.dist
 otrs/RELEASE
 otrs/bin/CheckDB.pl
+otrs/bin/CheckSum.pl
 otrs/bin/CleanUp.pl
 otrs/bin/Cron.sh
 otrs/bin/Cron4Win32.pl
@@ -17,11 +18,13 @@ otrs/bin/PostMasterPOP3.pl
 otrs/bin/RebuildTicketIndex.pl
 otrs/bin/SetPermissions.sh
 otrs/bin/StatsExportToOPM.pl
+otrs/bin/UnitTest.pl
 otrs/bin/UnlockTickets.pl
 otrs/bin/XMLMaster.pl
 otrs/bin/mkStats.pl
 otrs/bin/opm.pl
 otrs/bin/otrs.CreateNewTranslationFile
+otrs/bin/otrs.RebuildConfig.pl
 otrs/bin/otrs.addGroup
 otrs/bin/otrs.addQueue
 otrs/bin/otrs.addStdResponse2Queue
@@ -35,8 +38,6 @@ otrs/bin/otrs.getTicketThread
 otrs/bin/otrs.getUserID
 otrs/bin/otrs.setPassword
 otrs/bin/xml2sql.pl
-otrs/bin/CheckSum.pl
-otrs/bin/UnitTest.pl
 otrs/bin/cgi-bin/customer.pl
 otrs/bin/cgi-bin/index.pl
 otrs/bin/cgi-bin/installer.pl
@@ -54,28 +55,32 @@ otrs/scripts/apache2-perl-startup.pl
 otrs/scripts/auto_build.sh
 otrs/scripts/auto_docbuild.sh
 otrs/scripts/backup.pl
-otrs/scripts/login.php
-otrs/scripts/login.pl
-otrs/scripts/restore.pl
-otrs/scripts/sync_node.sh
-otrs/scripts/syncuser_csv2otrs.pl
-otrs/scripts/webform.pl
-otrs/scripts/rpc-examlple.pl
-otrs/scripts/database/initial_insert.sapdb.sql
-otrs/scripts/database/initial_insert.sql
+otrs/scripts/database/otrs-initial_insert.db2.sql
+otrs/scripts/database/otrs-initial_insert.maxdb.sql
+otrs/scripts/database/otrs-initial_insert.mssql.sql
+otrs/scripts/database/otrs-initial_insert.mysql.sql
+otrs/scripts/database/otrs-initial_insert.oracle.sql
+otrs/scripts/database/otrs-initial_insert.postgresql.sql
+otrs/scripts/database/otrs-initial_insert.xml
 otrs/scripts/database/otrs-schema-post.db2.sql
 otrs/scripts/database/otrs-schema-post.maxdb.sql
+otrs/scripts/database/otrs-schema-post.mssql.sql
 otrs/scripts/database/otrs-schema-post.mysql.sql
 otrs/scripts/database/otrs-schema-post.oracle.sql
 otrs/scripts/database/otrs-schema-post.postgresql.sql
 otrs/scripts/database/otrs-schema.db2.sql
 otrs/scripts/database/otrs-schema.maxdb.sql
+otrs/scripts/database/otrs-schema.mssql.sql
 otrs/scripts/database/otrs-schema.mysql.sql
 otrs/scripts/database/otrs-schema.oracle.sql
 otrs/scripts/database/otrs-schema.postgresql.sql
 otrs/scripts/database/otrs-schema.xml
-otrs/scripts/database/otrs-schema-post.mssql.sql
-otrs/scripts/database/otrs-schema.mssql.sql
+otrs/scripts/login.php
+otrs/scripts/login.pl
+otrs/scripts/restore.pl
+otrs/scripts/rpc-examlple.pl
+otrs/scripts/sync_node.sh
+otrs/scripts/syncuser_csv2otrs.pl
 otrs/scripts/test/CustomerBackend.pl
 otrs/scripts/test/CustomerUserAuth.pl
 otrs/scripts/test/TicketHistoryState.pl
@@ -83,8 +88,10 @@ otrs/scripts/test/UserAuth.pl
 otrs/scripts/tools/base64.pl
 otrs/scripts/tools/charset-convert.pl
 otrs/scripts/tools/compress-mail.pl
+otrs/scripts/tools/convert_db_to_utf8.pl
 otrs/scripts/tools/sync-ldap2db.pl
 otrs/scripts/tools/xml2html.pl
+otrs/scripts/webform.pl
 otrs/var/logo-otrs.png
 otrs/var/cron/aaa_base.dist
 otrs/var/cron/fetchmail.dist
@@ -113,6 +120,7 @@ otrs/var/httpd/htdocs/images/Standard/down-small.png
 otrs/var/httpd/htdocs/images/Standard/down.png
 otrs/var/httpd/htdocs/images/Standard/edit.png
 otrs/var/httpd/htdocs/images/Standard/edittrash.png
+otrs/var/httpd/htdocs/images/Standard/empty.png
 otrs/var/httpd/htdocs/images/Standard/error.png
 otrs/var/httpd/htdocs/images/Standard/exit.png
 otrs/var/httpd/htdocs/images/Standard/fileopen.png
@@ -132,6 +140,7 @@ otrs/var/httpd/htdocs/images/Standard/home.png
 otrs/var/httpd/htdocs/images/Standard/import-s.png
 otrs/var/httpd/htdocs/images/Standard/import-sw-s.png
 otrs/var/httpd/htdocs/images/Standard/import.png
+otrs/var/httpd/htdocs/images/Standard/installer-start.png
 otrs/var/httpd/htdocs/images/Standard/installer.png
 otrs/var/httpd/htdocs/images/Standard/installer1.png
 otrs/var/httpd/htdocs/images/Standard/installer2.png
@@ -150,6 +159,7 @@ otrs/var/httpd/htdocs/images/Standard/network_local.png
 otrs/var/httpd/htdocs/images/Standard/new-message.png
 otrs/var/httpd/htdocs/images/Standard/new.png
 otrs/var/httpd/htdocs/images/Standard/note.png
+otrs/var/httpd/htdocs/images/Standard/notready-sw.png
 otrs/var/httpd/htdocs/images/Standard/notready.png
 otrs/var/httpd/htdocs/images/Standard/overview.png
 otrs/var/httpd/htdocs/images/Standard/personal.png
@@ -176,15 +186,12 @@ otrs/var/httpd/htdocs/images/Standard/up-big.png
 otrs/var/httpd/htdocs/images/Standard/up-small.png
 otrs/var/httpd/htdocs/images/Standard/up.png
 otrs/var/httpd/htdocs/images/Standard/warning.png
-otrs/var/httpd/htdocs/images/Standard/zoom.png
-otrs/var/httpd/htdocs/images/Standard/empty.png
-otrs/var/httpd/htdocs/images/Standard/notready-sw.png
 otrs/var/httpd/htdocs/images/Standard/watcher.png
+otrs/var/httpd/htdocs/images/Standard/zoom.png
 @unexec [ -s %D/otrs/var/log/TicketCounter.log ] || rm -f %D/otrs/var/log/TicketCounter.log
 @unexec if cmp -s %D/otrs/Kernel/Config.pm %D/otrs/Kernel/Config.pm.dist; then rm -f %D/otrs/Kernel/Config.pm; fi
 otrs/Kernel/Config.pm.dist
 @exec [ -f %B/Config.pm ] || cp %B/%f %B/Config.pm
-otrs/Kernel/Language.pm
 otrs/Kernel/Config/Defaults.pm
 @unexec if cmp -s %D/otrs/Kernel/Config/GenericAgent.pm %D/otrs/Kernel/Config/GenericAgent.pm.dist; then rm -f %D/otrs/Kernel/Config/GenericAgent.pm; fi
 otrs/Kernel/Config/GenericAgent.pm.dist
@@ -192,12 +199,17 @@ otrs/Kernel/Config/GenericAgent.pm.dist
 otrs/Kernel/Config/GenericAgent.pm.examples
 otrs/Kernel/Config/Files/Framework.xml
 otrs/Kernel/Config/Files/Ticket.xml
+otrs/Kernel/Language.pm
+otrs/Kernel/Language/ar_SA.pm
 otrs/Kernel/Language/bb.pm
 otrs/Kernel/Language/bg.pm
 otrs/Kernel/Language/cz.pm
+otrs/Kernel/Language/da.pm
 otrs/Kernel/Language/de.pm
+otrs/Kernel/Language/el.pm
 otrs/Kernel/Language/en.pm
 otrs/Kernel/Language/es.pm
+otrs/Kernel/Language/fa.pm
 otrs/Kernel/Language/fi.pm
 otrs/Kernel/Language/fr.pm
 otrs/Kernel/Language/hu.pm
@@ -208,27 +220,28 @@ otrs/Kernel/Language/pl.pm
 otrs/Kernel/Language/pt.pm
 otrs/Kernel/Language/pt_BR.pm
 otrs/Kernel/Language/ru.pm
+otrs/Kernel/Language/sk_SK.pm
 otrs/Kernel/Language/sv.pm
 otrs/Kernel/Language/xx_AgentZoom.pm
 otrs/Kernel/Language/xx_Custom.pm
 otrs/Kernel/Language/zh_CN.pm
-otrs/Kernel/Language/da.pm
-otrs/Kernel/Language/el.pm
-otrs/Kernel/Language/fa.pm
-otrs/Kernel/Language/sk_SK.pm
 otrs/Kernel/Modules/Admin.pm
 otrs/Kernel/Modules/AdminAttachment.pm
 otrs/Kernel/Modules/AdminAutoResponse.pm
+otrs/Kernel/Modules/AdminCustomerCompany.pm
 otrs/Kernel/Modules/AdminCustomerUser.pm
 otrs/Kernel/Modules/AdminCustomerUserGroup.pm
+otrs/Kernel/Modules/AdminCustomerUserService.pm
 otrs/Kernel/Modules/AdminEmail.pm
 otrs/Kernel/Modules/AdminGenericAgent.pm
 otrs/Kernel/Modules/AdminGroup.pm
+otrs/Kernel/Modules/AdminInit.pm
 otrs/Kernel/Modules/AdminLog.pm
 otrs/Kernel/Modules/AdminNotification.pm
 otrs/Kernel/Modules/AdminPGP.pm
 otrs/Kernel/Modules/AdminPOP3.pm
 otrs/Kernel/Modules/AdminPackageManager.pm
+otrs/Kernel/Modules/AdminPerformanceLog.pm
 otrs/Kernel/Modules/AdminPostMasterFilter.pm
 otrs/Kernel/Modules/AdminQueue.pm
 otrs/Kernel/Modules/AdminQueueAutoResponse.pm
@@ -238,14 +251,17 @@ otrs/Kernel/Modules/AdminResponseAttachment.pm
 otrs/Kernel/Modules/AdminRole.pm
 otrs/Kernel/Modules/AdminRoleGroup.pm
 otrs/Kernel/Modules/AdminRoleUser.pm
+otrs/Kernel/Modules/AdminSLA.pm
 otrs/Kernel/Modules/AdminSMIME.pm
 otrs/Kernel/Modules/AdminSalutation.pm
 otrs/Kernel/Modules/AdminSelectBox.pm
+otrs/Kernel/Modules/AdminService.pm
 otrs/Kernel/Modules/AdminSession.pm
 otrs/Kernel/Modules/AdminSignature.pm
 otrs/Kernel/Modules/AdminState.pm
 otrs/Kernel/Modules/AdminSysConfig.pm
 otrs/Kernel/Modules/AdminSystemAddress.pm
+otrs/Kernel/Modules/AdminType.pm
 otrs/Kernel/Modules/AdminUser.pm
 otrs/Kernel/Modules/AdminUserGroup.pm
 otrs/Kernel/Modules/AgentBook.pm
@@ -255,6 +271,7 @@ otrs/Kernel/Modules/AgentLinkObject.pm
 otrs/Kernel/Modules/AgentLookup.pm
 otrs/Kernel/Modules/AgentPreferences.pm
 otrs/Kernel/Modules/AgentSpelling.pm
+otrs/Kernel/Modules/AgentStats.pm
 otrs/Kernel/Modules/AgentTicketAttachment.pm
 otrs/Kernel/Modules/AgentTicketBounce.pm
 otrs/Kernel/Modules/AgentTicketBulk.pm
@@ -274,12 +291,15 @@ otrs/Kernel/Modules/AgentTicketNote.pm
 otrs/Kernel/Modules/AgentTicketOwner.pm
 otrs/Kernel/Modules/AgentTicketPending.pm
 otrs/Kernel/Modules/AgentTicketPhone.pm
+otrs/Kernel/Modules/AgentTicketPhoneOutbound.pm
 otrs/Kernel/Modules/AgentTicketPlain.pm
 otrs/Kernel/Modules/AgentTicketPrint.pm
 otrs/Kernel/Modules/AgentTicketPriority.pm
 otrs/Kernel/Modules/AgentTicketQueue.pm
+otrs/Kernel/Modules/AgentTicketResponsible.pm
 otrs/Kernel/Modules/AgentTicketSearch.pm
 otrs/Kernel/Modules/AgentTicketStatusView.pm
+otrs/Kernel/Modules/AgentTicketWatcher.pm
 otrs/Kernel/Modules/AgentTicketZoom.pm
 otrs/Kernel/Modules/AgentZoom.pm
 otrs/Kernel/Modules/CustomerAccept.pm
@@ -288,19 +308,13 @@ otrs/Kernel/Modules/CustomerPreferences.pm
 otrs/Kernel/Modules/CustomerTicketAttachment.pm
 otrs/Kernel/Modules/CustomerTicketMessage.pm
 otrs/Kernel/Modules/CustomerTicketOverView.pm
+otrs/Kernel/Modules/CustomerTicketPrint.pm
 otrs/Kernel/Modules/CustomerTicketSearch.pm
 otrs/Kernel/Modules/CustomerTicketZoom.pm
 otrs/Kernel/Modules/CustomerZoom.pm
 otrs/Kernel/Modules/Installer.pm
-otrs/Kernel/Modules/Test.pm
-otrs/Kernel/Modules/AdminInit.pm
-otrs/Kernel/Modules/AdminPerformanceLog.pm
-otrs/Kernel/Modules/AgentStats.pm
-otrs/Kernel/Modules/AgentTicketPhoneOutbound.pm
-otrs/Kernel/Modules/AgentTicketResponsible.pm
-otrs/Kernel/Modules/AgentTicketWatcher.pm
-otrs/Kernel/Modules/CustomerTicketPrint.pm
 otrs/Kernel/Modules/PublicRepository.pm
+otrs/Kernel/Modules/Test.pm
 otrs/Kernel/Output/HTML/ArticleAttachmentDownload.pm
 otrs/Kernel/Output/HTML/ArticleAttachmentHTMLViewer.pm
 otrs/Kernel/Output/HTML/ArticleCheckPGP.pm
@@ -308,11 +322,27 @@ otrs/Kernel/Output/HTML/ArticleCheckSMIME.pm
 otrs/Kernel/Output/HTML/ArticleComposeCrypt.pm
 otrs/Kernel/Output/HTML/ArticleComposeSign.pm
 otrs/Kernel/Output/HTML/CustomerNewTicketQueueSelectionGeneric.pm
+otrs/Kernel/Output/HTML/Layout.pm
+otrs/Kernel/Output/HTML/LayoutTicket.pm
+otrs/Kernel/Output/HTML/Lite/AgentNavigationBar.dtl
+otrs/Kernel/Output/HTML/Lite/AgentTicketQueue.dtl
+otrs/Kernel/Output/HTML/Lite/Copyright.dtl
+otrs/Kernel/Output/HTML/Lite/Footer.dtl
+otrs/Kernel/Output/HTML/Lite/FooterSmall.dtl
+otrs/Kernel/Output/HTML/Lite/Header.dtl
+otrs/Kernel/Output/HTML/Lite/HeaderSmall.dtl
+otrs/Kernel/Output/HTML/Lite/Motd.dtl
+otrs/Kernel/Output/HTML/Lite/Notify.dtl
+otrs/Kernel/Output/HTML/Lite/Warning.dtl
+otrs/Kernel/Output/HTML/Lite/css.dtl
+otrs/Kernel/Output/HTML/Lite/customer-css.dtl
 otrs/Kernel/Output/HTML/NavBarLockedTickets.pm
 otrs/Kernel/Output/HTML/NavBarModuleAdmin.pm
 otrs/Kernel/Output/HTML/NavBarTicketBulkAction.pm
+otrs/Kernel/Output/HTML/NavBarTicketWatcher.pm
 otrs/Kernel/Output/HTML/NotificationAgentOnline.pm
 otrs/Kernel/Output/HTML/NotificationAgentTicket.pm
+otrs/Kernel/Output/HTML/NotificationAgentTicketEscalation.pm
 otrs/Kernel/Output/HTML/NotificationAgentTicketSeen.pm
 otrs/Kernel/Output/HTML/NotificationCharsetCheck.pm
 otrs/Kernel/Output/HTML/NotificationCustomerOnline.pm
@@ -325,37 +355,21 @@ otrs/Kernel/Output/HTML/PreferencesPGP.pm
 otrs/Kernel/Output/HTML/PreferencesPassword.pm
 otrs/Kernel/Output/HTML/PreferencesSMIME.pm
 otrs/Kernel/Output/HTML/PreferencesTheme.pm
-otrs/Kernel/Output/HTML/TicketMenuGeneric.pm
-otrs/Kernel/Output/HTML/TicketMenuLock.pm
-otrs/Kernel/Output/HTML/Layout.pm
-otrs/Kernel/Output/HTML/LayoutTicket.pm
-otrs/Kernel/Output/HTML/NavBarTicketWatcher.pm
 otrs/Kernel/Output/HTML/PreferencesTimeZone.pm
-otrs/Kernel/Output/HTML/TicketMenuResponsible.pm
-otrs/Kernel/Output/HTML/TicketMenuTicketWatcher.pm
-otrs/Kernel/Output/HTML/Lite/AgentNavigationBar.dtl
-otrs/Kernel/Output/HTML/Lite/AgentTicketQueue.dtl
-otrs/Kernel/Output/HTML/Lite/Copyright.dtl
-otrs/Kernel/Output/HTML/Lite/Footer.dtl
-otrs/Kernel/Output/HTML/Lite/FooterSmall.dtl
-otrs/Kernel/Output/HTML/Lite/Header.dtl
-otrs/Kernel/Output/HTML/Lite/HeaderSmall.dtl
-otrs/Kernel/Output/HTML/Lite/Motd.dtl
-otrs/Kernel/Output/HTML/Lite/Notify.dtl
-otrs/Kernel/Output/HTML/Lite/Warning.dtl
-otrs/Kernel/Output/HTML/Lite/css.dtl
-otrs/Kernel/Output/HTML/Lite/customer-css.dtl
 otrs/Kernel/Output/HTML/Standard/AAABase.dtl
 otrs/Kernel/Output/HTML/Standard/AAAMonth.dtl
 otrs/Kernel/Output/HTML/Standard/AAANavBar.dtl
 otrs/Kernel/Output/HTML/Standard/AAAPreferences.dtl
+otrs/Kernel/Output/HTML/Standard/AAAStats.dtl
 otrs/Kernel/Output/HTML/Standard/AAATicket.dtl
 otrs/Kernel/Output/HTML/Standard/AAAWeekDay.dtl
 otrs/Kernel/Output/HTML/Standard/AdminAttachmentForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminAutoResponseForm.dtl
+otrs/Kernel/Output/HTML/Standard/AdminCustomerCompanyForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminCustomerUserForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminCustomerUserGroupChangeForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminCustomerUserGroupForm.dtl
+otrs/Kernel/Output/HTML/Standard/AdminCustomerUserService.dtl
 otrs/Kernel/Output/HTML/Standard/AdminEmail.dtl
 otrs/Kernel/Output/HTML/Standard/AdminGenericAgent.dtl
 otrs/Kernel/Output/HTML/Standard/AdminGroupForm.dtl
@@ -363,7 +377,9 @@ otrs/Kernel/Output/HTML/Standard/AdminLog.dtl
 otrs/Kernel/Output/HTML/Standard/AdminNavigationBar.dtl
 otrs/Kernel/Output/HTML/Standard/AdminNotificationForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminPGPForm.dtl
+otrs/Kernel/Output/HTML/Standard/AdminPOP3.dtl
 otrs/Kernel/Output/HTML/Standard/AdminPackageManager.dtl
+otrs/Kernel/Output/HTML/Standard/AdminPerformanceLog.dtl
 otrs/Kernel/Output/HTML/Standard/AdminPostMasterFilter.dtl
 otrs/Kernel/Output/HTML/Standard/AdminQueueAutoResponseForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminQueueForm.dtl
@@ -377,15 +393,18 @@ otrs/Kernel/Output/HTML/Standard/AdminRoleGroupChangeForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminRoleGroupForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminRoleUserChangeForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminRoleUserForm.dtl
+otrs/Kernel/Output/HTML/Standard/AdminSLA.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSMIMEForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSalutationForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSelectBoxForm.dtl
+otrs/Kernel/Output/HTML/Standard/AdminService.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSession.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSignatureForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminStateForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSysConfig.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSysConfigEdit.dtl
 otrs/Kernel/Output/HTML/Standard/AdminSystemAddressForm.dtl
+otrs/Kernel/Output/HTML/Standard/AdminTypeForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminUserForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminUserGroupChangeForm.dtl
 otrs/Kernel/Output/HTML/Standard/AdminUserGroupForm.dtl
@@ -399,6 +418,15 @@ otrs/Kernel/Output/HTML/Standard/AgentLookup.dtl
 otrs/Kernel/Output/HTML/Standard/AgentNavigationBar.dtl
 otrs/Kernel/Output/HTML/Standard/AgentPreferencesForm.dtl
 otrs/Kernel/Output/HTML/Standard/AgentSpelling.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsDelete.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsEditRestrictions.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsEditSpecification.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsEditValueSeries.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsEditXaxis.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsImport.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsOverview.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsPrint.dtl
+otrs/Kernel/Output/HTML/Standard/AgentStatsView.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketBounce.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketBulk.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketClose.dtl
@@ -416,20 +444,22 @@ otrs/Kernel/Output/HTML/Standard/AgentTicketMove.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketNote.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketOwner.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketPending.dtl
+otrs/Kernel/Output/HTML/Standard/AgentTicketPhone.dtl
+otrs/Kernel/Output/HTML/Standard/AgentTicketPhoneOutbound.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketPlain.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketPrint.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketPriority.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketQueue.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketQueueTicketView.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketQueueTicketViewLite.dtl
+otrs/Kernel/Output/HTML/Standard/AgentTicketResponsible.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketSearch.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketSearchResult.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketSearchResultPrint.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketSearchResultShort.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketStatusView.dtl
 otrs/Kernel/Output/HTML/Standard/AgentTicketZoom.dtl
-otrs/Kernel/Output/HTML/Standard/AgentWindowTabStart.dtl
-otrs/Kernel/Output/HTML/Standard/AgentWindowTabStop.dtl
+otrs/Kernel/Output/HTML/Standard/AgentWindowTab.dtl
 otrs/Kernel/Output/HTML/Standard/Copyright.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerAccept.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerCalendarSmallIcon.dtl
@@ -443,6 +473,7 @@ otrs/Kernel/Output/HTML/Standard/CustomerNavigationBar.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerPreferencesForm.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerStatusView.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerTicketMessage.dtl
+otrs/Kernel/Output/HTML/Standard/CustomerTicketPrint.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerTicketSearch.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerTicketSearchResultCSV.dtl
 otrs/Kernel/Output/HTML/Standard/CustomerTicketSearchResultPrint.dtl
@@ -466,119 +497,105 @@ otrs/Kernel/Output/HTML/Standard/Test.dtl
 otrs/Kernel/Output/HTML/Standard/Warning.dtl
 otrs/Kernel/Output/HTML/Standard/css.dtl
 otrs/Kernel/Output/HTML/Standard/customer-css.dtl
-otrs/Kernel/Output/HTML/Standard/AAAStats.dtl
-otrs/Kernel/Output/HTML/Standard/AdminPOP3.dtl
-otrs/Kernel/Output/HTML/Standard/AdminPerformanceLog.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsDelete.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsEditRestrictions.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsEditSpecification.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsEditValueSeries.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsEditXaxis.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsImport.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsOverview.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsPrint.dtl
-otrs/Kernel/Output/HTML/Standard/AgentStatsView.dtl
-otrs/Kernel/Output/HTML/Standard/AgentTicketPhone.dtl
-otrs/Kernel/Output/HTML/Standard/AgentTicketPhoneOutbound.dtl
-otrs/Kernel/Output/HTML/Standard/AgentTicketResponsible.dtl
-otrs/Kernel/Output/HTML/Standard/AgentWindowTab.dtl
-otrs/Kernel/Output/HTML/Standard/CustomerTicketPrint.dtl
+otrs/Kernel/Output/HTML/TicketMenuGeneric.pm
+otrs/Kernel/Output/HTML/TicketMenuLock.pm
+otrs/Kernel/Output/HTML/TicketMenuResponsible.pm
+otrs/Kernel/Output/HTML/TicketMenuTicketWatcher.pm
 otrs/Kernel/System/Auth.pm
-otrs/Kernel/System/AuthSession.pm
-otrs/Kernel/System/AutoResponse.pm
-otrs/Kernel/System/CheckItem.pm
-otrs/Kernel/System/Config.pm
-otrs/Kernel/System/Crypt.pm
-otrs/Kernel/System/CustomerAuth.pm
-otrs/Kernel/System/CustomerGroup.pm
-otrs/Kernel/System/CustomerUser.pm
-otrs/Kernel/System/DB.pm
-otrs/Kernel/System/Email.pm
-otrs/Kernel/System/EmailParser.pm
-otrs/Kernel/System/Encode.pm
-otrs/Kernel/System/FileTemp.pm
-otrs/Kernel/System/GenericAgent.pm
-otrs/Kernel/System/Group.pm
-otrs/Kernel/System/LinkObject.pm
-otrs/Kernel/System/Lock.pm
-otrs/Kernel/System/Log.pm
-otrs/Kernel/System/Main.pm
-otrs/Kernel/System/Notification.pm
-otrs/Kernel/System/PID.pm
-otrs/Kernel/System/POP3Account.pm
-otrs/Kernel/System/Package.pm
-otrs/Kernel/System/Permission.pm
-otrs/Kernel/System/PostMaster.pm
-otrs/Kernel/System/Priority.pm
-otrs/Kernel/System/Queue.pm
-otrs/Kernel/System/SearchProfile.pm
-otrs/Kernel/System/Spelling.pm
-otrs/Kernel/System/State.pm
-otrs/Kernel/System/StdAttachment.pm
-otrs/Kernel/System/StdResponse.pm
-otrs/Kernel/System/SystemAddress.pm
-otrs/Kernel/System/Ticket.pm
-otrs/Kernel/System/Time.pm
-otrs/Kernel/System/User.pm
-otrs/Kernel/System/XML.pm
-otrs/Kernel/System/XMLMaster.pm
-otrs/Kernel/System/CSV.pm
-otrs/Kernel/System/DB/mssql.pm
-otrs/Kernel/System/PDF.pm
-otrs/Kernel/System/Stats.pm
-otrs/Kernel/System/UnitTest.pm
 otrs/Kernel/System/Auth/DB.pm
 otrs/Kernel/System/Auth/HTTPBasicAuth.pm
 otrs/Kernel/System/Auth/LDAP.pm
 otrs/Kernel/System/Auth/Radius.pm
+otrs/Kernel/System/AuthSession.pm
 otrs/Kernel/System/AuthSession/DB.pm
 otrs/Kernel/System/AuthSession/FS.pm
 otrs/Kernel/System/AuthSession/IPC.pm
+otrs/Kernel/System/AutoResponse.pm
+otrs/Kernel/System/CSV.pm
+otrs/Kernel/System/CheckItem.pm
+otrs/Kernel/System/Config.pm
+otrs/Kernel/System/Crypt.pm
 otrs/Kernel/System/Crypt/PGP.pm
 otrs/Kernel/System/Crypt/SMIME.pm
+otrs/Kernel/System/CustomerAuth.pm
 otrs/Kernel/System/CustomerAuth/DB.pm
 otrs/Kernel/System/CustomerAuth/HTTPBasicAuth.pm
 otrs/Kernel/System/CustomerAuth/LDAP.pm
 otrs/Kernel/System/CustomerAuth/Radius.pm
+otrs/Kernel/System/CustomerCompany.pm
+otrs/Kernel/System/CustomerGroup.pm
+otrs/Kernel/System/CustomerUser.pm
 otrs/Kernel/System/CustomerUser/DB.pm
 otrs/Kernel/System/CustomerUser/LDAP.pm
 otrs/Kernel/System/CustomerUser/Preferences/DB.pm
+otrs/Kernel/System/DB.pm
 otrs/Kernel/System/DB/db2.pm
 otrs/Kernel/System/DB/maxdb.pm
+otrs/Kernel/System/DB/mssql.pm
 otrs/Kernel/System/DB/mysql.pm
 otrs/Kernel/System/DB/oracle.pm
 otrs/Kernel/System/DB/postgresql.pm
+otrs/Kernel/System/Email.pm
 otrs/Kernel/System/Email/SMTP.pm
 otrs/Kernel/System/Email/Sendmail.pm
+otrs/Kernel/System/EmailParser.pm
+otrs/Kernel/System/Encode.pm
+otrs/Kernel/System/FileTemp.pm
+otrs/Kernel/System/GenericAgent.pm
 otrs/Kernel/System/GenericAgent/AutoPriorityIncrease.pm
 otrs/Kernel/System/GenericAgent/NotifyAgentGroupOfCustomQueue.pm
+otrs/Kernel/System/Group.pm
+otrs/Kernel/System/LinkObject.pm
 otrs/Kernel/System/LinkObject/Ticket.pm
+otrs/Kernel/System/Lock.pm
+otrs/Kernel/System/Log.pm
 otrs/Kernel/System/Log/File.pm
 otrs/Kernel/System/Log/SysLog.pm
+otrs/Kernel/System/Main.pm
+otrs/Kernel/System/Notification.pm
+otrs/Kernel/System/PDF.pm
+otrs/Kernel/System/PID.pm
+otrs/Kernel/System/POP3Account.pm
+otrs/Kernel/System/Package.pm
+otrs/Kernel/System/PostMaster.pm
 otrs/Kernel/System/PostMaster/DestQueue.pm
 otrs/Kernel/System/PostMaster/Filter.pm
-otrs/Kernel/System/PostMaster/FollowUp.pm
-otrs/Kernel/System/PostMaster/LoopProtection.pm
-otrs/Kernel/System/PostMaster/NewTicket.pm
-otrs/Kernel/System/PostMaster/Reject.pm
 otrs/Kernel/System/PostMaster/Filter/AgentInterface.pm
 otrs/Kernel/System/PostMaster/Filter/CMD.pm
 otrs/Kernel/System/PostMaster/Filter/Match.pm
 otrs/Kernel/System/PostMaster/Filter/MatchDBSource.pm
 otrs/Kernel/System/PostMaster/Filter/NewTicketReject.pm
+otrs/Kernel/System/PostMaster/FollowUp.pm
+otrs/Kernel/System/PostMaster/LoopProtection.pm
 otrs/Kernel/System/PostMaster/LoopProtection/DB.pm
 otrs/Kernel/System/PostMaster/LoopProtection/FS.pm
+otrs/Kernel/System/PostMaster/NewTicket.pm
+otrs/Kernel/System/PostMaster/Reject.pm
+otrs/Kernel/System/Priority.pm
+otrs/Kernel/System/Queue.pm
+otrs/Kernel/System/SLA.pm
+otrs/Kernel/System/Salutation.pm
+otrs/Kernel/System/SearchProfile.pm
+otrs/Kernel/System/Service.pm
+otrs/Kernel/System/Signature.pm
+otrs/Kernel/System/Spelling.pm
+otrs/Kernel/System/State.pm
+otrs/Kernel/System/Stats.pm
 otrs/Kernel/System/Stats/Dynamic/Ticket.pm
+otrs/Kernel/System/StdAttachment.pm
+otrs/Kernel/System/StdResponse.pm
+otrs/Kernel/System/SystemAddress.pm
+otrs/Kernel/System/Ticket.pm
 otrs/Kernel/System/Ticket/Article.pm
 otrs/Kernel/System/Ticket/ArticleStorageDB.pm
 otrs/Kernel/System/Ticket/ArticleStorageFS.pm
 otrs/Kernel/System/Ticket/CustomerPermission/CustomerIDCheck.pm
 otrs/Kernel/System/Ticket/CustomerPermission/CustomerUserIDCheck.pm
 otrs/Kernel/System/Ticket/CustomerPermission/GroupCheck.pm
-otrs/Kernel/System/Ticket/Event/Test.pm
 otrs/Kernel/System/Ticket/Event/ForceOwnerReset.pm
 otrs/Kernel/System/Ticket/Event/ForceState.pm
 otrs/Kernel/System/Ticket/Event/ForceUnlock.pm
+otrs/Kernel/System/Ticket/Event/Test.pm
 otrs/Kernel/System/Ticket/Event/TicketFreeFieldDefault.pm
 otrs/Kernel/System/Ticket/IndexAccelerator/RuntimeDB.pm
 otrs/Kernel/System/Ticket/IndexAccelerator/StaticDB.pm
@@ -589,7 +606,12 @@ otrs/Kernel/System/Ticket/Number/Random.pm
 otrs/Kernel/System/Ticket/Permission/GroupCheck.pm
 otrs/Kernel/System/Ticket/Permission/OwnerCheck.pm
 otrs/Kernel/System/Ticket/Permission/ResponsibleCheck.pm
+otrs/Kernel/System/Time.pm
+otrs/Kernel/System/Type.pm
+otrs/Kernel/System/UnitTest.pm
+otrs/Kernel/System/User.pm
 otrs/Kernel/System/User/Preferences/DB.pm
+otrs/Kernel/System/Valid.pm
 otrs/Kernel/System/Web/InterfaceAgent.pm
 otrs/Kernel/System/Web/InterfaceCustomer.pm
 otrs/Kernel/System/Web/InterfacePublic.pm
@@ -597,17 +619,10 @@ otrs/Kernel/System/Web/Request.pm
 otrs/Kernel/System/Web/UploadCache.pm
 otrs/Kernel/System/Web/UploadCache/DB.pm
 otrs/Kernel/System/Web/UploadCache/FS.pm
+otrs/Kernel/System/XML.pm
+otrs/Kernel/System/XMLMaster.pm
 otrs/Kernel/cpan-lib/HTML/Safe.pm
-otrs/Kernel/cpan-lib/Algorithm/DiffOld.pm
-otrs/Kernel/cpan-lib/Algorithm/Diff.pm
-otrs/Kernel/cpan-lib/Crypt/PasswdMD5.pm
-otrs/Kernel/cpan-lib/Text/Diff/Table.pm
-otrs/Kernel/cpan-lib/Text/Diff.pm
-@dirrm otrs/Kernel/cpan-lib/Algorithm
-@dirrm otrs/Kernel/cpan-lib/Crypt
 @dirrm otrs/Kernel/cpan-lib/HTML
-@dirrm otrs/Kernel/cpan-lib/Text/Diff
-@dirrm otrs/Kernel/cpan-lib/Text
 @dirrm otrs/Kernel/cpan-lib
 @dirrm otrs/Kernel/System/XMLMaster
 @dirrm otrs/Kernel/System/Web/UploadCache
@@ -693,8 +708,7 @@ otrs/Kernel/cpan-lib/Text/Diff.pm
 %%PORTDOCS%%%%DOCSDIR%%/test-email-7-euro-iso-8859-15.box
 %%PORTDOCS%%%%DOCSDIR%%/test-email-8-bulgarian-cp1251.box
 %%PORTDOCS%%%%DOCSDIR%%/test-email-9-html-multicharset.box
-%%PORTDOCS%%%%DOCSDIR%%/manual/en/pdf/otrs_admin_book.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en/pdf
+%%PORTDOCS%%%%DOCSDIR%%/manual/en/otrs_admin_book.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%