4 files changed, 48 insertions, 9 deletions

diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 0df162fde00e..40fc795dd0d1 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rt
-PORTVERSION=	4.0.11
+PORTVERSION=	4.0.12
 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/distinfo b/www/rt40/distinfo
index bdbcff79b618..4bb5187ecf3b 100644
--- a/www/rt40/distinfo
+++ b/www/rt40/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rt-4.0.11.tar.gz) = 7f310de457c61d044efdda42c8231c12b12c3400f03565910a758a1b95602789
-SIZE (rt-4.0.11.tar.gz) = 7948210
+SHA256 (rt-4.0.12.tar.gz) = ce246da3c5f03144d3070a2419ccc0756496501f143f343b52b96cb2adec09da
+SIZE (rt-4.0.12.tar.gz) = 6895082
diff --git a/www/rt40/files/patch-Makefile.in b/www/rt40/files/patch-Makefile.in
index 0f7b7d550db7..7e7b1e31e531 100644
--- a/www/rt40/files/patch-Makefile.in
+++ b/www/rt40/files/patch-Makefile.in
@@ -1,6 +1,9 @@
---- Makefile.in.orig	2011-08-12 16:41:09.000000000 +0200
-+++ Makefile.in	2011-10-04 17:54:32.000000000 +0200
-@@ -58,7 +58,7 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -59,7 +59,7 @@
  
  CONFIG_FILE_PATH	=	@CONFIG_FILE_PATH_R@
  CONFIG_FILE		=	$(CONFIG_FILE_PATH)/RT_Config.pm
@@ -9,7 +12,7 @@
  
  
  RT_VERSION_MAJOR	=	@RT_VERSION_MAJOR@
-@@ -108,7 +108,7 @@
+@@ -109,7 +109,7 @@
  RT_FONT_PATH		=	@RT_FONT_PATH_R@
  RT_LEXICON_PATH		=	@RT_LEXICON_PATH_R@
  RT_LOCAL_PATH		=	@RT_LOCAL_PATH_R@
@@ -18,7 +21,7 @@
  LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH_R@
  LOCAL_LIB_PATH		=	@LOCAL_LIB_PATH_R@
  LOCAL_LEXICON_PATH	=	@LOCAL_LEXICON_PATH_R@
-@@ -265,16 +265,13 @@
+@@ -269,16 +269,13 @@
  depends: fixdeps
  
  fixdeps:
@@ -36,7 +39,22 @@
  
  
  	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
-@@ -337,7 +334,7 @@
+@@ -300,14 +297,6 @@
+ 	# Make the system binaries executable also
+ 	cd $(DESTDIR)$(RT_SBIN_PATH) && ( chmod 0755 $(SYSTEM_BINARIES) ; chown $(BIN_OWNER) $(SYSTEM_BINARIES);  chgrp $(RTGROUP) $(SYSTEM_BINARIES))
+ 
+-	# Make upgrade scripts executable if they are in the source.
+-	#
+-	# Note that we use the deprecated (by GNU/POSIX find) -perm +0NNN syntax
+-	# instead of -perm /0NNN since BSD find doesn't support the latter.
+-	( cd etc/upgrade && find . -type f -not -name '*.in' -perm +0111 -print ) | while read file ; do \
+-		chmod a+x "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
+-	done
+-
+ 	# Make the web ui readable by all. 
+ 	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)$(MASON_HTML_PATH) \
+ 					$(DESTDIR)$(MASON_LOCAL_HTML_PATH) \
+@@ -348,7 +337,7 @@
  
  install: testdeps config-install dirs files-install fixperms instruct
  
@@ -45,3 +63,17 @@
  
  config-install:
  @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
+@@ -435,13 +424,6 @@
+ @COMMENT_INPLACE_LAYOUT@	for file in $(ETC_FILES) ; do \
+ @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
+ @COMMENT_INPLACE_LAYOUT@	done
+-@COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_ETC_PATH)/upgrade ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)/upgrade
+-@COMMENT_INPLACE_LAYOUT@	-( cd etc/upgrade && find . -type d -print ) | while read dir ; do \
+-@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$dir" ; \
+-@COMMENT_INPLACE_LAYOUT@	done
+-@COMMENT_INPLACE_LAYOUT@	-( cd etc/upgrade && find . -type f -not -name '*.in' -print ) | while read file ; do \
+-@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "etc/upgrade/$$file" "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
+-@COMMENT_INPLACE_LAYOUT@	done
+ 
+ 
+ sbin-install:
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index dc0d9fdeb8b9..378b96944b2b 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -87,6 +87,7 @@ etc/rt40/schema.mysql
 %%SITE_PERL%%/RT/I18N.pm
 %%SITE_PERL%%/RT/I18N/cs.pm
 %%SITE_PERL%%/RT/I18N/de.pm
+%%SITE_PERL%%/RT/I18N/fr.pm
 %%SITE_PERL%%/RT/I18N/i_default.pm
 %%SITE_PERL%%/RT/I18N/ru.pm
 %%SITE_PERL%%/RT/Installer.pm
@@ -345,6 +346,9 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.6/content
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.6/schema.mysql
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.9/content
+%%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.12/schema.Pg
+%%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.12/schema.mysql
+%%PORTDOCS%%%%DOCSDIR%%/upgrade/4.0.12/schema.Oracle
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/generate-rtaddressregexp
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/sanity-check-stylesheets.pl
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/shrink_cgm_table.pl
@@ -668,9 +672,11 @@ share/rt40/html/Helpers/Autocomplete/CustomFieldValues
 share/rt40/html/Helpers/Autocomplete/Groups
 share/rt40/html/Helpers/Autocomplete/Owners
 share/rt40/html/Helpers/Autocomplete/Users
+share/rt40/html/Helpers/Autocomplete/autohandler
 share/rt40/html/Helpers/TicketHistory
 share/rt40/html/Helpers/Toggle/ShowRequestor
 share/rt40/html/Helpers/Toggle/TicketBookmark
+share/rt40/html/Helpers/autohandler
 share/rt40/html/Install/Basics.html
 share/rt40/html/Install/DatabaseDetails.html
 share/rt40/html/Install/DatabaseType.html
@@ -1649,6 +1655,7 @@ share/rt40/po/zh_TW.po
 @dirrm share/rt40/fonts
 @dirrmtry share/rt40/etc
 @dirrm share/rt40
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.12
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.9
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.6
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.4