much newer version, works with drupal5/6/7

This commit is contained in:
espie 2012-04-09 16:12:12 +00:00
parent 3f4bbf4161
commit 5e0dc808a2
5 changed files with 199 additions and 40 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2010/12/05 17:34:14 landry Exp $
# $OpenBSD: Makefile,v 1.4 2012/04/09 16:12:12 espie Exp $
COMMENT = command line access to most of drupal
CATEGORIES = www www/drupal6 devel
@ -6,18 +6,19 @@ MASTER_SITES = ftp://ftp.drupal.org/pub/drupal/files/projects/
MASTER_SITES0 = http://download.pear.php.net/package/
HOMEPAGE = http://drupal.org/
PKG_ARCH = *
DISTNAME = drush-All-Versions-2.0
DISTNAME = drush-7.x-5.1
WRKDIST = ${WRKDIR}/drush
PKGNAME = drush-2.0
REVISION = 0
PKGNAME = drush-5.1
DISTFILES = ${DISTNAME}.tar.gz Console_Table-1.1.3.tgz:0
MODULES = lang/php
MODPHP_BUILDDEP ?= No
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_PACKAGE_CDROM = Yes
RUN_DEPENDS = www/drupal6/core
RUN_DEPENDS = www/drupal6/core>=6
do-build:
${SUBST_CMD} -c ${FILESDIR}/drush ${WRKBUILD}/drush

View File

@ -1,10 +1,10 @@
MD5 (Console_Table-1.1.3.tgz) = NLXzTbGrDE2u3yhilYryVw==
MD5 (drush-All-Versions-2.0.tar.gz) = 14WsOtcIxphyLQQB8lN6DA==
MD5 (drush-7.x-5.1.tar.gz) = Mpw7mmWL1xjkISwqw6kwzw==
RMD160 (Console_Table-1.1.3.tgz) = uGJfnM0v7y1lbLESjPLv6XNo9A0=
RMD160 (drush-All-Versions-2.0.tar.gz) = 7hltLPuZRdvn01IFUltE7HrAdR0=
RMD160 (drush-7.x-5.1.tar.gz) = ly/zosi6plE/fpuIkIaGH/dxURw=
SHA1 (Console_Table-1.1.3.tgz) = 1Fsd3U+GwEQR8Veku0etKTjJLh4=
SHA1 (drush-All-Versions-2.0.tar.gz) = yRZDVkOlDatqYJ2D5B8mQxbUybA=
SHA1 (drush-7.x-5.1.tar.gz) = hXXW44t6eK9HFNBQkYG5tdG2AkY=
SHA256 (Console_Table-1.1.3.tgz) = 5lAfpIvyFHGFAElqIYr4LHSO5wbig7xVbUW6UE+T6x0=
SHA256 (drush-All-Versions-2.0.tar.gz) = 51xGB05k89ZXhl/2sYBYc/IAVq2oNQqYWTYMPYLStBo=
SHA256 (drush-7.x-5.1.tar.gz) = JMcB6OTaYCYSECJ/XjxmaYnOeSNLIiqLHxfeE35+/Wc=
SIZE (Console_Table-1.1.3.tgz) = 9253
SIZE (drush-All-Versions-2.0.tar.gz) = 71717
SIZE (drush-7.x-5.1.tar.gz) = 398390

View File

@ -1,2 +1,2 @@
#! /bin/sh
exec php ${PREFIX}/libexec/drush/drush.php "$@"
exec php-${MODPHP_VERSION} ${PREFIX}/libexec/drush/drush.php "$@"

View File

