pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/phpmyadmin databases/phpmyadmin: fix build p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f64d2cc18fba
branches:  trunk
changeset: 375889:f64d2cc18fba
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Feb 24 05:34:19 2018 +0000

description:
databases/phpmyadmin: fix build problem, PHP 7.1 and later

Use php-pecl-mcrypt with PHP 7.1 and later.

diffstat:

 databases/phpmyadmin/Makefile |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r e54d75b62ebc -r f64d2cc18fba databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile     Sat Feb 24 05:32:53 2018 +0000
+++ b/databases/phpmyadmin/Makefile     Sat Feb 24 05:34:19 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2017/09/03 08:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2018/02/24 05:34:19 taca Exp $
 
 DISTNAME=      phpMyAdmin-4.6.5.2-all-languages
 PKGNAME=       ${DISTNAME:S/-all-languages//:tl}
@@ -18,7 +18,6 @@
 DEPENDS+=      ${PHP_PKG_PREFIX}-gettext>=5.3.0:../../devel/php-gettext
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.3.0:../../databases/php-mysqli
 DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
 DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.3.0:../../textproc/php-json
 
 USE_TOOLS+=    pax
@@ -31,7 +30,13 @@
 DOC_FILES=     CONTRIBUTING.md ChangeLog DCO LICENSE README \
                RELEASE-DATE-${PKGVERSION_NOREV}
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../lang/php/phpversion.mk"
+
+.if ${PKG_PHP_VERSION} < 71
+DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
+.else
+DEPENDS+=      ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
+.endif
 
 APACHE_USER?=  www
 APACHE_GROUP?= www



Home | Main Index | Thread Index | Old Index