4 files changed, 36 insertions, 22 deletions

diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 236c0f71f928..57352a3a8a65 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -11,8 +11,7 @@
 #   o install a sample into etc/apache22/Includes
 
 PORTNAME=	rt
-PORTVERSION=	4.0.4
-PORTREVISION=	1
+PORTVERSION=	4.0.5
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
@@ -24,14 +23,14 @@ COMMENT=	RT is an industrial-grade ticketing system written in Perl
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-noportdocs-Makefile.in
 .endif
 
-CONFLICTS=	rt-3.6* rt-3.8*
+CONFLICTS=	rt-3.8*
 LATEST_LINK=	rt40
 
 # See doc/web_deployment.pod for info on the choices of webserver /
-# webapp combinations.  Note: apache-1.3.x is no longer supported in
-# ports: apache-2.2+ is recommended.  For deployment with nginx, use
-# the SPAWN_FCGI method.  A standalone PSGI based webserver is always
-# available, but this is really only suitable for development usage.
+# webapp combinations.  Note: if using apache, apache-2.2+ is
+# recommended.  For deployment with nginx, use the SPAWN_FCGI method.
+# A standalone PSGI based webserver is always available, but this is
+# really only suitable for development usage.
 #
 # See doc/full_text_indexing.pod if you need to set up full text
 # indexes on your ticket database.  PostgreSQL or Oracle are
@@ -47,6 +46,7 @@ OPTIONS=	AP_MODPERL	"Deploy with apache and mod_perl"	on \
 		POSTGRESQL	"Enable PosgreSQL backend"		off \
 		ORACLE		"Enable Oracle backend"			off \
 		SQLITE		"Enable SQLite backend (dev only)"	off \
+		SSL_MAILGATE	"Enable HTTPS support for rt-mailgate"	off \
 		DEV 		"Configure for Developers"		off \
 		GPG		"Enable GnuPG support"			on \
 		GRAPHVIZ	"Enable GraphViz charts"		off \
@@ -160,25 +160,31 @@ IGNORE=	please select one of MYSQL, POSTGRESQL, ORACLE or SQLITE
 .if defined(WITH_DEV)
 BUILD_DEPENDS+=	${DEV_DEPS}
 RUN_DEPENDS+=	${DEV_DEPS}
-CONFIGURE_ARGS+=	"--enable-developer-mode"
+CONFIGURE_ARGS+=	--enable-developer-mode
+.endif
+
+.if defined(WITH_SSL_MAILGATE)
+BUILD_DEPENDS+=	${SSL_MAILGATE_DEPS}
+RUN_DEPENDS+=	${SSL_MAILGATE_DEPS}
+CONFIGURE_ARGS+=	--enable-ssl-mailgate
 .endif
 
 .if defined(WITH_GRAPHVIZ)
 BUILD_DEPENDS+=	${GRAPHVIZ_DEPS}
 RUN_DEPENDS+=	${GRAPHVIZ_DEPS}
-CONFIGURE_ARGS+=	"--enable-graphviz"
+CONFIGURE_ARGS+=	--enable-graphviz
 .endif
 
 .if defined(WITH_GPG)
 BUILD_DEPENDS+=	${GPG_DEPS}
 RUN_DEPENDS+=	${GPG_DEPS}
-CONFIGURE_ARGS+=	"--enable-gpg"
+CONFIGURE_ARGS+=	--enable-gpg
 .endif
 
 .if defined(WITH_GD)
 BUILD_DEPENDS+=	${GD_DEPS}
 RUN_DEPENDS+=	${GD_DEPS}
-configure_args+=	"--enable-gd"
+configure_args+=	--enable-gd
 .endif
 
 RT_ETC_PATH?=	${PREFIX}/etc/${PORTNAME}40
diff --git a/www/rt40/Makefile.cpan b/www/rt40/Makefile.cpan
index 025335c38e0b..452196ee3728 100644
--- a/www/rt40/Makefile.cpan
+++ b/www/rt40/Makefile.cpan
@@ -6,7 +6,7 @@
 ### Scalar::Util     1.18                 core
 ### Text::ParseWords 3.24                 core
 ### Term::ReadLine	 		  core
-### 
+###
 ### Digest::base                          core
 ### Time::HiRes                           core
 ### Errno                                 core
@@ -73,15 +73,19 @@ PSGI_DEPS=	p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI \
 
 MAILGATE_DEPS=	p5-HTML-Format>0:${PORTSDIR}/textproc/p5-HTML-Format \
 		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
