Tue Mar 21 02:37:42 2017 UTC ()
Fix dependency for php71-pecl-mcrypt which has own version not PHP's.


(taca)
diff -r1.26 -r1.27 pkgsrc/www/contao35/Makefile
diff -r1.6 -r1.7 pkgsrc/www/contao43/Makefile
cvs diff -r1.26 -r1.27 pkgsrc/www/contao35/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao35/Makefile 2017/03/20 17:03:13 1.26
+++ pkgsrc/www/contao35/Makefile 2017/03/21 02:37:42 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2017/03/20 17:03:13 taca Exp $ 1# $NetBSD: Makefile,v 1.27 2017/03/21 02:37:42 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_PKGVER} 4DISTNAME= contao-${CT_PKGVER}
5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_PKGVER} 5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_PKGVER}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
8GITHUB_PROJECT= core 8GITHUB_PROJECT= core
9GITHUB_RELEASE= ${CT_VERSION} 9GITHUB_RELEASE= ${CT_VERSION}
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= https://contao.org/ 12HOMEPAGE= https://contao.org/
13COMMENT= Contao Open Source CMS ${CT_VERSION} 13COMMENT= Contao Open Source CMS ${CT_VERSION}
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
@@ -79,27 +79,27 @@ SUBST_STAGE.conf= post-configure @@ -79,27 +79,27 @@ SUBST_STAGE.conf= post-configure
79 79
80WWW_FILES= .htaccess.default README.md assets contao \ 80WWW_FILES= .htaccess.default README.md assets contao \
81 index.php share templates vendor 81 index.php share templates vendor
82WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \ 82WWW_SYSFILES= .htaccess bin config/default.php cron docs helper \
83 initialize.php modules themes 83 initialize.php modules themes
84 84
85INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config 85INSTALLATION_DIRS+= ${CT_DOCDIR} ${CT_EGDIR} ${CT_WEBDIR}/system/config
86 86
87.include "../../lang/php/phpversion.mk" 87.include "../../lang/php/phpversion.mk"
88 88
89.if ${PKG_PHP_VERSION} < 71 89.if ${PKG_PHP_VERSION} < 71
90DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt 90DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
91.else 91.else
92DEPENDS+= ${PHP_PKG_PREFIX}-pecl-mcrypt>=7.0.0:../../security/php-pecl-mcrypt 92DEPENDS+= ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
93.endif 93.endif
94 94
95PKG_GROUPS_VARS+= APACHE_GROUP 95PKG_GROUPS_VARS+= APACHE_GROUP
96PKG_USERS_VARS+= APACHE_USER 96PKG_USERS_VARS+= APACHE_USER
97 97
98pre-configure: 98pre-configure:
99 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 99 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
100 ${CHMOD} -x \ 100 ${CHMOD} -x \
101 ${WRKSRC}/vendor/oyejorge/less.php/lib/Less/Less.php.combine \ 101 ${WRKSRC}/vendor/oyejorge/less.php/lib/Less/Less.php.combine \
102 ${WRKSRC}/vendor/simplepie/simplepie/.travis.yml \ 102 ${WRKSRC}/vendor/simplepie/simplepie/.travis.yml \
103 ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie.php \ 103 ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie.php \
104 ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php \ 104 ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php \
105 ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie/Registry.php 105 ${WRKSRC}/vendor/simplepie/simplepie/library/SimplePie/Registry.php
cvs diff -r1.6 -r1.7 pkgsrc/www/contao43/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/contao43/Attic/Makefile 2017/03/20 17:08:00 1.6
+++ pkgsrc/www/contao43/Attic/Makefile 2017/03/21 02:37:42 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2017/03/20 17:08:00 taca Exp $ 1# $NetBSD: Makefile,v 1.7 2017/03/21 02:37:42 taca Exp $
2# 2#
3 3
4DISTNAME= contao-${CT_PKGVER} 4DISTNAME= contao-${CT_PKGVER}
5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_VERSION} 5PKGNAME= ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_VERSION}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=contao/}
8GITHUB_PROJECT= standard-edition 8GITHUB_PROJECT= standard-edition
9GITHUB_RELEASE= ${CT_VERSION} 9GITHUB_RELEASE= ${CT_VERSION}
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= https://contao.org/ 12HOMEPAGE= https://contao.org/
13COMMENT= Contao Open Source CMS ${CT_VERSION} 13COMMENT= Contao Open Source CMS ${CT_VERSION}
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
@@ -87,27 +87,27 @@ SUBST_SED.conf+= -e 's|@CT_WEBDIR @@ -87,27 +87,27 @@ SUBST_SED.conf+= -e 's|@CT_WEBDIR
87SUBST_STAGE.conf= post-configure 87SUBST_STAGE.conf= post-configure
88 88
89PERMFIXFILES= vendor/oyejorge/less.php/lib/Less/Less.php.combine \ 89PERMFIXFILES= vendor/oyejorge/less.php/lib/Less/Less.php.combine \
90 vendor/simplepie/simplepie/.travis.yml \ 90 vendor/simplepie/simplepie/.travis.yml \
91 vendor/simplepie/simplepie/library/SimplePie.php \ 91 vendor/simplepie/simplepie/library/SimplePie.php \
92 vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php \ 92 vendor/simplepie/simplepie/library/SimplePie/Cache/Memcached.php \
93 vendor/simplepie/simplepie/library/SimplePie/Registry.php 93 vendor/simplepie/simplepie/library/SimplePie/Registry.php
94 94
95.include "../../lang/php/phpversion.mk" 95.include "../../lang/php/phpversion.mk"
96 96
97.if ${PKG_PHP_VERSION} < 71 97.if ${PKG_PHP_VERSION} < 71
98DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt 98DEPENDS+= ${PHP_PKG_PREFIX}-mcrypt>=5.4.0:../../security/php-mcrypt
99.else 99.else
100DEPENDS+= ${PHP_PKG_PREFIX}-pecl-mcrypt>=7.0.0:../../security/php-pecl-mcrypt 100DEPENDS+= ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
101.endif 101.endif
102 102
103pre-configure: 103pre-configure:
104 ${CP} ${FILESDIR}/contao.conf ${WRKDIR} 104 ${CP} ${FILESDIR}/contao.conf ${WRKDIR}
105 cd ${WRKSRC}; ${CHMOD} -x ${PERMFIXFILES} 105 cd ${WRKSRC}; ${CHMOD} -x ${PERMFIXFILES}
106 106
107do-install: 107do-install:
108 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR} 108 cd ${WRKSRC}; pax -rw ${WWW_FILES} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
109 ${INSTALL_DATA} ${WRKSRC}/app/config/parameters.yml.dist \ 109 ${INSTALL_DATA} ${WRKSRC}/app/config/parameters.yml.dist \
110 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/app/config 110 ${DESTDIR}${PREFIX}/${CT_WEBDIR}/app/config
111 cd ${WRKSRC}/${EG_DATA}; \ 111 cd ${WRKSRC}/${EG_DATA}; \
112 ${INSTALL_DATA} *.yml ${DESTDIR}${PREFIX}/${CT_EGDIR}/app/config 112 ${INSTALL_DATA} *.yml ${DESTDIR}${PREFIX}/${CT_EGDIR}/app/config
113 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR} 113 ${INSTALL_DATA} ${WRKDIR}/contao.conf ${DESTDIR}${PREFIX}/${CT_EGDIR}