5 files changed, 26 insertions, 24 deletions

diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 96146a023ffa..4596f92dc2ca 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -12,8 +12,7 @@
 #   o install a sample into etc/apache22/Includes
 
 PORTNAME=	rt
-PORTVERSION=	3.8.4
-PORTREVISION=	1
+PORTVERSION=	3.8.6
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
diff --git a/www/rt40/Makefile.cpan b/www/rt40/Makefile.cpan
index 24c73f8eb5ac..f84723ae63fa 100644
--- a/www/rt40/Makefile.cpan
+++ b/www/rt40/Makefile.cpan
@@ -40,7 +40,8 @@ CORE_DEPS=	p5-Encode>=2.13:${PORTSDIR}/converters/p5-Encode \
 			${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 			${SITE_PERL}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper \
 			${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-			${SITE_PERL}/Test/Warn.pm:${PORTSDIR}/devel/p5-Test-Warn
+			${SITE_PERL}/Test/Warn.pm:${PORTSDIR}/devel/p5-Test-Warn \
+			p5-Parse-BooleanLogic>=0.09:${PORTSDIR}/textproc/p5-Parse-BooleanLogic
 
 DASHBOARD_DEPS=	p5-MIME-Types>=1.25:${PORTSDIR}/mail/p5-MIME-Types \
 			p5-HTML-RewriteAttributes>=0.02:${PORTSDIR}/textproc/p5-HTML-RewriteAttributes
diff --git a/www/rt40/distinfo b/www/rt40/distinfo
index ffa73fc97ded..d7a31122444c 100644
--- a/www/rt40/distinfo
+++ b/www/rt40/distinfo
@@ -1,3 +1,3 @@
-MD5 (rt-3.8.4.tar.gz) = cdfdbd954203a8bc2c663a6847218ccc
-SHA256 (rt-3.8.4.tar.gz) = 7fcbc56755e1f732c5dfaa59da921749820f0ca6deae7b4bde5c20acde9541ee
-SIZE (rt-3.8.4.tar.gz) = 3320207
+MD5 (rt-3.8.6.tar.gz) = 522f93e39c6978ba9f49efa00eb5621e
+SHA256 (rt-3.8.6.tar.gz) = d909c9695958c5fd020c3454a92730517e74c4fff1484ff291ad1eaebd746112
+SIZE (rt-3.8.6.tar.gz) = 3363499
diff --git a/www/rt40/files/patch-Makefile.in b/www/rt40/files/patch-Makefile.in
index 6e9a774fe097..b622e9aa2416 100644
--- a/www/rt40/files/patch-Makefile.in
+++ b/www/rt40/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2008-08-18 11:13:58.000000000 -0400
-+++ Makefile.in	2009-01-25 11:57:09.000000000 -0500
+--- Makefile.in.orig	2009-12-04 17:30:18.000000000 -0500
++++ Makefile.in	2009-12-04 17:33:01.000000000 -0500
 @@ -58,7 +58,7 @@
  
  CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH_R@
- CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_Config.pm
--SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
-+SITE_CONFIG_FILE		= 	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm-dist
+ CONFIG_FILE		=	$(CONFIG_FILE_PATH)/RT_Config.pm
+-SITE_CONFIG_FILE	=	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm
++SITE_CONFIG_FILE	=	$(CONFIG_FILE_PATH)/RT_SiteConfig.pm-dist
  
  
  RT_VERSION_MAJOR	=	@RT_VERSION_MAJOR@
@@ -13,21 +13,24 @@
  RT_VAR_PATH		=	@RT_VAR_PATH_R@
  RT_DOC_PATH		=	@RT_DOC_PATH_R@
  RT_LOCAL_PATH		=	@RT_LOCAL_PATH_R@
--LOCAL_PLUGIN_PATH		=	@RT_LOCAL_PATH_R@/plugins
-+LOCAL_PLUGIN_PATH		=	@RT_LOCAL_PATH_R@/share/rt38/plugins
+-LOCAL_PLUGIN_PATH	=	@RT_LOCAL_PATH_R@/plugins
++LOCAL_PLUGIN_PATH	=	@RT_LOCAL_PATH_R@/share/rt38/plugins
  LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH_R@
  LOCAL_LIB_PATH		=	@LOCAL_LIB_PATH_R@
  LOCAL_LEXICON_PATH	=	@LOCAL_LEXICON_PATH_R@
-@@ -283,7 +283,7 @@
+@@ -282,9 +282,9 @@
+ 	@echo "    $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
  
- upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
+ 
+-upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
++upgrade:  config-install dirs files-install fixperms upgrade-instruct
  
 -upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms
-+upgrade-noclobber: config-install dirs libs-install html-install bin-install doc-install
++upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install
  
  
  # {{{ dependencies
-@@ -301,14 +301,6 @@
+@@ -302,13 +302,6 @@
  
  # {{{ fixperms
  fixperms:
@@ -35,22 +38,21 @@
 -	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_PATH)
 -	chown -R $(LIBS_OWNER) $(DESTDIR)$(RT_LIB_PATH)
 -	chgrp -R $(LIBS_GROUP) $(DESTDIR)$(RT_LIB_PATH)
--	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)$(RT_LIB_PATH)
+-	chmod -R  u+rwX,go-w,go+rX $(DESTDIR)$(RT_LIB_PATH)
 -
 -
--	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
+ 	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
  
  	chmod 0755 $(DESTDIR)$(RT_ETC_PATH)
- 	cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES)
-@@ -361,9 +353,9 @@
+@@ -362,9 +355,9 @@
  	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
  # }}}
  
 -install: testdeps config-install dirs files-install fixperms instruct
-+install: config-install dirs files-install fixperms
++install: config-install dirs files-install fixperms instruct
  
 -files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
 +files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install
  
  config-install:
- @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)	
+ @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index aa071cb27c25..098998fdc2cf 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -303,6 +303,7 @@ share/rt38/html/Admin/Elements/PickCustomFields
 share/rt38/html/Admin/Elements/PickObjects
 share/rt38/html/Admin/Elements/QueueRightsForUser
 share/rt38/html/Admin/Elements/QueueTabs
+share/rt38/html/Admin/Elements/SelectCustomField
 share/rt38/html/Admin/Elements/SelectCustomFieldLookupType
 share/rt38/html/Admin/Elements/SelectCustomFieldType
 share/rt38/html/Admin/Elements/SelectGroups
@@ -388,7 +389,6 @@ share/rt38/html/Approvals/Elements/ShowDependency
 share/rt38/html/Approvals/Elements/Tabs
 share/rt38/html/Approvals/autohandler
 share/rt38/html/Approvals/index.html
-share/rt38/html/CalPopup.html
 share/rt38/html/Dashboards/Elements/DashboardsForObject
 share/rt38/html/Dashboards/Elements/DashboardsForObjects
 share/rt38/html/Dashboards/Elements/Deleted