aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejs <mmokrejs@gentoo.org>2011-02-14 16:30:31 +0100
committerMartin Mokrejs <mmokrejs@gentoo.org>2011-02-14 16:30:31 +0100
commit2cd3f93dfd0672f228900dd9584f57f573fbdc46 (patch)
tree9d180a0af889dc0a80f0df1e4d7384be0c652def /sci-biology/gbrowse/files
parentsci-mathematics/frama-c: clean-up (diff)
downloadsci-2cd3f93dfd0672f228900dd9584f57f573fbdc46.tar.gz
sci-2cd3f93dfd0672f228900dd9584f57f573fbdc46.tar.bz2
sci-2cd3f93dfd0672f228900dd9584f57f573fbdc46.zip
sci-biology/gbrowse: version bump, more DEPS added, tiny webappconfig improvement
(Portage version: 2.1.9.28/git/Linux i686, unsigned Manifest commit)
Diffstat (limited to 'sci-biology/gbrowse/files')
-rw-r--r--sci-biology/gbrowse/files/GBrowseInstall.pm.patch63
1 files changed, 61 insertions, 2 deletions
diff --git a/sci-biology/gbrowse/files/GBrowseInstall.pm.patch b/sci-biology/gbrowse/files/GBrowseInstall.pm.patch
index e6163a732..863930e58 100644
--- a/sci-biology/gbrowse/files/GBrowseInstall.pm.patch
+++ b/sci-biology/gbrowse/files/GBrowseInstall.pm.patch
@@ -1,5 +1,5 @@
---- GBrowse-2.03/install_util/GBrowseInstall.pm.ori 2010-11-27 12:01:58.000000000 +0100
-+++ GBrowse-2.03/install_util/GBrowseInstall.pm 2010-11-27 12:02:15.000000000 +0100
+--- GBrowse-2.26/install_util/GBrowseInstall.pm.ori 2010-11-27 12:01:58.000000000 +0100
++++ GBrowse-2.26/install_util/GBrowseInstall.pm 2010-11-27 12:02:15.000000000 +0100
@@ -436,8 +436,8 @@
$self->ownership_warning($databases,$user);
}
@@ -11,3 +11,62 @@
my $base = basename($self->install_path->{htdocs});
+--- GBrowse-2.26/install_util/GBrowseInstall.pm.ori 2011-02-14 13:39:46.000000000 +0100
++++ GBrowse-2.26/install_util/GBrowseInstall.pm 2011-02-14 13:41:50.000000000 +0100
+@@ -438,25 +438,25 @@
+ $gid =~ /^(\d+)$/;
+ $gid = $1;
+
+- unless (chown $uid,$gid,$tmp) {
+- $self->ownership_warning($tmp,$user);
+- }
++# unless (chown $uid,$gid,$tmp) {
++# $self->ownership_warning($tmp,$user);
++# }
+
+ my $htdocs_i = File::Spec->catfile($self->install_path->{htdocs},'i');
+ my $images = File::Spec->catfile($tmp,'images');
+ my $htdocs = $self->install_path->{htdocs};
+- chown $uid,-1,$htdocs;
+- {
+- local $> = $uid;
+- symlink($images,$htdocs_i); # so symlinkifowner match works!
+- }
+- chown $>,-1,$self->install_path->{htdocs};
++# chown $uid,-1,$htdocs;
++# {
++# local $> = $uid;
++# symlink($images,$htdocs_i); # so symlinkifowner match works!
++# }
++# chown $>,-1,$self->install_path->{htdocs};
+
+ my $databases = $self->install_path->{'databases'};
+
+- unless (chown $uid,$gid,glob(File::Spec->catfile($databases,'').'*')) {
+- $self->ownership_warning($databases,$user);
+- }
++# unless (chown $uid,$gid,glob(File::Spec->catfile($databases,'').'*')) {
++# $self->ownership_warning($databases,$user);
++# }
+
+ # chmod 0755,File::Spec->catfile($self->install_path->{'etc'},'init.d','gbrowse-slave');
+ # $self->fix_selinux;
+--- GBrowse-2.26/install_util/GBrowseInstall.pm.ori 2011-02-14 13:50:41.000000000 +0100
++++ GBrowse-2.26/install_util/GBrowseInstall.pm 2011-02-14 13:51:46.000000000 +0100
+@@ -470,11 +470,11 @@
+ my @inc = map{"-I$_"} split ':',$self->added_to_INC;
+ system $perl,@inc,$metadb_script;
+
+- if (Module::Build->y_n(
+- "It is recommended that you restart Apache. Shall I try this for you?",'y'
+- )) {
+- system "sudo /etc/init.d/apache2 restart";
+- }
++# if (Module::Build->y_n(
++# "It is recommended that you restart Apache. Shall I try this for you?",'y'
++# )) {
++# system "sudo /etc/init.d/apache2 restart";
++# }
+
+ print STDERR "\n***INSTALLATION COMPLETE***\n";
+ print STDERR "Load http://localhost/$base for demo and documentation.\n";