Index: branches/2018Q2/www/drupal7/Makefile
===================================================================
--- branches/2018Q2/www/drupal7/Makefile	(revision 469351)
+++ branches/2018Q2/www/drupal7/Makefile	(revision 469352)
@@ -1,54 +1,54 @@
 # Created by: Nick Hilliard <nick@foobar.org>
 # $FreeBSD$
 
 PORTNAME=	drupal7
-DISTVERSION=	7.58
+DISTVERSION=	7.59
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
 DIST_SUBDIR=	drupal
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Database driven web content management system (CMS)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		drupal:7 php:web shebangfix
 USE_PHP=	dom filter gd hash json mbstring pcre pdo session simplexml xml
 SHEBANG_FILES=	scripts/password-hash.sh
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 DOCS=		CHANGELOG.txt INSTALL.mysql.txt INSTALL.sqlite.txt \
 		LICENSE.txt README.txt COPYRIGHT.txt INSTALL.pgsql.txt \
 		INSTALL.txt MAINTAINERS.txt UPGRADE.txt
 
 OPTIONS_DEFINE=		MYSQL SQLITE3 PGSQL DOCS
 OPTIONS_DEFAULT=	MYSQL
 
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 PGSQL_USES=	pgsql
 PGSQL_USE=	PHP=pdo_pgsql
 SQLITE3_USE=	PHP=pdo_sqlite
 MYSQL_USES=	mysql
 MYSQL_USE=	PHP=pdo_mysql
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default/files
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} ".htaccess cron.php authorize.php \
 		includes index.php install.php misc modules profiles \
 		robots.txt scripts themes update.php web.config xmlrpc.php" \
 		${STAGEDIR}${DRUPAL_DIR})
 	(cd ${WRKSRC}/sites && ${COPYTREE_SHARE} "example.sites.php all" \
 		${STAGEDIR}${DRUPAL_DIR}/sites)
 	${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \
 		${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q2/www/drupal7/distinfo
===================================================================
--- branches/2018Q2/www/drupal7/distinfo	(revision 469351)
+++ branches/2018Q2/www/drupal7/distinfo	(revision 469352)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523895305
-SHA256 (drupal/drupal-7.58.tar.gz) = 33d29980593477ab1504d21e4bf10455f6a386935a88b34ac6d14aaf94c42272
-SIZE (drupal/drupal-7.58.tar.gz) = 3281269
+TIMESTAMP = 1525373381
+SHA256 (drupal/drupal-7.59.tar.gz) = 292c8741cd76b0baff33a36510e52fc8e189367498c8bcaae5da6ff15bdaaff6
+SIZE (drupal/drupal-7.59.tar.gz) = 3282260
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 469351)
+++ branches/2018Q2	(revision 469352)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r468973