Index: head/www/rt40/Makefile
===================================================================
--- head/www/rt40/Makefile	(revision 395566)
+++ head/www/rt40/Makefile	(revision 395567)
@@ -1,211 +1,218 @@
 # $FreeBSD$
 
 PORTNAME=	rt
 PORTVERSION=	4.0.24
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	40
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	RT is an industrial-grade ticketing system written in Perl
 
 CONFLICTS_INSTALL=	rt-3.8* rt42-4.2* brlcad-[0-9]*
 
 NO_ARCH=	yes
 
 # See doc/web_deployment.pod for info on the choices of webserver /
 # webapp combinations.  Note: if using apache, apache-2.2+ is
 # recommended.  For deployment with nginx, use the SPAWN_FCGI method
 # or the builtin webserver with a FCGI handler.
 #
 # The builtin standalone PSGI based webserver is always available, no
 # matter what choice of web deployment platform, or none, that you
 # make.  Best Practical state that this is really only suitable for
 # development usage, although I have heard reports of people using it
 # successfully for medium sized deployments.  If you only want the
 # builtin webserver, simply deselect all of the web options.
 #
 # See doc/full_text_indexing.pod if you need to set up full text
 # indexes on your ticket database.  PostgreSQL or Oracle are
 # recommended in this case: the MYSQL / SphinxSearch combination
 # mentioned in the docs is currently unsupported in the ports, but see
 # http://www.infracaninophile.co.uk/articles/sphinxse.html
 
 OPTIONS_DEFINE=		DEV GD GPG GRAPHVIZ SSL_MAILGATE DOCS
 OPTIONS_SINGLE=		DB
 OPTIONS_SINGLE_DB=	MYSQL ORACLE PGSQL SQLITE
 OPTIONS_RADIO=		WEB
 OPTIONS_RADIO_WEB=	AP_MODFASTCGI AP_MODPERL LIGHTTPD SPAWN_FCGI
 