-	
+		p5-libwww>6.0:${PORTSDIR}/www/p5-libwww
+
+SSL_MAILGATE_DEPS=	p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+		p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https \
+		p5-Mozilla-CA>0:${PORTSDIR}/www/p5-Mozilla-CA
+
 CLI_DEPS=	p5-HTTP-Message>0:${PORTSDIR}/www/p5-HTTP-Message \
 		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
 		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
 
 # ports to add:
 # Test::Email
-# Test::Builder >= 0.90 
+# Test::Builder >= 0.90
 # Plack::Middleware::Test::StashWarnings
 DEV_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract \
 		p5-HTML-Form>0:${PORTSDIR}/www/p5-HTML-Form \
@@ -105,7 +109,7 @@ FASTCGI_DEPS=	p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager \
 MODPERL2_DEPS=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2 \
 		p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI
 
-MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql 
+MYSQL_DEPS=	p5-DBD-mysql>=2.1018:${PORTSDIR}/databases/p5-DBD-mysql
 
 ORACLE_DEPS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle
 
@@ -128,6 +132,6 @@ GRAPHVIZ_DEPS=	p5-GraphViz>0:${PORTSDIR}/graphics/p5-GraphViz \
 
 GD_DEPS=	p5-GD>0:${PORTSDIR}/graphics/p5-GD \
 		p5-GD-Graph>0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>0:${PORTSDIR}/graphics/p5-GD-TextUtil 
+		p5-GD-TextUtil>0:${PORTSDIR}/graphics/p5-GD-TextUtil
 
 USERLOGO_DEPS=	p5-Convert-Color>0:${PORTSDIR}/graphics/p5-Convert-Color
diff --git a/www/rt40/distinfo b/www/rt40/distinfo
index 4a2ae50253b4..3549968bd281 100644
--- a/www/rt40/distinfo
+++ b/www/rt40/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rt-4.0.4.tar.gz) = 541e81d7d020caa1f089a353e8bf7076aef3c2938dcdd9055036a923142f8480
-SIZE (rt-4.0.4.tar.gz) = 5964551
+SHA256 (rt-4.0.5.tar.gz) = 280daadff11595fe4baa4f55544cedd26ada560b421c165bba45340fd6eaddb0
+SIZE (rt-4.0.5.tar.gz) = 5877387
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index ff8298a004d7..bc0a1fbe8693 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -238,6 +238,7 @@ sbin/standalone_httpd
 %%PORTDOCS%%%%DOCSDIR%%/glossary.pod
 %%PORTDOCS%%%%DOCSDIR%%/hacking.pod
 %%PORTDOCS%%%%DOCSDIR%%/network-diagram.svg
+%%PORTDOCS%%%%DOCSDIR%%/schema.dot
 %%PORTDOCS%%%%DOCSDIR%%/security.pod
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.1.0/acl.Oracle
 %%PORTDOCS%%%%DOCSDIR%%/upgrade/3.1.0/acl.Pg
@@ -1179,6 +1180,7 @@ share/rt40/html/Ticket/ModifyLinks.html
 share/rt40/html/Ticket/ModifyPeople.html
 share/rt40/html/Ticket/Reminders.html
 share/rt40/html/Ticket/ShowEmailRecord.html
+share/rt40/html/Ticket/autohandler
 share/rt40/html/Ticket/Update.html
 share/rt40/html/Tools/MyDay.html
 share/rt40/html/Tools/MyReminders.html
@@ -1215,9 +1217,9 @@ share/rt40/html/m/index.html
 share/rt40/html/m/login
 share/rt40/html/m/logout
 share/rt40/html/m/style.css
+share/rt40/html/m/ticket/autohandler
 share/rt40/html/m/ticket/create
 share/rt40/html/m/ticket/history
-share/rt40/html/m/ticket/modify
 share/rt40/html/m/ticket/reply
 share/rt40/html/m/ticket/select_create_queue
 share/rt40/html/m/ticket/show
@@ -1259,9 +1261,11 @@ share/rt40/po/zh_CN.po
 share/rt40/po/zh_TW.po
 @dirrmtry www/rt40
 @dirrm share/rt40/po
+@exec mkdir -p %D/share/rt40/etc
+@exec mkdir -p %D/share/rt40/lib
 @exec mkdir -p %D/share/rt40/plugins
 @dirrm share/rt40/plugins
-@dirrm share/rt40/lib
+@dirrmtry share/rt40/lib
 @dirrm share/rt40/html/m/tickets
 @dirrm share/rt40/html/m/ticket
 @dirrm share/rt40/html/m/_elements
@@ -1444,7 +1448,7 @@ share/rt40/po/zh_TW.po
 @dirrm share/rt40/html/Admin
 @dirrm share/rt40/html
 @dirrm share/rt40/fonts
-@dirrm share/rt40/etc
+@dirrmtry share/rt40/etc
 @dirrm share/rt40
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/upgrade/4.0.3