[pkgsrc/pkgsrc-2017Q2]: pkgsrc/www/contao44 Pullup ticket #5530 - requested b...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/01e5e82b3677
branches:  pkgsrc-2017Q2
changeset: 408671:01e5e82b3677
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Aug 13 18:53:46 2017 +0000

description:
Pullup ticket #5530 - requested by taca
www/contao44: build fix

Revisions pulled up:
- www/contao44/DESCR                                            1.2
- www/contao44/Makefile                                         1.3-1.4
- www/contao44/PLIST                                            1.3
- www/contao44/distinfo                                         1.3

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Mon Jul 31 13:46:34 UTC 2017

   Modified Files:
        pkgsrc/www/contao44: DESCR Makefile PLIST distinfo

   Log Message:
   Update contao44 to 4.4.2.

   pkgsrc chagne: correct DESCR.

   The bugfix release fixes the issues with the new DCA picker.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Wed Aug  2 16:32:03 UTC 2017

   Modified Files:
        pkgsrc/www/contao44: Makefile

   Log Message:
   Update dependency.

   * Minimum PHP version.
   * Require php-pdo_mysql.

   Bump PKGREVISION.

diffstat:

 www/contao44/DESCR    |   5 ++---
 www/contao44/Makefile |  23 +++++++++++++----------
 www/contao44/PLIST    |  37 +++++++++++++++++++------------------
 www/contao44/distinfo |  10 +++++-----
 4 files changed, 39 insertions(+), 36 deletions(-)

diffs (211 lines):

diff -r 5690087355a0 -r 01e5e82b3677 www/contao44/DESCR
--- a/www/contao44/DESCR        Sun Aug 13 18:49:28 2017 +0000
+++ b/www/contao44/DESCR        Sun Aug 13 18:53:46 2017 +0000
@@ -1,10 +1,9 @@
 Contao is an Open Source Content Management Framework developed by Leo Feyer
-and distributed under the LGPL license (see GPL.txt and LGPL.txt for more
-information).  It was formerly known as TYPOlight Open Source CMS.
+and distributed under the LGPL license.
 
 Its open architecture allows everybody to extend the system to fit his
 needs. Contao specializes in accessible websites and is accessbile
-itself (front end and back end), rendering valid HTML5 or XHTML pages.
+itself (front end and back end), rendering valid HTML5.
 
 Contao 4.4 is fourth minor release of Contao 4 and it is LTS (Long Term
 Support) release until June 2021.
diff -r 5690087355a0 -r 01e5e82b3677 www/contao44/Makefile
--- a/www/contao44/Makefile     Sun Aug 13 18:49:28 2017 +0000
+++ b/www/contao44/Makefile     Sun Aug 13 18:53:46 2017 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.2.1 2017/07/16 08:17:02 bsiegert Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2017/08/13 18:53:46 bsiegert Exp $
 #
 
 DISTNAME=      contao-${CT_PKGVER}
 PKGNAME=       ${PHP_PKG_PREFIX}-contao${CT_VER}-${CT_VERSION}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=contao/}
 GITHUB_PROJECT=        managed-edition
@@ -13,16 +14,18 @@
 COMMENT=       Contao Open Source CMS ${CT_VERSION}
 LICENSE=       gnu-lgpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.5.0:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.5.0:../../converters/php-mbstring
-DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.5.0:../../databases/php-mysqli
-DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=5.5.0:../../net/php-soap
-DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=5.5.0:../../textproc/php-intl
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.5.0:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.5.0:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.6:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=5.6:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=5.6:../../databases/php-mysqli
+DEPENDS+=      ${PHP_PKG_PREFIX}-pdo_mysql>=5.6:../../databases/php-pdo_mysql
+DEPENDS+=      ${PHP_PKG_PREFIX}-soap>=5.6:../../net/php-soap
+DEPENDS+=      ${PHP_PKG_PREFIX}-intl>=5.6:../../textproc/php-intl
+DEPENDS+=      ${PHP_PKG_PREFIX}-json>=5.6:../../textproc/php-json
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.6:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.6:../../archivers/php-zlib
 DEPENDS+=      bash>=4.0:../../shells/bash
 
-CT_VERSION=    4.4.1
+CT_VERSION=    4.4.2
 USE_TOOLS=     bash pax
 NO_BUILD=      yes
 
@@ -84,7 +87,7 @@
 .include "../../lang/php/phpversion.mk"
 
 .if ${PKG_PHP_VERSION} < 71
-DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.5.0:../../security/php-mcrypt
+DEPENDS+=      ${PHP_PKG_PREFIX}-mcrypt>=5.6:../../security/php-mcrypt
 .else
 DEPENDS+=      ${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
 .endif
diff -r 5690087355a0 -r 01e5e82b3677 www/contao44/PLIST
--- a/www/contao44/PLIST        Sun Aug 13 18:49:28 2017 +0000
+++ b/www/contao44/PLIST        Sun Aug 13 18:53:46 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.2.1 2017/07/16 08:17:02 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.1.2.2 2017/08/13 18:53:46 bsiegert Exp $
 ${CT_WEBDIR}/README.md
 ${CT_WEBDIR}/assets/ace/README.md
 ${CT_WEBDIR}/assets/ace/composer.json
@@ -638,7 +638,7 @@
 ${CT_WEBDIR}/vendor/contao/calendar-bundle/src/EventListener/InsertTagsListener.php
 ${CT_WEBDIR}/vendor/contao/calendar-bundle/src/EventListener/PreviewUrlConvertListener.php
 ${CT_WEBDIR}/vendor/contao/calendar-bundle/src/EventListener/PreviewUrlCreateListener.php
-${CT_WEBDIR}/vendor/contao/calendar-bundle/src/Menu/EventPickerProvider.php
+${CT_WEBDIR}/vendor/contao/calendar-bundle/src/Picker/EventPickerProvider.php
 ${CT_WEBDIR}/vendor/contao/calendar-bundle/src/Resources/config/listener.yml
 ${CT_WEBDIR}/vendor/contao/calendar-bundle/src/Resources/config/services.yml
 ${CT_WEBDIR}/vendor/contao/calendar-bundle/src/Resources/contao/.editorconfig
@@ -1151,14 +1151,13 @@
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Controller/InsertTagsController.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Cors/WebsiteRootsConfigProvider.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DataCollector/ContaoDataCollector.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/DataContainer/DcaFilterInterface.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DataContainer/PaletteManipulator.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/AddImagineClassPass.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/AddPackagesPass.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/AddResourcesPathsPass.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/AddSessionBagsPass.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/DoctrineMigrationsPass.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/PickerMenuProviderPass.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Compiler/PickerProviderPass.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/Configuration.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/DependencyInjection/ContaoCoreExtension.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Doctrine/DBAL/Types/BinaryStringType.php
@@ -1216,16 +1215,20 @@
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Image/LegacyResizer.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Image/PictureFactory.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Image/PictureFactoryInterface.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/AbstractMenuProvider.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/ArticlePickerProvider.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/FilePickerProvider.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/PagePickerProvider.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/PickerMenuBuilder.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/PickerMenuBuilderInterface.php
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Menu/PickerMenuProviderInterface.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Monolog/ContaoContext.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Monolog/ContaoTableHandler.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Monolog/ContaoTableProcessor.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/AbstractPickerProvider.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/ArticlePickerProvider.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/DcaPickerProviderInterface.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/FilePickerProvider.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/PagePickerProvider.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/Picker.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/PickerBuilder.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/PickerBuilderInterface.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/PickerConfig.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/PickerInterface.php
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Picker/PickerProviderInterface.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Referer/TokenGenerator.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/config/commands.yml
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/config/listener.yml
@@ -2012,6 +2015,7 @@
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/jquery/j_colorbox.html5
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/jquery/j_mediaelement.html5
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/jquery/j_tablesort.html5
+${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/js/js_autofocus.html5
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/js/js_highlight.html5
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/js/js_mediaelement.html5
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/contao/templates/js/js_slider.html5
@@ -2463,7 +2467,6 @@
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/functions/utf8_bootup.php
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/public/core.js
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/public/core.min.js
-${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/public/favicon.ico
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/public/mootao.js
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/public/mootao.min.js
 ${CT_WEBDIR}/vendor/contao/core-bundle/src/Resources/views/Backend/be_page.html.twig
@@ -2505,7 +2508,7 @@
 ${CT_WEBDIR}/vendor/contao/faq-bundle/src/ContaoManager/Plugin.php
 ${CT_WEBDIR}/vendor/contao/faq-bundle/src/DependencyInjection/ContaoFaqExtension.php
 ${CT_WEBDIR}/vendor/contao/faq-bundle/src/EventListener/InsertTagsListener.php
-${CT_WEBDIR}/vendor/contao/faq-bundle/src/Menu/FaqPickerProvider.php
+${CT_WEBDIR}/vendor/contao/faq-bundle/src/Picker/FaqPickerProvider.php
 ${CT_WEBDIR}/vendor/contao/faq-bundle/src/Resources/config/listener.yml
 ${CT_WEBDIR}/vendor/contao/faq-bundle/src/Resources/config/services.yml
 ${CT_WEBDIR}/vendor/contao/faq-bundle/src/Resources/contao/.editorconfig
@@ -2999,7 +3002,7 @@
 ${CT_WEBDIR}/vendor/contao/news-bundle/src/EventListener/InsertTagsListener.php
 ${CT_WEBDIR}/vendor/contao/news-bundle/src/EventListener/PreviewUrlConvertListener.php
 ${CT_WEBDIR}/vendor/contao/news-bundle/src/EventListener/PreviewUrlCreateListener.php
-${CT_WEBDIR}/vendor/contao/news-bundle/src/Menu/NewsPickerProvider.php
+${CT_WEBDIR}/vendor/contao/news-bundle/src/Picker/NewsPickerProvider.php
 ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/config/listener.yml
 ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/config/services.yml
 ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/.editorconfig
@@ -4223,8 +4226,6 @@
 ${CT_WEBDIR}/vendor/knplabs/knp-menu/src/Knp/Menu/Twig/Helper.php
 ${CT_WEBDIR}/vendor/knplabs/knp-menu/src/Knp/Menu/Twig/MenuExtension.php
 ${CT_WEBDIR}/vendor/knplabs/knp-menu/src/Knp/Menu/Util/MenuManipulator.php
-${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/.gitignore
-${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/.travis.yml
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/DateTimeFormatter.php
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/DependencyInjection/KnpTimeExtension.php
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/KnpTimeBundle.php
@@ -4258,6 +4259,7 @@
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.pt_PT.xliff
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.ro.xliff
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.ru.xliff
+${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.sk.xliff
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.sl.xliff
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.sr_Latin.xliff
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Resources/translations/time.sr_Latn.xliff
@@ -4272,7 +4274,6 @@
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Templating/Helper/TimeHelper.php
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/Twig/Extension/TimeExtension.php
 ${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/composer.json
-${CT_WEBDIR}/vendor/knplabs/knp-time-bundle/Knp/Bundle/TimeBundle/phpunit.xml.dist
 ${CT_WEBDIR}/vendor/leafo/scssphp/LICENSE.md
 ${CT_WEBDIR}/vendor/leafo/scssphp/README.md
 ${CT_WEBDIR}/vendor/leafo/scssphp/bin/pscss
@@ -9075,7 +9076,7 @@
 ${CT_WEBDIR}/vendor/symfony/symfony/src/Symfony/Component/Yaml/phpunit.xml.dist
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/LICENSE.TXT
-${CT_WEBDIR}/vendor/tecnickcom/tcpdf/README.TXT
+${CT_WEBDIR}/vendor/tecnickcom/tcpdf/README.md
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/composer.json
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/config/tcpdf_config.php
 ${CT_WEBDIR}/vendor/tecnickcom/tcpdf/fonts/courier.php
diff -r 5690087355a0 -r 01e5e82b3677 www/contao44/distinfo
--- a/www/contao44/distinfo     Sun Aug 13 18:49:28 2017 +0000
+++ b/www/contao44/distinfo     Sun Aug 13 18:53:46 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.2.1 2017/07/16 08:17:02 bsiegert Exp $
+$NetBSD: distinfo,v 1.1.2.2 2017/08/13 18:53:46 bsiegert Exp $
 
-SHA1 (contao-4.4.1.tar.gz) = ed27d084697ee3b9703db4dfca200ba159f74cad
-RMD160 (contao-4.4.1.tar.gz) = 49d6d1b74a0f99d2420bc6b64bca094431bf9571
-SHA512 (contao-4.4.1.tar.gz) = 7f26245b9686982a3012b64b42b27bc63c4b88b5d5000cf0272bac949f94c6c4c499251eda52976f43b68057a7efe67e3e03cbce7e3127dff88bae55bbf9a2ef
-Size (contao-4.4.1.tar.gz) = 30661587 bytes
+SHA1 (contao-4.4.2.tar.gz) = 178bdb22b5507e215862ce4c0063b952c235805f
+RMD160 (contao-4.4.2.tar.gz) = 49821783ad6f053cebc04a2753dda226fa82724d
+SHA512 (contao-4.4.2.tar.gz) = 6db59e0e374ab2889c7f38e7cb7a8623e5eb111738f8528496c6e6c8b3fdc14aeddf20fb50bb16f08cf22c1af772139487d02d74522322f2bee5bff38cab5eca
+Size (contao-4.4.2.tar.gz) = 30664999 bytes