-OPTIONS_DEFAULT=	AP_MODPERL GD GPG MYSQL
+OPTIONS_DEFAULT=	AP_MODFASTCGI GD GPG MYSQL
 
 USERS?=		www
 GROUPS?=	rt www
 
 RUN_DEPENDS+=	${LOCALBASE}/bin/jsmin:${PORTSDIR}/devel/jsmin
 
 .include "${.CURDIR}/Makefile.cpan"
 
 RUN_DEPENDS+=	${CORE_DEPS}       \
 		${MASON_DEPS}      \
 		${PSGI_DEPS}       \
 		${MAILGATE_DEPS}   \
 		${CLI_DEPS}        \
 		${ICAL_DEPS}       \
 		${SMTP_DEPS}       \
 		${DASHBOARDS_DEPS} \
 		${USERLOGO_DEPS}   \
 		${HTML_DOC_DEPS}
 
 USES=		cpe perl5
 CPE_VENDOR=	bestpractical
 
 RT_LAYOUT=	FreeBSD
 RT_ETC_DIR?=	etc/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 RT_ETC_PATH=	${PREFIX}/${RT_ETC_DIR}
 
 AP_MODPERL_DESC=		Deploy with apache and mod_perl
 AP_MODPERL_RUN_DEPENDS=		${MODPERL2_DEPS}
 AP_MODPERL_CONFIGURE_ON=	--with-apachectl=${LOCALBASE}/sbin/apachectl
 
 AP_MODFASTCGI_DESC=		Deploy with apache and mod_fastcgi
 AP_MODFASTCGI_USE=		APACHE_RUN=22+
 AP_MODFASTCGI_RUN_DEPENDS=	${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \
 				${FASTCGI_DEPS}
 AP_MODFASTCGI_CONFIGURE_ON=	--with-apachectl=${LOCALBASE}/sbin/apachectl
 
 LIGHTTPD_DESC=			Deploy with lighttpd and mod_fastcgi
 LIGHTTPD_RUN_DEPENDS=		${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
 
 SPAWN_FCGI_DESC=		Deploy with spawn_fcgi
 SPAWN_FCGI_RUN_DEPENDS=		${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
 
 MYSQL_USE=			MYSQL=yes
 MYSQL_RUN_DEPENDS=		${MYSQL_DEPS}
 
 PGSQL_USES=			pgsql
 PGSQL_RUN_DEPENDS=		${PGSQL_DEPS}
 
 ORACLE_RUN_DEPENDS=		${ORACLE_DEPS}
 
 SQLITE_USE=			SQLITE=yes
 SQLITE_RUN_DEPENDS=		${SQLITE_DEPS}
 
 DEV_DESC=			Configure for Developers
 DEV_RUN_DEPENDS=		${DEV_DEPS}
 DEV_CONFIGURE_ON=		--enable-developer-mode
 
 SSL_MAILGATE_DESC=		Enable HTTPS support for rt-mailgate
 SSL_MAILGATE_RUN_DEPENDS=	${SSL_MAILGATE_DEPS}
 SSL_MAILGATE_CONFIGURE_ENABLE=	ssl-mailgate
 
 GRAPHVIZ_RUN_DEPENDS=		${GRAPHVIZ_DEPS}
 GRAPHVIZ_CONFIGURE_ENABLE=	graphviz
 
 GPG_DESC=			Enable GnuPG support
 GPG_RUN_DEPENDS=		${GPG_DEPS}
 GPG_CONFIGURE_ENABLE=		gpg
 
 GD_DESC=			Enable GD Graphs and Charts
 GD_RUN_DEPENDS=			${GD_DEPS}
 GD_CONFIGURE_ENABLE=		gd
 
 BUILD_DEPENDS+=	${RUN_DEPENDS}
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MMYSQL} && !${PORT_OPTIONS:MPGSQL} && \
 	! ${PORT_OPTIONS:MORACLE} && !${PORT_OPTIONS:MSQLITE}
 IGNORE=	please select one of MYSQL, PGSQL, ORACLE or SQLITE
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 DB_TYPE=	mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 DB_TYPE=	Pg
 .endif
 
 .if ${PORT_OPTIONS:MORACLE}
 DB_TYPE=	Oracle
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 DB_TYPE=	SQLite
 .endif
 
 
 .if ${PORT_OPTIONS:MPGSQL}
 DB_DBA_USER?=	pgsql
 .else
 DB_DBA_USER?=	root
 .endif
 DB_DBA_PASSWORD?=
 DB_USER?=	rt_user
 DB_PASSWORD?=	rt_pass
 DB_HOST?=	localhost
 DB_DATABASE?=	rt4
 
 WEB_USER?=	${WWWOWN}
 WEB_GROUP?=	${WWWGRP}
 LIBS_GROUP?=	wheel
 
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
 CONFIGURE_ARGS+=	--enable-layout=${RT_LAYOUT} \
 	--with-web-user=${WEB_USER} \
 	--with-web-group=${WEB_GROUP} \
 	--with-libs-group=${LIBS_GROUP} \
 	--with-db-host=${DB_HOST} \
 	--with-db-port=${DB_PORT} \
 	--with-db-type=${DB_TYPE} \
 	--with-db-rt-user=${DB_USER} \
 	--with-db-rt-pass=${DB_PASSWORD} \
 	--with-db-database=${DB_DATABASE} \
 	--with-db-dba=${DB_DBA_USER}
 
 CONFIGURE_ENV+=	PERL=${LOCALBASE}/bin/perl
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 SUB_LIST=	RT_ETC_PATH=${RT_ETC_PATH}
 PLIST_SUB=	RT_ETC_DIR=${RT_ETC_DIR}
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "      DB_TYPE=type                    mysql, Oracle, Pg or SQLite (mysql)"
 	@${ECHO} "      DB_HOST=hostname                The database host (localhost)"
 	@${ECHO} "      DB_PORT=port                    The database port"
 	@${ECHO} "      DB_DATABASE=dbname              The database name (rt4)"
 	@${ECHO} ""
 	@${ECHO} "      DB_DBA_USER=username            Name of database administrator (root)"
 	@${ECHO} "      DB_DBA_PASSWORD=password        Password of database administrator"
 	@${ECHO} "      DB_USER=username                Name of database user for RT (rt_user)"
 	@${ECHO} "      DB_PASSWORD=password            Name of database password for RT (rt_pass)"
 .if ${PORT_OPTIONS:MSQLITE}
 	@${ECHO} ""
 	@${ECHO} "SQLITE is not recommended for production use"
 .endif
 
 post-patch:
 	@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
 	@${REINPLACE_CMD} -e 's!/bin:/usr/bin!/bin:/usr/bin:${LOCALBASE}/bin!' ${WRKSRC}/lib/RT/Interface/CLI.pm && \
 	    ${RM} ${WRKSRC}/lib/RT/Interface/CLI.pm.bak
 
 pre-install:
 	@${RM} -f ${WRKSRC}/lib/RT.pm.in
 
 post-install:
 	@${RM} -rf ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade
 	(cd ${WRKSRC}/etc && \
 	    ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in")
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} >= 502200
+CORE_DEPS+=	p5-CGI>0:${PORTSDIR}/www/p5-CGI
+.endif
+
+.include <bsd.port.post.mk>
Index: head/www/rt40/Makefile.cpan
===================================================================
--- head/www/rt40/Makefile.cpan	(revision 395566)
+++ head/www/rt40/Makefile.cpan	(revision 395567)
@@ -1,141 +1,141 @@
 ###############################################################################
 ### File::Find	     1.10		  core
 ### File::Glob	     1.05		  core
 ### File::Spec	     3.12	  0.08	  core
 ### Pod::Usage	     1.33		  core
 ### Scalar::Util     1.18		  core
 ### Text::ParseWords 3.24		  core
 ### Term::ReadLine			  core
 ###
 ### Digest::base			  core
 ### Time::HiRes				  core
 ### Errno				  core
-### CGI				3.38	  core
-### CGI::Cookie			1.20	  core
+### CGI				3.38	  core (perl<5.22)
+### CGI::Cookie			1.20	  core (perl<5.22)
 ### Storable			2.08	  core
 ### Getopt::Long		2.24	  core
 ### Pod::Usage				  core
 ### File::Find				  core
 ### Net::SMTP				  core
 ### Digest::MD5			2.39	  core
 ### Digest::SHA			5.47	  core
 ### File::Temp			0.22	  core
 ### Sys::Syslog			0.27	  core
 
 CORE_DEPS=	p5-CSS-Squish>=0.06:${PORTSDIR}/textproc/p5-CSS-Squish \
 		p5-Cache-Simple-TimedExpiry>0:${PORTSDIR}/devel/p5-Cache-Simple-TimedExpiry \
 		p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Class-ReturnValue>=0.40:${PORTSDIR}/devel/p5-Class-ReturnValue \
 		p5-DBI>=1.37:${PORTSDIR}/databases/p5-DBI \
 		p5-DBIx-SearchBuilder>=1.59:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \
 		p5-DateTime-Locale>=0.40:${PORTSDIR}/devel/p5-DateTime-Locale \
 		p5-DateTime>=0.44:${PORTSDIR}/devel/p5-DateTime \
 		p5-Devel-GlobalDestruction>0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
 		p5-Devel-StackTrace>=1.30:${PORTSDIR}/devel/p5-Devel-StackTrace \
 		p5-Email-Address>=1.89.5:${PORTSDIR}/mail/p5-Email-Address \
 		p5-Encode>=2.64:${PORTSDIR}/converters/p5-Encode \
 		p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
 		p5-HTML-Format>0:${PORTSDIR}/textproc/p5-HTML-Format \
 		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-HTML-Quoted>0:${PORTSDIR}/textproc/p5-HTML-Quoted \
 		p5-HTML-Scrubber>=0.08:${PORTSDIR}/www/p5-HTML-Scrubber \
 		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
 		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-Locale-Maketext-Fuzzy>0:${PORTSDIR}/devel/p5-Locale-Maketext-Fuzzy \
 		p5-Locale-Maketext-Lexicon>=0.32:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
 		p5-Locale-Maketext>=1.06:${PORTSDIR}/devel/p5-Locale-Maketext \
 		p5-Log-Dispatch>=2.23:${PORTSDIR}/devel/p5-Log-Dispatch \
 		p5-MIME-Tools>=5.425,2:${PORTSDIR}/mail/p5-MIME-Tools \
 		p5-Mail-Tools>=1.57:${PORTSDIR}/mail/p5-Mail-Tools \
 		p5-Module-Versions-Report>=1.05:${PORTSDIR}/devel/p5-Module-Versions-Report \
 		p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 		p5-Regexp-Common-net-CIDR>0:${PORTSDIR}/textproc/p5-Regexp-Common-net-CIDR \
 		p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common \
 		p5-Regexp-IPv6>0:${PORTSDIR}/textproc/p5-Regexp-IPv6 \
 		p5-Text-Password-Pronounceable>0:${PORTSDIR}/security/p5-Text-Password-Pronounceable \
 		p5-Text-Quoted>=2.02:${PORTSDIR}/textproc/p5-Text-Quoted \
 		p5-Text-Template>=1.44:${PORTSDIR}/textproc/p5-Text-Template \
 		p5-Text-Wrapper>0:${PORTSDIR}/textproc/p5-Text-Wrapper \
 		p5-Time-modules>0:${PORTSDIR}/devel/p5-Time-modules \
 		p5-Tree-Simple>=1.04:${PORTSDIR}/devel/p5-Tree-Simple \
 		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
 
 MASON_DEPS=	p5-Apache-Session>=1.53:${PORTSDIR}/www/p5-Apache-Session \
 		p5-HTML-Mason>=1.43:${PORTSDIR}/www/p5-HTML-Mason \
 		p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3 \
 		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
 		p5-Text-WikiFormat>=0.76:${PORTSDIR}/textproc/p5-Text-WikiFormat \
 		p5-XML-RSS>=1.05:${PORTSDIR}/textproc/p5-XML-RSS
 
 PSGI_DEPS=	p5-CGI-Emulate-PSGI>0:${PORTSDIR}/www/p5-CGI-Emulate-PSGI \
 		p5-CGI-PSGI>=0.12:${PORTSDIR}/www/p5-CGI-PSGI \
 		p5-HTML-Mason-PSGIHandler>=0.52:${PORTSDIR}/www/p5-HTML-Mason-PSGIHandler \
 		p5-Plack>=0.9971:${PORTSDIR}/www/p5-Plack \
 		p5-Starlet>0:${PORTSDIR}/www/p5-Starlet
 
 MAILGATE_DEPS=	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
 DEV_DEPS=	p5-Email-Abstract>0:${PORTSDIR}/mail/p5-Email-Abstract \
 		p5-HTML-Form>0:${PORTSDIR}/www/p5-HTML-Form \
 		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Log-Dispatch-Perl>0:${PORTSDIR}/devel/p5-Log-Dispatch-Perl \
 		p5-Module-Refresh>=0.03:${PORTSDIR}/devel/p5-Module-Refresh \
 		p5-String-ShellQuote>0:${PORTSDIR}/textproc/p5-String-ShellQuote \
 		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
 		p5-Test-Expect>=0.31:${PORTSDIR}/devel/p5-Test-Expect \
 		p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString \
 		p5-Test-MockTime>0:${PORTSDIR}/devel/p5-Test-MockTime \
 		p5-Test-WWW-Mechanize-PSGI>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize-PSGI \
 		p5-Test-WWW-Mechanize>=1.30:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
 		p5-Test-Warn>0:${PORTSDIR}devel/p5-Test-Warn \
 		p5-WWW-Mechanize>=1.52:${PORTSDIR}/www/p5-WWW-Mechanize \
 		p5-Plack-Middleware-Test-StashWarnings>=0.08:${PORTSDIR}/www/p5-Plack-Middleware-Test-StashWarnings     \
 		p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
 
 FASTCGI_DEPS=	p5-FCGI-ProcManager>0:${PORTSDIR}/www/p5-FCGI-ProcManager \
 		p5-FCGI>=0.74:${PORTSDIR}/www/p5-FCGI
 
 MODPERL2_DEPS=	p5-libapreq2>0:${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
 
 ORACLE_DEPS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle
 
 PGSQL_DEPS=	p5-DBD-Pg>=3.3.1:${PORTSDIR}/databases/p5-DBD-Pg
 
 SQLITE_DEPS=	p5-DBD-SQLite>=1.00:${PORTSDIR}/databases/p5-DBD-SQLite
 
 GPG_DEPS=	p5-GnuPG-Interface>0:${PORTSDIR}/security/p5-GnuPG-Interface \
 		p5-PerlIO-eol>0:${PORTSDIR}/devel/p5-PerlIO-eol
 
 ICAL_DEPS=	p5-Data-ICal>0:${PORTSDIR}/deskutils/p5-Data-ICal
 
 SMTP_DEPS=	## -- only needs perl core modules
 
 DASHBOARDS_DEPS=	p5-HTML-RewriteAttributes>=0.05:${PORTSDIR}/textproc/p5-HTML-RewriteAttributes \
 		p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
 		p5-URI>=1.59:${PORTSDIR}/net/p5-URI
 
 GRAPHVIZ_DEPS=	p5-GraphViz>0:${PORTSDIR}/graphics/p5-GraphViz \
 		p5-IPC-Run>=0.90:${PORTSDIR}/devel/p5-IPC-Run
 
 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
 
 USERLOGO_DEPS=	p5-Convert-Color>0:${PORTSDIR}/graphics/p5-Convert-Color
 
 HTML_DOC_DEPS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-Pod-Simple>=3.24:${PORTSDIR}/textproc/p5-Pod-Simple