Date: Wed, 8 Jun 2016 17:25:56 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416557 - head/www/drupal7 Message-ID: <201606081725.u58HPuSC028977@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Jun 8 17:25:56 2016 New Revision: 416557 URL: https://svnweb.freebsd.org/changeset/ports/416557 Log: - Fix license - Pet portlint - Switch to options helpers - Switch to USES=mysql Modified: head/www/drupal7/Makefile head/www/drupal7/pkg-plist Modified: head/www/drupal7/Makefile ============================================================================== --- head/www/drupal7/Makefile Wed Jun 8 17:23:10 2016 (r416556) +++ head/www/drupal7/Makefile Wed Jun 8 17:25:56 2016 (r416557) @@ -11,8 +11,7 @@ DIST_SUBDIR= drupal 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,33 +19,26 @@ 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 PGSQL_USES= pgsql PGSQL_USE= PHP=pdo_pgsql - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSQLITE3} -USE_PHP+= pdo_sqlite -.endif -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -USE_PHP+= pdo_mysql -.endif +SQLITE3_USE= PHP=pdo_sqlite +MYSQL_USES= mysql +MYSQL_USE= PHP=pdo_mysql 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 +50,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> Modified: head/www/drupal7/pkg-plist ============================================================================== --- head/www/drupal7/pkg-plist Wed Jun 8 17:23:10 2016 (r416556) +++ head/www/drupal7/pkg-plist Wed Jun 8 17:25:56 2016 (r416557) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606081725.u58HPuSC028977>