From f163328d7667f8d5e6345a921ae0192c9299b6cd Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Tue, 21 Apr 2009 13:53:33 +0000 Subject: [PATCH] - Fix HTML/Text diff with Subversion 1.5 - Bump PORTREVISION PR: ports/133877 Submitted by: Will Bond --- devel/p5-SVN-Web/Makefile | 2 +- devel/p5-SVN-Web/files/patch-Diff.pm | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 devel/p5-SVN-Web/files/patch-Diff.pm diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile index 75ca5744a276..b233154570da 100644 --- a/devel/p5-SVN-Web/Makefile +++ b/devel/p5-SVN-Web/Makefile @@ -7,7 +7,7 @@ PORTNAME= SVN-Web PORTVERSION= 0.53 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-SVN-Web/files/patch-Diff.pm b/devel/p5-SVN-Web/files/patch-Diff.pm new file mode 100644 index 000000000000..04294bbbed5e --- /dev/null +++ b/devel/p5-SVN-Web/files/patch-Diff.pm @@ -0,0 +1,28 @@ +--- lib/SVN/Web/Diff.pm.orig 2007-04-30 03:22:51.000000000 +0800 ++++ lib/SVN/Web/Diff.pm 2009-04-21 18:06:59.000000000 +0800 +@@ -188,8 +188,11 @@ + + my $mime = $self->{cgi}->param('mime') || 'text/html'; + +- my %types = ( $rev1 => $ra->check_path($path, $rev1), +- $rev2 => $ra->check_path($path, $rev2) ); ++ my $path_getlog = $path; ++ if ($path_getlog eq "/") {$path_getlog = "";} ++ $path_getlog =~ s/^\///; ++ my %types = ( $rev1 => $ra->check_path($path_getlog, $rev1), ++ $rev2 => $ra->check_path($path_getlog, $rev2) ); + + SVN::Web::X->throw(error => '(cannot diff nodes of different types: %1 %2 %3)', + vars => [$path, $rev1, $rev2]) +@@ -299,7 +302,10 @@ + + my $ra = $self->{repos}{ra}; + +- if($ra->check_path($path, $rev) == $SVN::Node::none) { ++ my $path_getlog = $path; ++ if ($path_getlog eq "/") {$path_getlog = "";} ++ $path_getlog =~ s/^\///; ++ if($ra->check_path($path_getlog, $rev) == $SVN::Node::none) { + SVN::Web::X->throw( + error => '(path %1 does not exist in revision %2)', + vars => [$path, $rev],