drupal 7.54

Maintenance release of the Drupal 7 series. Includes a variety of improvements and bug fixes (no major, non-backwards-compatible new functionality).

4 files changed, 13 insertions, 11 deletions

diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index bcb2a01e819..aa0d8f0d49b 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2017/04/05 12:33:48 fhajny Exp $
+# $NetBSD: Makefile,v 1.45 2017/05/20 18:20:02 adam Exp $
 
-DISTNAME=	drupal-7.52
-PKGREVISION=	2
+DISTNAME=	drupal-7.54
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
diff --git a/www/drupal7/PLIST b/www/drupal7/PLIST
index 6da19ccf113..1529ad6507d 100644
--- a/www/drupal7/PLIST
+++ b/www/drupal7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2016/10/21 14:31:30 wen Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/05/20 18:20:02 adam Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/COPYRIGHT.txt
 share/doc/drupal/INSTALL.mysql.txt
@@ -754,11 +754,14 @@ share/drupal/modules/simpletest/tests/theme_test.inc
 share/drupal/modules/simpletest/tests/theme_test.info
 share/drupal/modules/simpletest/tests/theme_test.module
 share/drupal/modules/simpletest/tests/theme_test.template_test.tpl.php
+share/drupal/modules/simpletest/tests/themes/engines/nyan_cat/nyan_cat.engine
 share/drupal/modules/simpletest/tests/themes/test_basetheme/test_basetheme.info
 share/drupal/modules/simpletest/tests/themes/test_subtheme/test_subtheme.info
 share/drupal/modules/simpletest/tests/themes/test_theme/template.php
 share/drupal/modules/simpletest/tests/themes/test_theme/templates/node--1.tpl.php
 share/drupal/modules/simpletest/tests/themes/test_theme/test_theme.info
+share/drupal/modules/simpletest/tests/themes/test_theme_nyan_cat/templates/theme_test_template_test.nyan-cat.html
+share/drupal/modules/simpletest/tests/themes/test_theme_nyan_cat/test_theme_nyan_cat.info
 share/drupal/modules/simpletest/tests/unicode.test
 share/drupal/modules/simpletest/tests/update.test
 share/drupal/modules/simpletest/tests/update_script_test.info
diff --git a/www/drupal7/distinfo b/www/drupal7/distinfo
index 5368bce4f9a..4760305fc30 100644
--- a/www/drupal7/distinfo
+++ b/www/drupal7/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2016/11/17 14:18:39 taca Exp $
+$NetBSD: distinfo,v 1.33 2017/05/20 18:20:02 adam Exp $
 
-SHA1 (drupal-7.52.tar.gz) = fceb7a2891e870eae1a027d7f06028aa24dc58b2
-RMD160 (drupal-7.52.tar.gz) = c58b7c789e5853842d260065e2fb27cf4809dcf9
-SHA512 (drupal-7.52.tar.gz) = 4fd2721b87d7e160ccf202894c5ec11e836796be6dce3fbfe187eea826175822677c26079a3dae4567e0615e8f376a88c07a8979b619bb4ac1096c8ea5c8f802
-Size (drupal-7.52.tar.gz) = 3289714 bytes
+SHA1 (drupal-7.54.tar.gz) = de0f96057df23979e390f132096347eeebdd58ad
+RMD160 (drupal-7.54.tar.gz) = 2bab533e61ad7be49a59b21b5f0e1506d24cafa2
+SHA512 (drupal-7.54.tar.gz) = 0b2834cd2ec7778de1515b99ac7f6348c5a3632a670b882fcce1e3b9d4cc904f9da761c103a3fe70311c69563c8ba5178d76ac8e2938d0831d7ef4113abaaf2a
+Size (drupal-7.54.tar.gz) = 3275864 bytes
diff --git a/www/drupal7/options.mk b/www/drupal7/options.mk
index c6f6b77857c..166d129166c 100644
--- a/www/drupal7/options.mk
+++ b/www/drupal7/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2017/04/05 12:33:48 fhajny Exp $
+# $NetBSD: options.mk,v 1.5 2017/05/20 18:20:02 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -39,7 +39,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.7:../../converters/php-mbstring
 ###
 .if !empty(PKG_OPTIONS:Mapache)
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2.7:../../www/ap-php
-.	include "../../mk/apache.mk"
+.  include "../../mk/apache.mk"
 WWW_USER?=	${APACHE_USER}
 WWW_GROUP?=	${APACHE_GROUP}
 .else