@ -1,25 +1,35 @@
$OpenBSD: patch-includes_environment_inc,v 1.1.1.1 2009/07/27 16:25:55 espie Exp $
--- includes/environment.inc.orig Mon Jul 27 18:20:04 2009
+++ includes/environment.inc Mon Jul 27 18:20:34 2009
@@ -332,21 +332,6 @@ function _drush_bootstrap_drush_validate() {
return drush_bootstrap_error('DRUSH_SAFE_MODE', dt('PHP safe mode is activated. Drush requires that safe mode is disabled.'));
}
$OpenBSD: patch-includes_environment_inc,v 1.2 2012/04/09 16:12:12 espie Exp $
--- includes/environment.inc.orig Thu Apr 5 04:56:38 2012
+++ includes/environment.inc Mon Apr 9 18:07:00 2012
@@ -133,30 +133,7 @@ function drush_environment_lib() {
- // Attempt to download Console Table, via various methods.
- if (!file_exists(DRUSH_BASE_PATH . '/includes/table.inc')) {
- if ($file = @file_get_contents(DRUSH_TABLE_URL)) {
- @file_put_contents(DRUSH_BASE_PATH . '/includes/table.inc', $file);
- }
- if (!file_exists(DRUSH_BASE_PATH . '/includes/table.inc')) {
- drush_shell_exec("wget -q -O includes/table.inc " . DRUSH_TABLE_URL);
- if (!file_exists(DRUSH_BASE_PATH . '/includes/table.inc')) {
- drush_shell_exec("curl -s -o includes/table.inc " . DRUSH_TABLE_URL);
- if (!file_exists(DRUSH_BASE_PATH . '/includes/table.inc')) {
- return drush_bootstrap_error('DRUSH_TABLES_INC', dt('Drush needs a copy of the PEAR Console_Table library saved as Drush includes/table.inc. Drush attempted to download this automatically, but failed. To continue you will need to download the !version package from http://pear.php.net/package/Console_Table, extract, and move the file Table.php to includes/table.inc.', array('!version' => DRUSH_TABLE_VERSION)));
- }
function drush_environment_table_lib() {
// Try using the PEAR installed version of Console_Table.
- $tablefile = 'Console/Table.php';
- if (@file_get_contents($tablefile, FILE_USE_INCLUDE_PATH) === FALSE) {
- $lib = drush_get_option('lib', DRUSH_BASE_PATH . '/lib');
- $tablefile = $lib . '/Console_Table-' . DRUSH_TABLE_VERSION . '/Table.php';
- // If it is not already present, download Console Table.
- if (!drush_file_not_empty($tablefile)) {
- // Attempt to remove the old Console Table file, from the legacy location.
- // TODO: Remove this (and associated .git.ignore) in Drush 6.x.
- $tablefile_legacy = DRUSH_BASE_PATH . '/includes/table.inc';
- if (drush_file_not_empty($tablefile_legacy)) {
- drush_op('unlink', $tablefile_legacy);
- }
-
- // Download and extract Console_Table, and confirm success.
- if (drush_lib_fetch(DRUSH_PEAR_BASE_URL . 'Console_Table-' . DRUSH_TABLE_VERSION . '.tgz')) {
- // Remove unneccessary package.xml file which ends up in /lib.
- drush_op('unlink', $lib . '/package.xml');
- }
- if (!drush_file_not_empty($tablefile)) {
- return drush_bootstrap_error('DRUSH_TABLES_LIB_NOT_FOUND', dt("Drush needs a copy of the PEAR Console_Table library in order to function, and the attempt to download this file automatically failed. To continue you will need to download the !version package from http://pear.php.net/package/Console_Table, extract it into !lib directory, such that Table.php exists at !tablefile.", array('!version' => DRUSH_TABLE_VERSION, '!tablefile' => $tablefile, '!lib' => $lib)));
- }
- }
- }
require_once DRUSH_BASE_PATH . '/includes/table.inc';
- require_once $tablefile;
+ require_once 'table.inc';
}
return TRUE;
/**

View File

@ -1,38 +1,186 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/07/27 16:25:55 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2012/04/09 16:12:12 espie Exp $
bin/drush
libexec/drush/
libexec/drush/LICENSE.txt
libexec/drush/README.txt
libexec/drush/commands/
libexec/drush/commands/core/
libexec/drush/commands/core/archive.drush.inc
libexec/drush/commands/core/cache.drush.inc
libexec/drush/commands/core/core.drush.inc
libexec/drush/commands/core/docs.drush.inc
libexec/drush/commands/core/drupal/
libexec/drush/commands/core/drupal/update_5.inc
libexec/drush/commands/core/drupal/batch.inc
libexec/drush/commands/core/drupal/batch_6.inc
libexec/drush/commands/core/drupal/environment.inc
libexec/drush/commands/core/drupal/environment_6.inc
libexec/drush/commands/core/drupal/site_install.inc
libexec/drush/commands/core/drupal/site_install_6.inc
libexec/drush/commands/core/drupal/update.inc
libexec/drush/commands/core/drupal/update_6.inc
libexec/drush/commands/core/drupal/update_7.inc
libexec/drush/commands/core/field.drush.inc
libexec/drush/commands/core/help.drush.inc
libexec/drush/commands/core/image.drush.inc
libexec/drush/commands/core/queue.drush.inc
libexec/drush/commands/core/rsync.core.inc
libexec/drush/commands/core/scratch.php
libexec/drush/commands/core/search.drush.inc
libexec/drush/commands/core/shellalias.drush.inc
libexec/drush/commands/core/site_install.drush.inc
libexec/drush/commands/core/sitealias.drush.inc
libexec/drush/commands/core/ssh.drush.inc
libexec/drush/commands/core/test.drush.inc
libexec/drush/commands/core/topic.drush.inc
libexec/drush/commands/core/usage.drush.inc
libexec/drush/commands/core/variable.drush.inc
libexec/drush/commands/core/watchdog.drush.inc
libexec/drush/commands/make/
libexec/drush/commands/make/EXAMPLE.make
libexec/drush/commands/make/README.txt
libexec/drush/commands/make/generate.make.inc
libexec/drush/commands/make/make.download.inc
libexec/drush/commands/make/make.drush.inc
libexec/drush/commands/make/make.project.inc
libexec/drush/commands/make/make.utilities.inc
libexec/drush/commands/pm/
libexec/drush/commands/pm/download.pm.inc
libexec/drush/commands/pm/info.pm.inc
libexec/drush/commands/pm/package_handler/
libexec/drush/commands/pm/package_handler/cvs.inc
libexec/drush/commands/pm/package_handler/git_drupalorg.inc
libexec/drush/commands/pm/package_handler/wget.inc
libexec/drush/commands/pm/pm.drush.inc
libexec/drush/commands/pm/release_info/
libexec/drush/commands/pm/release_info/updatexml.inc
libexec/drush/commands/pm/update_info/
libexec/drush/commands/pm/update_info/drupal_5.inc
libexec/drush/commands/pm/update_info/drupal.inc
libexec/drush/commands/pm/update_info/drupal_6.inc
libexec/drush/commands/pm/updatecode.inc
libexec/drush/commands/pm/updatecode.pm.inc
libexec/drush/commands/pm/version_control/
libexec/drush/commands/pm/version_control/backup.inc
libexec/drush/commands/pm/version_control/bzr.inc
libexec/drush/commands/pm/version_control/svn.inc
libexec/drush/commands/simpletest/
libexec/drush/commands/simpletest/simpletest.drush.inc
libexec/drush/commands/runserver/
libexec/drush/commands/runserver/runserver-drupal.inc
libexec/drush/commands/runserver/runserver-prepend.php
libexec/drush/commands/runserver/runserver.drush.inc
libexec/drush/commands/sql/
libexec/drush/commands/sql/sql.drush.inc
libexec/drush/commands/sql/sync.sql.inc
libexec/drush/commands/user/
libexec/drush/commands/user/user.drush.inc
libexec/drush/docs/
libexec/drush/docs/bastion.html
libexec/drush/docs/bootstrap.html
libexec/drush/docs/commands.html
libexec/drush/docs/context.html
libexec/drush/docs/cron.html
libexec/drush/docs/drush.api.php
libexec/drush/docs/shellaliases.html
libexec/drush/docs/shellscripts.html
libexec/drush/docs/strict-options.html
libexec/drush/drush.complete.sh
libexec/drush/drush.info
libexec/drush/drush.php
libexec/drush/example.drush.inc
libexec/drush/example.drushrc.php
libexec/drush/drush_logo-black.png
libexec/drush/examples/
libexec/drush/examples/example.aliases.drushrc.php
libexec/drush/examples/example.bashrc
libexec/drush/examples/example.drush.ini
libexec/drush/examples/example.drushrc.php
libexec/drush/examples/helloworld.script
libexec/drush/examples/policy.drush.inc
libexec/drush/examples/sandwich-nocolor.txt
libexec/drush/examples/sandwich-topic.txt
libexec/drush/examples/sandwich.drush.inc
libexec/drush/examples/sandwich.txt
libexec/drush/examples/sync_enable.drush.inc
libexec/drush/examples/sync_via_http.drush.inc
libexec/drush/examples/xkcd.drush.inc
libexec/drush/includes/
libexec/drush/includes/.gitignore
libexec/drush/includes/backend.inc
libexec/drush/includes/batch.inc
libexec/drush/includes/bootstrap.inc
libexec/drush/includes/cache.inc
libexec/drush/includes/command.inc
libexec/drush/includes/complete.inc
libexec/drush/includes/context.inc
libexec/drush/includes/dbtng.inc
libexec/drush/includes/drupal.inc
libexec/drush/includes/drush.inc
libexec/drush/includes/environment.inc
@comment libexec/drush/includes/environment.inc.orig
libexec/drush/includes/exec.inc
libexec/drush/includes/filesystem.inc
libexec/drush/includes/output.inc
libexec/drush/includes/sitealias.inc
libexec/drush/includes/table.inc
libexec/drush/lib/
libexec/drush/lib/README.txt
libexec/drush/tests/
libexec/drush/tests/COVERAGE.txt
libexec/drush/tests/README.txt
libexec/drush/tests/archiveDumpTest.php
libexec/drush/tests/backendTest.php
libexec/drush/tests/batchTest.php
libexec/drush/tests/cacheCommandTest.php
libexec/drush/tests/commandSpecificTest.php
libexec/drush/tests/commandTest.php
libexec/drush/tests/commandUnitTest.php
libexec/drush/tests/completeTest.php
libexec/drush/tests/contextTest.php
libexec/drush/tests/coreTest.php
libexec/drush/tests/devel.xml
libexec/drush/tests/drush_testcase.inc
libexec/drush/tests/fieldTest.php
libexec/drush/tests/generateMakeTest.php
libexec/drush/tests/hooks/
libexec/drush/tests/hooks/magic_help_alter/
libexec/drush/tests/hooks/magic_help_alter/magic.drush.inc
libexec/drush/tests/imageTest.php
libexec/drush/tests/makeTest.php
libexec/drush/tests/makefiles/
libexec/drush/tests/makefiles/bzr.make
libexec/drush/tests/makefiles/contrib-destination.make
libexec/drush/tests/makefiles/file-extract.make
libexec/drush/tests/makefiles/file.make
libexec/drush/tests/makefiles/get.make
libexec/drush/tests/makefiles/git-simple.make
libexec/drush/tests/makefiles/git.make
libexec/drush/tests/makefiles/include.make
libexec/drush/tests/makefiles/included.make
libexec/drush/tests/makefiles/included2.make
libexec/drush/tests/makefiles/limited-projects-libraries.make
libexec/drush/tests/makefiles/md5-fail.make
libexec/drush/tests/makefiles/md5-succeed.make
libexec/drush/tests/makefiles/patches.make
libexec/drush/tests/makefiles/recursion.make
libexec/drush/tests/makefiles/subtree.make
libexec/drush/tests/makefiles/svn.make
libexec/drush/tests/makefiles/translations-inside.make
libexec/drush/tests/makefiles/translations-inside7.make
libexec/drush/tests/makefiles/translations.make
libexec/drush/tests/phpunit.xml.dist
libexec/drush/tests/pmDownloadTest.php
libexec/drush/tests/pmEnDisUnListTest.php
libexec/drush/tests/pmUpdateCodeTest.php
libexec/drush/tests/queueTest.php
libexec/drush/tests/releaseInfoTest.php
libexec/drush/tests/resources/
libexec/drush/tests/resources/create_node_types.php
libexec/drush/tests/resources/example.profile
libexec/drush/tests/resources/queue_script.php
libexec/drush/tests/runner.php
libexec/drush/tests/shellAliasTest.php
libexec/drush/tests/siteAliasTest.php
libexec/drush/tests/siteIntallD6Test.php
libexec/drush/tests/siteSetTest.php
libexec/drush/tests/siteSetUnitTest.php
libexec/drush/tests/siteSshTest.php
libexec/drush/tests/sqlConnectTest.php
libexec/drush/tests/sqlSyncTest.php
libexec/drush/tests/unit.drush.inc
libexec/drush/tests/userTest.php
libexec/drush/tests/variableTest.php
libexec/drush/tests/watchdogTest.php