svn commit: r395568 - head/www/rt42

[Matthew Seaman]

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

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/rt42/Makefile
  head/www/rt42/Makefile.cpan

Modified: head/www/rt42/Makefile
==============================================================================
--- head/www/rt42/Makefile	Sat Aug 29 21:05:58 2015	(r395567)
+++ head/www/rt42/Makefile	Sat Aug 29 21:07:07 2015	(r395568)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rt
 DISTVERSION=	4.2.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	42
@@ -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
@@ -201,4 +202,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>4.0:${PORTSDIR}/www/p5-CGI
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/www/rt42/Makefile.cpan
==============================================================================
--- head/www/rt42/Makefile.cpan	Sat Aug 29 21:05:58 2015	(r395567)
+++ head/www/rt42/Makefile.cpan	Sat Aug 29 21:07:07 2015	(r395568)
@@ -1,8 +1,8 @@
 ###############################################################################
 ### --- Core_DEPS ---
 ### Apache::Session 1.53
-### CGI 3.38                                    perl std
-### CGI::Cookie 1.20                            perl std
+### CGI 3.38                                    perl std (perl<5.22)
+### CGI::Cookie 1.20                            perl std (perl<5.22)
 ### CGI::Emulate::PSGI
 ### CGI::PSGI 0.12
 ### CSS::Squish 0.06
@@ -133,15 +133,6 @@ CORE_DEPS=	p5-Apache-Session>=1.53:${POR
 		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require				\
 		p5-XML-RSS>=1.05:${PORTSDIR}/textproc/p5-XML-RSS
 
-### Wants CGI => 4.00 for perl 5.20, meaning effectively www/p5-CGI.pm
-### rather than the version bundled with perl (as CGI is being
-### deprecated as a core perl module).  Except that a) www/p5-CGI.pm
-### is still at version 3.63 and b) ${PERL_LEVEL} doesn't seem to be in
-### scope at this point either.
-#.if ${PERL_LEVEL} >= 502000
-#CORE_DEPS+=	p5-CGI.pm>=4.00:${PORTSDIR}/www/p5-CGI.pm
-#.endif
-
 ### --- MAILGATE ---
 ### Crypt::SSLeay
 ### Getopt::Long                           perl std