Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Aug 2016 16:14:35 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420288 - head/www/drupal7
Message-ID:  <201608161614.u7GGEZPp063047@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Tue Aug 16 16:14:35 2016
New Revision: 420288
URL: https://svnweb.freebsd.org/changeset/ports/420288

Log:
  - Update to version 7.50 [1]
  - Convert to USES=php:web
  - Simplify do-install target by using COPYTREE_SHARE
  
  PR:		211803 [1]
  Submitted by:	Jochen Neumeister [1]

Modified:
  head/www/drupal7/Makefile
  head/www/drupal7/distinfo
  head/www/drupal7/pkg-plist

Modified: head/www/drupal7/Makefile
==============================================================================
--- head/www/drupal7/Makefile	Tue Aug 16 16:10:34 2016	(r420287)
+++ head/www/drupal7/Makefile	Tue Aug 16 16:14:35 2016	(r420288)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	drupal7
-PORTVERSION=	7.44
+PORTVERSION=	7.50
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.drupal.org/files/projects/
 DISTNAME=	drupal-${PORTVERSION}
@@ -13,11 +13,9 @@ COMMENT=	Database driven web content man
 
 LICENSE=	GPLv2+
 
-USES=		drupal:7 shebangfix
-SHEBANG_FILES=	scripts/password-hash.sh
-
+USES=		drupal:7 php:web shebangfix
 USE_PHP=	dom filter gd hash json mbstring pcre pdo session simplexml xml
-WANT_PHP_WEB=	yes
+SHEBANG_FILES=	scripts/password-hash.sh
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -38,29 +36,15 @@ MYSQL_USES=	mysql
 MYSQL_USE=	PHP=pdo_mysql
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/.htaccess ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/cron.php ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/authorize.php ${STAGEDIR}${DRUPAL_DIR}
-	${CP} -R ${WRKSRC}/includes ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/index.php ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/install.php ${STAGEDIR}${DRUPAL_DIR}
-	${CP} -R ${WRKSRC}/misc ${STAGEDIR}${DRUPAL_DIR}
-	${CP} -R ${WRKSRC}/modules ${STAGEDIR}${DRUPAL_DIR}
-	${CP} -R ${WRKSRC}/profiles ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/robots.txt ${STAGEDIR}${DRUPAL_DIR}
-	${CP} -R ${WRKSRC}/scripts ${STAGEDIR}${DRUPAL_DIR}
-	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/all
-	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/all/libraries
-	${CP} ${WRKSRC}/sites/example.sites.php ${STAGEDIR}${DRUPAL_DIR}/sites/
-	${CP} -R ${WRKSRC}/sites/all ${STAGEDIR}${DRUPAL_DIR}/sites/
-	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default
 	@${MKDIR} ${STAGEDIR}${DRUPAL_DIR}/sites/default/files
-	${CP} ${WRKSRC}/sites/default/default.settings.php ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php.sample
-	${CP} -R ${WRKSRC}/themes ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/update.php ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/web.config ${STAGEDIR}${DRUPAL_DIR}
-	${CP} ${WRKSRC}/xmlrpc.php ${STAGEDIR}${DRUPAL_DIR}
+	(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}

Modified: head/www/drupal7/distinfo
==============================================================================
--- head/www/drupal7/distinfo	Tue Aug 16 16:10:34 2016	(r420287)
+++ head/www/drupal7/distinfo	Tue Aug 16 16:14:35 2016	(r420288)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466072639
-SHA256 (drupal/drupal-7.44.tar.gz) = a62971d20edd4ffd4c6dd03eb5fe3d213777d3807f48b7399bb73688dfd4bc5a
-SIZE (drupal/drupal-7.44.tar.gz) = 3265819
+TIMESTAMP = 1471063072
+SHA256 (drupal/drupal-7.50.tar.gz) = 82041716e1790269d09ec4a1c4cca8899d0221509471d53ac793a320143e0cf0
+SIZE (drupal/drupal-7.50.tar.gz) = 3286826

Modified: head/www/drupal7/pkg-plist
==============================================================================
--- head/www/drupal7/pkg-plist	Tue Aug 16 16:10:34 2016	(r420287)
+++ head/www/drupal7/pkg-plist	Tue Aug 16 16:14:35 2016	(r420288)
@@ -605,6 +605,7 @@
 %%DRUPAL_BASE%%/modules/simpletest/files/html-2.html
 %%DRUPAL_BASE%%/modules/simpletest/files/image-1.png
 %%DRUPAL_BASE%%/modules/simpletest/files/image-2.jpg
+%%DRUPAL_BASE%%/modules/simpletest/files/image-test-no-transparency.gif
 %%DRUPAL_BASE%%/modules/simpletest/files/image-test-transparent-out-of-range.gif
 %%DRUPAL_BASE%%/modules/simpletest/files/image-test.gif
 %%DRUPAL_BASE%%/modules/simpletest/files/image-test.jpg
@@ -744,6 +745,7 @@
 %%DRUPAL_BASE%%/modules/simpletest/tests/system_project_namespace_test.info
 %%DRUPAL_BASE%%/modules/simpletest/tests/system_project_namespace_test.module
 %%DRUPAL_BASE%%/modules/simpletest/tests/system_test.info
+%%DRUPAL_BASE%%/modules/simpletest/tests/system_test.install
 %%DRUPAL_BASE%%/modules/simpletest/tests/system_test.module
 %%DRUPAL_BASE%%/modules/simpletest/tests/tablesort.test
 %%DRUPAL_BASE%%/modules/simpletest/tests/taxonomy_test.info



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608161614.u7GGEZPp063047>