3 files changed, 26 insertions, 28 deletions

diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index ed9c7aa999c2..8b6482a4325a 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	rt
-PORTVERSION?=	3.6.3
-PORTREVISION=	1
+PORTVERSION?=	3.6.4
+#PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES?=	http://download.bestpractical.com/pub/rt/release/ \
 		http://download.bestpractical.com/pub/rt/devel/ \
@@ -29,22 +29,17 @@ PERL_MODULES =	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \
 		${SITE_PERL}/HTML/Scrubber.pm:${PORTSDIR}/www/p5-HTML-Scrubber \
 		${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
-		${SITE_PERL}/HTTP/Server/Simple/Mason.pm:${PORTSDIR}/www/p5-HTTP-Server-Simple-Mason \
 		${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \
 		${SITE_PERL}/Locale/Maketext/Fuzzy.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Fuzzy \
 		${SITE_PERL}/Locale/Maketext/Lexicon.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
 		${SITE_PERL}/Log/Dispatch.pm:${PORTSDIR}/devel/p5-Log-Dispatch \
 		${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-		${SITE_PERL}/Module/Refresh.pm:${PORTSDIR}/devel/p5-Module-Refresh \
 		${SITE_PERL}/Module/Versions/Report.pm:${PORTSDIR}/devel/p5-Module-Versions-Report \
-		${SITE_PERL}/MLDBM.pm:${PORTSDIR}/databases/p5-MLDBM \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/Regexp/Common.pm:${PORTSDIR}/textproc/p5-Regexp-Common \
 		${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 \
@@ -53,18 +48,14 @@ PERL_MODULES =	${APXS}:${PORTSDIR}/${APACHE_PORT} \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${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/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 \
 		${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
+		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/UNIVERSAL/require.pm:${PORTSDIR}/devel/p5-UNIVERSAL-require
 
-BUILD_DEPENDS+=	${PERL_MODULES}
-RUN_DEPENDS+=	${PERL_MODULES}
-
 LATEST_LINK=	rt36
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
@@ -90,21 +81,21 @@ CONFIGURE_ARGS=	--prefix=${RT_PATH} \
 
 .if defined(WITH_FASTCGI)
 .if defined(WITH_APACHE2)
-BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+PERL_MODULES+=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
+PERL_MODULES+=	${LOCALBASE}/libexec/apache/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
 .endif
-BUILD_DEPENDS+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
+PERL_MODULES+=		${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 .else
-BUILD_DEPENDS+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
+PERL_MODULES+=	${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI
 .if defined(WITH_APACHE2)
-BUILD_DEPENDS+=	${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
+PERL_MODULES+=	${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
 DEPENDS_ARGS+=	WITHOUT_MODPERL=yes
 DEPENDS_ARGS+=	WITH_MODPERL2=yes
 .else
 # XXX - probe for static mod_perl using `httpd -l | grep perl`
-BUILD_DEPENDS+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl \
+PERL_MODULES+=	${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
 .endif
 .endif
@@ -115,20 +106,23 @@ EXTRA_PATCHES+=	${FILESDIR}/multiple*
 DB_TYPE?=	mysql
 
 .if ${DB_TYPE} == "Oracle"
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Oracle.pm:${PORTSDIR}/databases/p5-DBD-Oracle
+PERL_MODULES+=	${SITE_PERL}/${PERL_ARCH}/DBD/Oracle.pm:${PORTSDIR}/databases/p5-DBD-Oracle
 .else
 .if ${DB_TYPE} == "Pg"
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+PERL_MODULES+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .else
 .if ${DB_TYPE} == "SQLite"
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
+PERL_MODULES+=	${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
 .else
 DB_TYPE=	mysql
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+PERL_MODULES+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 .endif
 .endif
 
+BUILD_DEPENDS+=	${PERL_MODULES}
+RUN_DEPENDS+=	${PERL_MODULES}
+
 USE_PERL5=	yes
 RT_PATH?=	${PREFIX}/rt3
 PLIST_SUB=	RT_PATH=${RT_PATH}  RTPLIST=${RT_PATH:S/^${PREFIX}\///}
diff --git a/www/rt36/distinfo b/www/rt36/distinfo
index 0c4bef34f539..7d8341682b6b 100644
--- a/www/rt36/distinfo
+++ b/www/rt36/distinfo
@@ -1,6 +1,6 @@
-MD5 (rt-3.6.3.tar.gz) = d6b2fa930441f16b6530aa00665eb8c7
-SHA256 (rt-3.6.3.tar.gz) = fc29f1fd95b3cd4813e3fbdef1882e8cd6c4516c66b3e78237272bdd200a1a67
-SIZE (rt-3.6.3.tar.gz) = 1602818
-MD5 (rt-3.6.3.tar.gz.sig) = 63bc8bd88d3edf384c6d42558ae79b87
-SHA256 (rt-3.6.3.tar.gz.sig) = a30b40b7e4939b7eee9503144a062d97a019da5cd8730c90e5e4b7711c009bf1
-SIZE (rt-3.6.3.tar.gz.sig) = 64
+MD5 (rt-3.6.4.tar.gz) = b7a42c308a07b1f7a496d4d816bb87cc
+SHA256 (rt-3.6.4.tar.gz) = c26b3f261639d5237d1f89d986dee3517f4a1aa32523f670aed9b66cf0fc52d6
+SIZE (rt-3.6.4.tar.gz) = 1689581
+MD5 (rt-3.6.4.tar.gz.sig) = 74bf36584c34db8cd4c0b5425ccba92e
+SHA256 (rt-3.6.4.tar.gz.sig) = 2f321e5b27ed5a685a0bf8772118958ca062db202c42cfcc62d7e052c6cc822b
+SIZE (rt-3.6.4.tar.gz.sig) = 65
diff --git a/www/rt36/pkg-plist b/www/rt36/pkg-plist
index bd97a4edc7a4..6d7f882627dc 100644
--- a/www/rt36/pkg-plist
+++ b/www/rt36/pkg-plist
@@ -105,6 +105,8 @@
 %%RTPLIST%%/lib/RT/I18N/pl.po
 %%RTPLIST%%/lib/RT/I18N/pt_br.po
 %%RTPLIST%%/lib/RT/I18N/ru.po
+%%RTPLIST%%/lib/RT/I18N/sv.po
+%%RTPLIST%%/lib/RT/I18N/tr.po
 %%RTPLIST%%/lib/RT/I18N/zh_cn.po
 %%RTPLIST%%/lib/RT/I18N/zh_tw.po
 %%RTPLIST%%/lib/RT/Interface/CLI.pm
@@ -512,6 +514,7 @@
 %%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/transaction/default
 %%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
@@ -655,6 +658,7 @@
 @dirrm %%RTPLIST%%/share/html/REST/1.0/search
 @dirrm %%RTPLIST%%/share/html/REST/1.0/NoAuth
 @dirrm %%RTPLIST%%/share/html/REST/1.0/Forms/user
+@dirrm %%RTPLIST%%/share/html/REST/1.0/Forms/transaction
 @dirrm %%RTPLIST%%/share/html/REST/1.0/Forms/ticket
 @dirrm %%RTPLIST%%/share/html/REST/1.0/Forms/queue
 @dirrm %%RTPLIST%%/share/html/REST/1.0/Forms