Attachment #115110 for bug #156885




#

PORTNAME=	drush
PORTVERSION=	4.4
CATEGORIES=	www
MASTER_SITES=	http://ftp.drupal.org/files/projects/
DISTNAME=	drush-7.x-${PORTVERSION}

MAINTAINER=	dgeo@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 ctype
IGNORE_WITH_PHP=4
WANT_PHP_CLI=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}



do-install:
	${MKDIR} ${DATADIR}
	( 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>

Lines 1-2 Link Here

(-)/usr/ports/www/drush/distinfo (-2 / +2 lines)
1	SHA256 (drush-All-versions-3.0.tar.gz) = 2112ab5a9b6c9ad9947c85f99a1a56dd1db40d4bb69d0cf962b84e6bd95c4207	1	SIZE (drush-7.x-4.4.tar.gz) = 253012
2	SIZE (drush-All-versions-3.0.tar.gz) = 171892	2	SHA256 (drush-7.x-4.4.tar.gz) = f6af5d259c169d0b3738568c9a8d114c8958df6deb5440fce3b5842e753fc88f




--- 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` "$@"

Lines 1-44 Link Here

(-)/usr/ports/www/drush/pkg-plist (-17 / +40 lines)
1	bin/drush	1	bin/drush
2	%%DATADIR%%/LICENSE.txt
3	%%DATADIR%%/README.txt	2	%%DATADIR%%/README.txt
		3	%%DATADIR%%/commands/core/clear.cache.inc
		4	%%DATADIR%%/commands/core/core.drush.inc
		5	%%DATADIR%%/commands/core/docs.drush.inc
4	%%DATADIR%%/commands/core/drupal/batch_6.inc	6	%%DATADIR%%/commands/core/drupal/batch_6.inc
5	%%DATADIR%%/commands/core/drupal/batch_7.inc	7	%%DATADIR%%/commands/core/drupal/batch_7.inc
6	%%DATADIR%%/commands/core/drupal/environment_5.inc	8	%%DATADIR%%/commands/core/drupal/environment_5.inc
7	%%DATADIR%%/commands/core/drupal/environment_6.inc	9	%%DATADIR%%/commands/core/drupal/environment_6.inc
8	%%DATADIR%%/commands/core/drupal/environment_7.inc	10	%%DATADIR%%/commands/core/drupal/environment_7.inc
		11	%%DATADIR%%/commands/core/drupal/site_install_6.inc
		12	%%DATADIR%%/commands/core/drupal/site_install_7.inc
9	%%DATADIR%%/commands/core/drupal/update_5.inc	13	%%DATADIR%%/commands/core/drupal/update_5.inc
10	%%DATADIR%%/commands/core/drupal/update_6.inc	14	%%DATADIR%%/commands/core/drupal/update_6.inc
11	%%DATADIR%%/commands/core/drupal/update_7.inc	15	%%DATADIR%%/commands/core/drupal/update_7.inc
12	%%DATADIR%%/commands/core/clear.cache.inc	16	%%DATADIR%%/commands/core/field.drush.inc
13	%%DATADIR%%/commands/core/core.drush.inc	17	%%DATADIR%%/commands/core/help.drush.inc
		18	%%DATADIR%%/commands/core/image.drush.inc
14	%%DATADIR%%/commands/core/rsync.core.inc	19	%%DATADIR%%/commands/core/rsync.core.inc
15	%%DATADIR%%/commands/core/scratch.php	20	%%DATADIR%%/commands/core/scratch.php
16	%%DATADIR%%/commands/core/search.drush.inc	21	%%DATADIR%%/commands/core/search.drush.inc
17	%%DATADIR%%/commands/core/site_install.drush.inc	22	%%DATADIR%%/commands/core/site_install.drush.inc
18	%%DATADIR%%/commands/core/sitealias.drush.inc	23	%%DATADIR%%/commands/core/sitealias.drush.inc
		24	%%DATADIR%%/commands/core/test.drush.inc
		25	%%DATADIR%%/commands/core/topic.drush.inc
19	%%DATADIR%%/commands/core/upgrade.drush.inc	26	%%DATADIR%%/commands/core/upgrade.drush.inc
20	%%DATADIR%%/commands/core/variable.drush.inc	27	%%DATADIR%%/commands/core/variable.drush.inc
21	%%DATADIR%%/commands/core/watchdog.drush.inc	28	%%DATADIR%%/commands/core/watchdog.drush.inc
22	%%DATADIR%%/commands/pm/package_handler/wget.inc
23	%%DATADIR%%/commands/pm/package_handler/cvs.inc	29	%%DATADIR%%/commands/pm/package_handler/cvs.inc
		30	%%DATADIR%%/commands/pm/package_handler/git_drupalorg.inc
		31	%%DATADIR%%/commands/pm/package_handler/wget.inc
24	%%DATADIR%%/commands/pm/pm.drush.inc	32	%%DATADIR%%/commands/pm/pm.drush.inc
25	%%DATADIR%%/commands/pm/updatecode.pm.inc
26	%%DATADIR%%/commands/pm/update_info/drupal_5.inc	33	%%DATADIR%%/commands/pm/update_info/drupal_5.inc
27	%%DATADIR%%/commands/pm/update_info/drupal_6.inc	34	%%DATADIR%%/commands/pm/update_info/drupal_6.inc
28	%%DATADIR%%/commands/pm/update_info/drupal_7.inc	35	%%DATADIR%%/commands/pm/update_info/drupal_7.inc
		36	%%DATADIR%%/commands/pm/updatecode.pm.inc
29	%%DATADIR%%/commands/pm/version_control/backup.inc	37	%%DATADIR%%/commands/pm/version_control/backup.inc
30	%%DATADIR%%/commands/pm/version_control/bzr.inc	38	%%DATADIR%%/commands/pm/version_control/bzr.inc
31	%%DATADIR%%/commands/pm/version_control/svn.inc	39	%%DATADIR%%/commands/pm/version_control/svn.inc
32	%%DATADIR%%/commands/sql/sql.drush.inc	40	%%DATADIR%%/commands/sql/sql.drush.inc
33	%%DATADIR%%/commands/sql/sync.sql.inc	41	%%DATADIR%%/commands/sql/sync.sql.inc
34	%%DATADIR%%/drush.api.php	42	%%DATADIR%%/commands/user/user.drush.inc
		43	%%DATADIR%%/docs/bootstrap.html
		44	%%DATADIR%%/docs/commands.html
		45	%%DATADIR%%/docs/context.html
		46	%%DATADIR%%/docs/drush.api.php
		47	%%DATADIR%%/docs/shellscripts.html
		48	%%DATADIR%%/docs/upgrade.html
35	%%DATADIR%%/drush.info	49	%%DATADIR%%/drush.info
36	%%DATADIR%%/drush.php	50	%%DATADIR%%/drush.php
		51	%%DATADIR%%/drush
37	%%DATADIR%%/drush_logo-black.png	52	%%DATADIR%%/drush_logo-black.png
38	%%DATADIR%%/examples/example.aliases.drushrc.php	53	%%DATADIR%%/examples/example.aliases.drushrc.php
		54	%%DATADIR%%/examples/example.bashrc
		55	%%DATADIR%%/examples/example.drush.ini
39	%%DATADIR%%/examples/example.drushrc.php	56	%%DATADIR%%/examples/example.drushrc.php
		57	%%DATADIR%%/examples/helloworld.script
		58	%%DATADIR%%/examples/policy.drush.inc
		59	%%DATADIR%%/examples/sandwich-topic.txt
40	%%DATADIR%%/examples/sandwich.drush.inc	60	%%DATADIR%%/examples/sandwich.drush.inc
41	%%DATADIR%%/examples/sandwich.txt	61	%%DATADIR%%/examples/sandwich.txt
		62	%%DATADIR%%/examples/xkcd.drush.inc
42	%%DATADIR%%/includes/backend.inc	63	%%DATADIR%%/includes/backend.inc
43	%%DATADIR%%/includes/batch.inc	64	%%DATADIR%%/includes/batch.inc
44	%%DATADIR%%/includes/command.inc	65	%%DATADIR%%/includes/command.inc
Lines 46-59 Link Here
46	%%DATADIR%%/includes/drush.inc	67	%%DATADIR%%/includes/drush.inc
47	%%DATADIR%%/includes/environment.inc	68	%%DATADIR%%/includes/environment.inc
48	%%DATADIR%%/includes/sitealias.inc	69	%%DATADIR%%/includes/sitealias.inc
49	@dirrmtry %%DATADIR%%/includes	70	@dirrm %%DATADIR%%/includes
50	@dirrmtry %%DATADIR%%/examples	71	@dirrm %%DATADIR%%/examples
51	@dirrmtry %%DATADIR%%/commands/sql	72	@dirrm %%DATADIR%%/docs
52	@dirrmtry %%DATADIR%%/commands/pm/version_control	73	@dirrm %%DATADIR%%/commands/user
53	@dirrmtry %%DATADIR%%/commands/pm/update_info	74	@dirrm %%DATADIR%%/commands/sql
54	@dirrmtry %%DATADIR%%/commands/pm/package_handler	75	@dirrm %%DATADIR%%/commands/pm/version_control
55	@dirrmtry %%DATADIR%%/commands/pm	76	@dirrm %%DATADIR%%/commands/pm/update_info
56	@dirrmtry %%DATADIR%%/commands/core/drupal	77	@dirrm %%DATADIR%%/commands/pm/package_handler
57	@dirrmtry %%DATADIR%%/commands/core	78	@dirrm %%DATADIR%%/commands/pm
58	@dirrmtry %%DATADIR%%/commands	79	@dirrm %%DATADIR%%/commands/core/drupal
59	@dirrmtry %%DATADIR%%	80	@dirrm %%DATADIR%%/commands/core
		81	@dirrm %%DATADIR%%/commands
		82	@dirrm %%DATADIR%%

Return to bug 156885

Lines 6-25 Link Here

(-)/usr/ports/www/drush/Makefile (-7 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= drush	8	PORTNAME= drush
9	PORTVERSION= 3.0	9	PORTVERSION= 4.4
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://ftp.drupal.org/files/projects/	11	MASTER_SITES= http://ftp.drupal.org/files/projects/
12	DISTNAME= drush-All-versions-${PORTVERSION}	12	DISTNAME= drush-7.x-${PORTVERSION}
13		13
14	MAINTAINER= freebsduser@paradisegreen.co.uk	14	MAINTAINER= dgeo@centrale-marseille.fr
15	COMMENT= Drupal command line and scripting interface	15	COMMENT= Drupal command line and scripting interface
16		16
		17	RUN_DEPENDS= ${PEARDIR}/Table.php:${PORTSDIR}/devel/pear-Console_Table
		18
		19	LICENSE= GPLv2
		20	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
		21
17	NO_BUILD= yes	22	NO_BUILD= yes
18		23
19	# set php requirements same as drupal itself	24	# set php requirements same as drupal itself
20	USE_PHP= gd pcre session xml mbstring	25	USE_PHP= gd pcre session xml mbstring ctype
21	IGNORE_WITH_PHP=4	26	IGNORE_WITH_PHP=4
22	WANT_PHP_WEB= yes	27	WANT_PHP_CLI= yes
23		28
24	WRKSRC= ${WRKDIR}/${PORTNAME}	29	WRKSRC= ${WRKDIR}/${PORTNAME}
25		30
Lines 30-36 Link Here
30		35
31	do-install:	36	do-install:
32	${MKDIR} ${DATADIR}	37	${MKDIR} ${DATADIR}
33	( cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR} '! ( -name drush -or -name drush.bat -or -name .orig -or -name .bak )' )	38	( cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR} '! ( -name drush.bat -or -name .orig -or -name .bak -or -name .gitignore -or -name LICENSE.txt )' )
34	${INSTALL_SCRIPT} ${WRKSRC}/drush ${PREFIX}/bin	39	${CHMOD} 755 ${DATADIR}/drush
		40	${LN} -s ${DATADIR}/drush ${PREFIX}/bin/drush
35		41
36	.include <bsd.port.post.mk>	42	.include <bsd.port.post.mk>

Lines 1-57 Link Here

(-)/usr/ports/www/drush/files/patch-drush (-57 lines)
1	--- drush.orig 2010-04-29 21:25:16.000000000 +0100
2	+++ drush 2010-04-29 21:32:18.000000000 +0100
3	@@ -1,51 +1,16 @@
4	-#!/usr/bin/env sh
5	+#!/bin/sh
6	# $Id: drush,v 1.17 2010/04/14 22:29:33 weitzman Exp $
7	#
8	# This script is a simple wrapper that will run Drush with the most appropriate
9	# php executable it can find.
10	#
11
12	-# Get the absolute path of this executable
13	-ORIGDIR=$(pwd)
14	-SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
15	-
16	-# Resolve symlinks - this is the equivalent of "readlink -f", but also works with non-standard OS X readlink.
17	-while [ -h $SELF_PATH ]; do
18	- # 1) cd to directory of the symlink
19	- # 2) cd to the directory of where the symlink points
20	- # 3) Get the pwd
21	- # 4) Append the basename
22	- DIR=$(dirname -- "$SELF_PATH")
23	- SYM=$(readlink $SELF_PATH)
24	- SELF_PATH=$(cd $DIR && cd $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
25	-done
26	-cd "$ORIGDIR"
27	-
28	# Build the path to drush.php.
29	-SCRIPT_PATH=$(dirname $SELF_PATH)/drush.php
30	-case $(uname -a) in
31	- CYGWIN*)
32	- SCRIPT_PATH=$(cygpath -w -a -- "$SCRIPT_PATH") ;;
33	-esac
34	+SCRIPT_PATH=XXXDATADIRXXX/drush.php
35
36	# If not exported and term is set determine and export the number of columns.
37	if [ -z $COLUMNS ] && [ -n "$TERM" ]; then
38	export COLUMNS=$(tput cols)
39	fi
40
41	-# Special case for *AMP installers, since they normally don't set themselves as the default cli php out of the box.
42	-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
43	- if [ -x $php ]; then
44	- exec $php $SCRIPT_PATH --php="$php" "$@"
45	- fi
46	-done
47	-
48	-# We check for a command line (cli) version of php, and if found use that.
49	-which php-cli >/dev/null 2>&1
50	-if [ "$?" = 0 ] ; then
51	- exec php-cli $SCRIPT_PATH --php="php-cli" "$@"
52	-else
53	- # Alternatively we run with straight php, which works on most other systems.
54	- # The --php=`which php` is for Dreamhost, which behaves oddly. See http://drupal.org/node/662926
55	- exec php $SCRIPT_PATH --php=`which php` "$@"
56	-fi
57	+exec php $SCRIPT_PATH --php=`which php` "$@"