ports/157493: [PATCH] www/drush: update to 4.4

Wed Jun 1 11:00:22 UTC 2011

>Number:         157493
>Category:       ports
>Synopsis:       [PATCH] www/drush: update to 4.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 01 11:00:21 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Hans Fredrik Nordhaug
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD nordhaug.priv.no 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011
>Description:
- Update to 4.4.

PS! I'm willing to maintain this port.  

Port maintainer (freebsduser at paradisegreen.co.uk) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- drush-4.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/Makefile /usr/ports/www/drush/Makefile
--- /usr/ports/www/drush.orig/Makefile	2011-06-01 10:00:36.000000000 +0200
+++ /usr/ports/www/drush/Makefile	2011-06-01 12:50:12.000000000 +0200
@@ -6,18 +6,21 @@
 #
 
 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
 COMMENT=	Drupal command line and scripting interface
 
 NO_BUILD=	yes
 
-# set php requirements same as drupal itself
-USE_PHP=	gd pcre session xml mbstring
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+# set php requirements same as drupal itself pluss ctype
+USE_PHP=	ctype gd pcre session xml mbstring
 IGNORE_WITH_PHP=4
 WANT_PHP_WEB=	yes
 
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/distinfo /usr/ports/www/drush/distinfo
--- /usr/ports/www/drush.orig/distinfo	2011-06-01 10:00:36.000000000 +0200
+++ /usr/ports/www/drush/distinfo	2011-06-01 11:43:43.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (drush-All-versions-3.0.tar.gz) = 2112ab5a9b6c9ad9947c85f99a1a56dd1db40d4bb69d0cf962b84e6bd95c4207
-SIZE (drush-All-versions-3.0.tar.gz) = 171892
+SHA256 (drush-7.x-4.4.tar.gz) = f6af5d259c169d0b3738568c9a8d114c8958df6deb5440fce3b5842e753fc88f
+SIZE (drush-7.x-4.4.tar.gz) = 253012
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	2011-06-01 10:00:36.000000000 +0200
+++ /usr/ports/www/drush/files/patch-drush	2011-06-01 11:52:53.000000000 +0200
@@ -1,11 +1,6 @@
---- 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
+--- drush.orig	2011-06-01 11:48:44.000000000 +0200
++++ drush	2011-06-01 11:52:14.000000000 +0200
+@@ -5,28 +5,11 @@
  # php executable it can find.
  #
  
@@ -14,7 +9,7 @@
 -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
+-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
@@ -24,34 +19,25 @@
 -    SELF_PATH=$(cd $DIR && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
 -done
 -cd "$ORIGDIR"
--
++# Set by the FreeBSD Drush port
++DRUSH_DIR=XXXDATADIRXXX
+ 
  # Build the path to drush.php.
--SCRIPT_PATH=$(dirname $SELF_PATH)/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
++SCRIPT_PATH=$DRUSH_DIR/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
+ # If not exported, try to determine and export the number of columns.
+ # We do not want to run $(tput cols) if $TERM is empty or "dumb", because
+@@ -65,7 +48,7 @@
  
--# 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` "$@"
+ # Check to see if the user has provided a php.ini file or drush.ini file in any conf dir
+ # Last found wins, so search in reverse priority order
+-for conf_dir in $(dirname "$SELF_PATH") /etc/drush $HOME/.drush ; do
++for conf_dir in $DRUSH_DIR /etc/drush $HOME/.drush ; do
+   if [ -f $conf_dir/php.ini ] ; then
+     drush_php_ini=$conf_dir/php.ini
+   fi
diff -ruN --exclude=CVS /usr/ports/www/drush.orig/pkg-plist /usr/ports/www/drush/pkg-plist
--- /usr/ports/www/drush.orig/pkg-plist	2011-06-01 10:00:36.000000000 +0200
+++ /usr/ports/www/drush/pkg-plist	2011-06-01 12:40:31.000000000 +0200
@@ -1,44 +1,66 @@
 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_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/.gitignore
 %%DATADIR%%/includes/backend.inc
 %%DATADIR%%/includes/batch.inc
 %%DATADIR%%/includes/command.inc
@@ -48,6 +70,8 @@
 %%DATADIR%%/includes/sitealias.inc
 @dirrmtry %%DATADIR%%/includes
 @dirrmtry %%DATADIR%%/examples
+ at dirrmtry %%DATADIR%%/docs
+ at dirrmtry %%DATADIR%%/commands/user
 @dirrmtry %%DATADIR%%/commands/sql
 @dirrmtry %%DATADIR%%/commands/pm/version_control
 @dirrmtry %%DATADIR%%/commands/pm/update_info
--- drush-4.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

