ports/156885: [PATCH] www/drush: update to 4.4
geoffroy desvernay
dgeo at centrale-marseille.fr
Mon May 23 09:30:16 UTC 2011
The following reply was made to PR ports/156885; it has been noted by GNATS.
From: geoffroy desvernay <dgeo at centrale-marseille.fr>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/156885: [PATCH] www/drush: update to 4.4
Date: Mon, 23 May 2011 11:27:05 +0200
This is a multi-part message in MIME format.
--------------070900090801030600000807
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
White line missing beetween RUN_DEPENDS and LICENCE to avoid portlint's
warning
Now, in this patch:
Removed file(s):
- files/patch-drush
- Update to 4.4
- Take maintainership (already approved by freebsduser at paradisegreen.co.uk)
- Licence + pear-Console_Table dependency from ports/153251 (which can
be closed too)
- WANT_PHP_CLI
May some commiter have a look and commit ?
Thanks !
--------------070900090801030600000807
Content-Type: text/plain;
name="drush-4.4.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="drush-4.4.patch"
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/Makefile /usr/ports/www/drush/Makefile
--- /usr/ports/www/drush.orig/Makefile 2010-05-02 10:30:09.000000000 +0200
+++ /usr/ports/www/drush/Makefile 2011-05-23 10:50:02.000000000 +0200
@@ -6,20 +6,25 @@
#
PORTNAME= drush
-PORTVERSION= 3.0
+PORTVERSION= 4.4
CATEGORIES= www
MASTER_SITES= http://ftp.drupal.org/files/projects/
-DISTNAME= drush-All-versions-${PORTVERSION}
+DISTNAME= drush-7.x-${PORTVERSION}
-MAINTAINER= freebsduser at paradisegreen.co.uk
+MAINTAINER= dgeo at centrale-marseille.fr
COMMENT= Drupal command line and scripting interface
+RUN_DEPENDS= ${PEARDIR}/Table.php:${PORTSDIR}/devel/pear-Console_Table
+
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
NO_BUILD= yes
# set php requirements same as drupal itself
USE_PHP= gd pcre session xml mbstring
IGNORE_WITH_PHP=4
-WANT_PHP_WEB= yes
+WANT_PHP_CLI= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -30,7 +35,8 @@
do-install:
${MKDIR} ${DATADIR}
- ( cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR} '! ( -name drush -or -name drush.bat -or -name *.orig -or -name *.bak )' )
- ${INSTALL_SCRIPT} ${WRKSRC}/drush ${PREFIX}/bin
+ ( cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR} '! ( -name drush.bat -or -name *.orig -or -name *.bak -or -name .gitignore -or -name LICENSE.txt )' )
+ ${CHMOD} 755 ${DATADIR}/drush
+ ${LN} -s ${DATADIR}/drush ${PREFIX}/bin/drush
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/distinfo /usr/ports/www/drush/distinfo
--- /usr/ports/www/drush.orig/distinfo 2011-03-19 13:34:08.000000000 +0100
+++ /usr/ports/www/drush/distinfo 2011-05-23 10:44:07.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (drush-All-versions-3.0.tar.gz) = 2112ab5a9b6c9ad9947c85f99a1a56dd1db40d4bb69d0cf962b84e6bd95c4207
-SIZE (drush-All-versions-3.0.tar.gz) = 171892
+SIZE (drush-7.x-4.4.tar.gz) = 253012
+SHA256 (drush-7.x-4.4.tar.gz) = f6af5d259c169d0b3738568c9a8d114c8958df6deb5440fce3b5842e753fc88f
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/files/patch-drush /usr/ports/www/drush/files/patch-drush
--- /usr/ports/www/drush.orig/files/patch-drush 2010-05-02 10:30:09.000000000 +0200
+++ /usr/ports/www/drush/files/patch-drush 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
---- drush.orig 2010-04-29 21:25:16.000000000 +0100
-+++ drush 2010-04-29 21:32:18.000000000 +0100
-@@ -1,51 +1,16 @@
--#!/usr/bin/env sh
-+#!/bin/sh
- # $Id: drush,v 1.17 2010/04/14 22:29:33 weitzman Exp $
- #
- # This script is a simple wrapper that will run Drush with the most appropriate
- # php executable it can find.
- #
-
--# Get the absolute path of this executable
--ORIGDIR=$(pwd)
--SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
--
--# Resolve symlinks - this is the equivalent of "readlink -f", but also works with non-standard OS X readlink.
--while [ -h $SELF_PATH ]; do
-- # 1) cd to directory of the symlink
-- # 2) cd to the directory of where the symlink points
-- # 3) Get the pwd
-- # 4) Append the basename
-- DIR=$(dirname -- "$SELF_PATH")
-- SYM=$(readlink $SELF_PATH)
-- SELF_PATH=$(cd $DIR && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
--done
--cd "$ORIGDIR"
--
- # Build the path to drush.php.
--SCRIPT_PATH=$(dirname $SELF_PATH)/drush.php
--case $(uname -a) in
-- CYGWIN*)
-- SCRIPT_PATH=$(cygpath -w -a -- "$SCRIPT_PATH") ;;
--esac
-+SCRIPT_PATH=XXXDATADIRXXX/drush.php
-
- # If not exported and term is set determine and export the number of columns.
- if [ -z $COLUMNS ] && [ -n "$TERM" ]; then
- export COLUMNS=$(tput cols)
- fi
-
--# Special case for *AMP installers, since they normally don't set themselves as the default cli php out of the box.
--for php in /Applications/MAMP/bin/php5/bin/php /opt/lampp/bin/php /Applications/xampp/xamppfiles/bin/php /Applications/acquia-drupal/php/bin/php; do
-- if [ -x $php ]; then
-- exec $php $SCRIPT_PATH --php="$php" "$@"
-- fi
--done
--
--# We check for a command line (cli) version of php, and if found use that.
--which php-cli >/dev/null 2>&1
--if [ "$?" = 0 ] ; then
-- exec php-cli $SCRIPT_PATH --php="php-cli" "$@"
--else
-- # Alternatively we run with straight php, which works on most other systems.
-- # The --php=`which php` is for Dreamhost, which behaves oddly. See http://drupal.org/node/662926
-- exec php $SCRIPT_PATH --php=`which php` "$@"
--fi
-+exec php $SCRIPT_PATH --php=`which php` "$@"
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/pkg-plist /usr/ports/www/drush/pkg-plist
--- /usr/ports/www/drush.orig/pkg-plist 2010-05-02 10:30:09.000000000 +0200
+++ /usr/ports/www/drush/pkg-plist 2011-05-23 10:44:07.000000000 +0200
@@ -1,44 +1,65 @@
bin/drush
-%%DATADIR%%/LICENSE.txt
%%DATADIR%%/README.txt
+%%DATADIR%%/commands/core/clear.cache.inc
+%%DATADIR%%/commands/core/core.drush.inc
+%%DATADIR%%/commands/core/docs.drush.inc
%%DATADIR%%/commands/core/drupal/batch_6.inc
%%DATADIR%%/commands/core/drupal/batch_7.inc
%%DATADIR%%/commands/core/drupal/environment_5.inc
%%DATADIR%%/commands/core/drupal/environment_6.inc
%%DATADIR%%/commands/core/drupal/environment_7.inc
+%%DATADIR%%/commands/core/drupal/site_install_6.inc
+%%DATADIR%%/commands/core/drupal/site_install_7.inc
%%DATADIR%%/commands/core/drupal/update_5.inc
%%DATADIR%%/commands/core/drupal/update_6.inc
%%DATADIR%%/commands/core/drupal/update_7.inc
-%%DATADIR%%/commands/core/clear.cache.inc
-%%DATADIR%%/commands/core/core.drush.inc
+%%DATADIR%%/commands/core/field.drush.inc
+%%DATADIR%%/commands/core/help.drush.inc
+%%DATADIR%%/commands/core/image.drush.inc
%%DATADIR%%/commands/core/rsync.core.inc
%%DATADIR%%/commands/core/scratch.php
%%DATADIR%%/commands/core/search.drush.inc
%%DATADIR%%/commands/core/site_install.drush.inc
%%DATADIR%%/commands/core/sitealias.drush.inc
+%%DATADIR%%/commands/core/test.drush.inc
+%%DATADIR%%/commands/core/topic.drush.inc
%%DATADIR%%/commands/core/upgrade.drush.inc
%%DATADIR%%/commands/core/variable.drush.inc
%%DATADIR%%/commands/core/watchdog.drush.inc
-%%DATADIR%%/commands/pm/package_handler/wget.inc
%%DATADIR%%/commands/pm/package_handler/cvs.inc
+%%DATADIR%%/commands/pm/package_handler/git_drupalorg.inc
+%%DATADIR%%/commands/pm/package_handler/wget.inc
%%DATADIR%%/commands/pm/pm.drush.inc
-%%DATADIR%%/commands/pm/updatecode.pm.inc
%%DATADIR%%/commands/pm/update_info/drupal_5.inc
%%DATADIR%%/commands/pm/update_info/drupal_6.inc
%%DATADIR%%/commands/pm/update_info/drupal_7.inc
+%%DATADIR%%/commands/pm/updatecode.pm.inc
%%DATADIR%%/commands/pm/version_control/backup.inc
%%DATADIR%%/commands/pm/version_control/bzr.inc
%%DATADIR%%/commands/pm/version_control/svn.inc
%%DATADIR%%/commands/sql/sql.drush.inc
%%DATADIR%%/commands/sql/sync.sql.inc
-%%DATADIR%%/drush.api.php
+%%DATADIR%%/commands/user/user.drush.inc
+%%DATADIR%%/docs/bootstrap.html
+%%DATADIR%%/docs/commands.html
+%%DATADIR%%/docs/context.html
+%%DATADIR%%/docs/drush.api.php
+%%DATADIR%%/docs/shellscripts.html
+%%DATADIR%%/docs/upgrade.html
%%DATADIR%%/drush.info
%%DATADIR%%/drush.php
+%%DATADIR%%/drush
%%DATADIR%%/drush_logo-black.png
%%DATADIR%%/examples/example.aliases.drushrc.php
+%%DATADIR%%/examples/example.bashrc
+%%DATADIR%%/examples/example.drush.ini
%%DATADIR%%/examples/example.drushrc.php
+%%DATADIR%%/examples/helloworld.script
+%%DATADIR%%/examples/policy.drush.inc
+%%DATADIR%%/examples/sandwich-topic.txt
%%DATADIR%%/examples/sandwich.drush.inc
%%DATADIR%%/examples/sandwich.txt
+%%DATADIR%%/examples/xkcd.drush.inc
%%DATADIR%%/includes/backend.inc
%%DATADIR%%/includes/batch.inc
%%DATADIR%%/includes/command.inc
@@ -46,14 +67,16 @@
%%DATADIR%%/includes/drush.inc
%%DATADIR%%/includes/environment.inc
%%DATADIR%%/includes/sitealias.inc
- at dirrmtry %%DATADIR%%/includes
- at dirrmtry %%DATADIR%%/examples
- at dirrmtry %%DATADIR%%/commands/sql
- at dirrmtry %%DATADIR%%/commands/pm/version_control
- at dirrmtry %%DATADIR%%/commands/pm/update_info
- at dirrmtry %%DATADIR%%/commands/pm/package_handler
- at dirrmtry %%DATADIR%%/commands/pm
- at dirrmtry %%DATADIR%%/commands/core/drupal
- at dirrmtry %%DATADIR%%/commands/core
- at dirrmtry %%DATADIR%%/commands
- at dirrmtry %%DATADIR%%
+ at dirrm %%DATADIR%%/includes
+ at dirrm %%DATADIR%%/examples
+ at dirrm %%DATADIR%%/docs
+ at dirrm %%DATADIR%%/commands/user
+ at dirrm %%DATADIR%%/commands/sql
+ at dirrm %%DATADIR%%/commands/pm/version_control
+ at dirrm %%DATADIR%%/commands/pm/update_info
+ at dirrm %%DATADIR%%/commands/pm/package_handler
+ at dirrm %%DATADIR%%/commands/pm
+ at dirrm %%DATADIR%%/commands/core/drupal
+ at dirrm %%DATADIR%%/commands/core
+ at dirrm %%DATADIR%%/commands
+ at dirrm %%DATADIR%%
--------------070900090801030600000807--
More information about the freebsd-ports-bugs
mailing list