diff options
author | Jason Unovitch <junovitch@FreeBSD.org> | 2016-06-17 01:33:14 +0000 |
---|---|---|
committer | Jason Unovitch <junovitch@FreeBSD.org> | 2016-06-17 01:33:14 +0000 |
commit | 0dccd3cda16531ad15fe7d9ca0fca30f7fea7de2 (patch) | |
tree | e02bdc4497a63f6f38accfb0e0072190d8c6fbf2 | |
parent | 3b4d1f346d8e56cfdf20f3cb615fbac480f78496 (diff) | |
download | ports-0dccd3cda16531ad15fe7d9ca0fca30f7fea7de2.tar.gz ports-0dccd3cda16531ad15fe7d9ca0fca30f7fea7de2.zip |
MFH: r416328 r416557 (partial, leave out USES=mysql conversion) r416989
www/drupal7: update 7.43 -> 7.44 [1]
- Reset maintainer by his own request [2]
- Fix license
- Pet portlint
PR: 210317 [1]
PR: 209998 [2]
Approved by: ports-secteam (with hat)
Submitted by: Vladimir Krstulja <vlad-fbsd@acheronmedia.com> [1]
Submitted by: simon.wright@gmx.net (maintainer) [2]
Security: https://vuxml.FreeBSD.org/freebsd/7932548e-3427-11e6-8e82-002590263bf5.html
Notes
Notes:
svn path=/branches/2016Q2/; revision=416990
-rw-r--r-- | www/drupal7/Makefile | 31 | ||||
-rw-r--r-- | www/drupal7/distinfo | 5 | ||||
-rw-r--r-- | www/drupal7/pkg-plist | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile index 2810ca7b3d93..bacac4cba91a 100644 --- a/www/drupal7/Makefile +++ b/www/drupal7/Makefile @@ -2,17 +2,16 @@ # $FreeBSD$ PORTNAME= drupal7 -PORTVERSION= 7.43 +PORTVERSION= 7.44 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} DIST_SUBDIR= drupal -MAINTAINER= simon.wright@gmx.net +MAINTAINER= ports@FreeBSD.org COMMENT= Database driven web content management system (CMS) -LICENSE= GPLv2 GPLv3 -LICENSE_COMB= dual +LICENSE= GPLv2+ USES= drupal:7 shebangfix SHEBANG_FILES= scripts/password-hash.sh @@ -20,15 +19,15 @@ SHEBANG_FILES= scripts/password-hash.sh USE_PHP= dom filter gd hash json mbstring pcre pdo session simplexml xml WANT_PHP_WEB= yes -OPTIONS_DEFINE= MYSQL SQLITE3 PGSQL DOCS -OPTIONS_DEFAULT= MYSQL - 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 @@ -46,7 +45,7 @@ USE_PHP+= pdo_mysql .endif do-install: - ${MKDIR} ${STAGEDIR}${DRUPAL_DIR} + @${MKDIR} ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/.htaccess ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/cron.php ${STAGEDIR}${DRUPAL_DIR} ${CP} ${WRKSRC}/authorize.php ${STAGEDIR}${DRUPAL_DIR} @@ -58,20 +57,20 @@ do-install: ${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 + @${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 + @${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} -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${CP} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/www/drupal7/distinfo b/www/drupal7/distinfo index ef33f5d04763..a2ad6136b022 100644 --- a/www/drupal7/distinfo +++ b/www/drupal7/distinfo @@ -1,2 +1,3 @@ -SHA256 (drupal/drupal-7.43.tar.gz) = 468c1e5864ad6a86e760108f0cb0eac6bf004a198c49e77117b99af31e31b16a -SIZE (drupal/drupal-7.43.tar.gz) = 3265824 +TIMESTAMP = 1466072639 +SHA256 (drupal/drupal-7.44.tar.gz) = a62971d20edd4ffd4c6dd03eb5fe3d213777d3807f48b7399bb73688dfd4bc5a +SIZE (drupal/drupal-7.44.tar.gz) = 3265819 diff --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist index d915d2b2eafe..0c344d0889c2 100644 --- a/www/drupal7/pkg-plist +++ b/www/drupal7/pkg-plist @@ -1101,5 +1101,5 @@ @dir %%DRUPAL_BASE%%/sites/all/libraries @dir %%DRUPAL_BASE%%/sites/default/files @unexec rm -f %%DRUPAL_BASE%%/files/.htaccess 2> /dev/null || true -@owner root -@group wheel +@owner +@group |