From owner-svn-ports-all@freebsd.org Wed Jun 8 17:25:57 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFC72B6F13A; Wed, 8 Jun 2016 17:25:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB5AD1EBE; Wed, 8 Jun 2016 17:25:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u58HPuSN028979; Wed, 8 Jun 2016 17:25:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u58HPuSC028977; Wed, 8 Jun 2016 17:25:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201606081725.u58HPuSC028977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 8 Jun 2016 17:25:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416557 - head/www/drupal7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2016 17:25:57 -0000 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 - -.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 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