pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/contao35 Accept php71 with security/php-pecl-mcrypt.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b996f343bc71
branches:  trunk
changeset: 360046:b996f343bc71
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Mar 20 17:03:13 2017 +0000

description:
Accept php71 with security/php-pecl-mcrypt.

No bump PKGREVISION since it dose not affect existing binary package.

diffstat:

 www/contao35/Makefile |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 6f2e8086f02a -r b996f343bc71 www/contao35/Makefile
--- a/www/contao35/Makefile     Mon Mar 20 16:51:42 2017 +0000
+++ b/www/contao35/Makefile     Mon Mar 20 17:03:13 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/03/20 16:48:20 taca Exp $
+# $NetBSD: Makefile,v 1.26 2017/03/20 17:03:13 taca Exp $
 #
 
 DISTNAME=      contao-${CT_PKGVER}
@@ -17,15 +17,11 @@
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
 DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=5.4.0:../../net/php-soap
 DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl
 DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib
 DEPENDS+=      bash>=4.0:../../shells/bash
 
-# mcrypt is deprecated and removed in PHP 7.1.x
-PHP_VERSIONS_ACCEPTED= 56 70
-
 CT_VERSION=    3.5.25
 USE_TOOLS=     bash pax
 NO_BUILD=      yes
@@ -88,6 +84,14 @@
 
 INSTALLATION_DIRS+=    ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
 
+.include "../../lang/php/phpversion.mk"
+
+.if ${PKG_PHP_VERSION} < 71
+DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
+.else
+DEPENDS+=      ${PHP_PKG_PREFIX}-pecl-mcrypt>=7.0.0:../../security/php-pecl-mcrypt
+.endif
+
 PKG_GROUPS_VARS+=      APACHE_GROUP
 PKG_USERS_VARS+=       APACHE_USER
 



Home | Main Index | Thread Index | Old Index