From owner-svn-ports-head@FreeBSD.ORG Wed Feb 19 01:20:58 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79A6B84B; Wed, 19 Feb 2014 01:20:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 632AA1B98; Wed, 19 Feb 2014 01:20:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1J1KweC050891; Wed, 19 Feb 2014 01:20:58 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1J1KwWP050890; Wed, 19 Feb 2014 01:20:58 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402190120.s1J1KwWP050890@svn.freebsd.org> From: Martin Wilke Date: Wed, 19 Feb 2014 01:20:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344980 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Feb 2014 01:20:58 -0000 Author: miwi Date: Wed Feb 19 01:20:57 2014 New Revision: 344980 URL: http://svnweb.freebsd.org/changeset/ports/344980 QAT: https://qat.redports.org/buildarchive/r344980/ Log: - Stage support Modified: head/www/drupal7/Makefile Modified: head/www/drupal7/Makefile ============================================================================== --- head/www/drupal7/Makefile Wed Feb 19 01:16:27 2014 (r344979) +++ head/www/drupal7/Makefile Wed Feb 19 01:20:57 2014 (r344980) @@ -32,7 +32,6 @@ DOCS= CHANGELOG.txt INSTALL.mysql.txt I SUB_FILES+= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSQLITE3} @@ -48,39 +47,34 @@ USE_PHP+= pdo_pgsql .endif do-install: - ${MKDIR} ${DRUPAL_DIR} - ${CP} ${WRKSRC}/.htaccess ${DRUPAL_DIR} - ${CP} ${WRKSRC}/cron.php ${DRUPAL_DIR} - ${CP} ${WRKSRC}/authorize.php ${DRUPAL_DIR} - ${CP} -R ${WRKSRC}/includes ${DRUPAL_DIR} - ${CP} ${WRKSRC}/index.php ${DRUPAL_DIR} - ${CP} ${WRKSRC}/install.php ${DRUPAL_DIR} - ${CP} -R ${WRKSRC}/misc ${DRUPAL_DIR} - ${CP} -R ${WRKSRC}/modules ${DRUPAL_DIR} - ${CP} -R ${WRKSRC}/profiles ${DRUPAL_DIR} - ${CP} ${WRKSRC}/robots.txt ${DRUPAL_DIR} - ${CP} -R ${WRKSRC}/scripts ${DRUPAL_DIR} - ${MKDIR} ${DRUPAL_DIR}/sites/all - ${MKDIR} ${DRUPAL_DIR}/sites/all/libraries - ${CP} ${WRKSRC}/sites/example.sites.php ${DRUPAL_DIR}/sites/ - ${CP} -R ${WRKSRC}/sites/all ${DRUPAL_DIR}/sites/ - ${MKDIR} ${DRUPAL_DIR}/sites/default - ${MKDIR} ${DRUPAL_DIR}/sites/default/files - ${CP} ${WRKSRC}/sites/default/default.settings.php ${DRUPAL_DIR}/sites/default/default.settings.php-dist - @if [ ! -f ${DRUPAL_DIR}/sites/default/default.settings.php ]; then \ - ${CP} -p ${DRUPAL_DIR}/sites/default/default.settings.php-dist ${DRUPAL_DIR}/sites/default/default.settings.php ; \ + ${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-dist + @if [ ! -f ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php ]; then \ + ${CP} -p ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php-dist ${STAGEDIR}${DRUPAL_DIR}/sites/default/default.settings.php ; \ fi - ${CP} -R ${WRKSRC}/themes ${DRUPAL_DIR} - ${CP} ${WRKSRC}/update.php ${DRUPAL_DIR} - ${CP} ${WRKSRC}/web.config ${DRUPAL_DIR} - ${CP} ${WRKSRC}/xmlrpc.php ${DRUPAL_DIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${CP} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DRUPAL_DIR} - -post-install: - @${CAT} ${PKGMESSAGE} + ${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} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${CP} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${DRUPAL_DIR} .include