svn commit: r395567 - head/www/rt40

[Matthew Seaman]

Author: matthew
Date: Sat Aug 29 21:05:58 2015
New Revision: 395567
URL: https://svnweb.freebsd.org/changeset/ports/395567

Log:
  Prepare for perl-5.22
  
    - Add dependency on www/p5-CGI conditional on perl version.  CGI is
      no-longer a core module with 5.22.
  
    - Make the default web server interface Apache + FCGI rather than
      Apache + mod_perl.  Current versions of mod_perl aren't compatible
      with perl-5.22

Modified:
  head/www/rt40/Makefile
  head/www/rt40/Makefile.cpan

Modified: head/www/rt40/Makefile
==============================================================================
--- head/www/rt40/Makefile	Sat Aug 29 20:36:26 2015	(r395566)
+++ head/www/rt40/Makefile	Sat Aug 29 21:05:58 2015	(r395567)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	4.0.24
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	40
@@ -37,7 +38,7 @@ OPTIONS_SINGLE_DB=	MYSQL ORACLE PGSQL SQ
 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
@@ -208,4 +209,10 @@ post-install:
 	(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>

Modified: head/www/rt40/Makefile.cpan
==============================================================================
--- head/www/rt40/Makefile.cpan	Sat Aug 29 20:36:26 2015	(r395566)
+++ head/www/rt40/Makefile.cpan	Sat Aug 29 21:05:58 2015	(r395567)
@@ -10,8 +10,8 @@
 ### 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