CVS commit: pkgsrc/www/contao35

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Mar 20 17:03:13 UTC 2017

Modified Files:
        pkgsrc/www/contao35: Makefile

Log Message:
Accept php71 with security/php-pecl-mcrypt.

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


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/contao35/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/contao35/Makefile
diff -u pkgsrc/www/contao35/Makefile:1.25 pkgsrc/www/contao35/Makefile:1.26
--- pkgsrc/www/contao35/Makefile:1.25   Mon Mar 20 16:48:20 2017
+++ pkgsrc/www/contao35/Makefile        Mon Mar 20 17:03:13 2017
@@ -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}-dom>=5.4.0:.
 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 @@ WWW_SYSFILES=        .htaccess bin config/defau
 
 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