- Update to 0.23

- Add new depenedency (PerlIO-eol) and fix depenedency (p5-URI)
- New patch which fixes t/07smerge.t on svn 1.0.x/1.1.x

PR:		ports/72872
Submitted by:	maintainer
Approved by:	co-mentor (vanilla)

4 files changed, 50 insertions, 3 deletions

diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 310d77e38e3e..5a9b0199d739 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	svk
-PORTVERSION=	0.22
+PORTVERSION=	0.23
 PORTREVISION=	0
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
@@ -29,12 +29,14 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/subversio
 		${SITE_PERL}/IO/Digest.pm:${PORTSDIR}/devel/p5-IO-Digest \
 		${SITE_PERL}/Locale/Maketext/Lexicon.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
 		${SITE_PERL}/Locale/Maketext/Simple.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
+		${SITE_PERL}/PerlIO/eol/eol.pm:${PORTSDIR}/devel/p5-PerlIO-eol \
 		${SITE_PERL}/PerlIO/via/dynamic.pm:${PORTSDIR}/devel/p5-PerlIO-via-dynamic \
 		${SITE_PERL}/PerlIO/via/symlink.pm:${PORTSDIR}/devel/p5-PerlIO-via-symlink \
 		${SITE_PERL}/Pod/Escapes.pm:${PORTSDIR}/textproc/p5-Pod-Escapes \
 		${SITE_PERL}/Pod/Simple.pm:${PORTSDIR}/textproc/p5-Pod-Simple \
 		${SITE_PERL}/Regexp/Shellish.pm:${PORTSDIR}/devel/p5-Regexp-Shellish \
 		${SITE_PERL}/SVN/Simple/Edit.pm:${PORTSDIR}/devel/p5-SVN-Simple \
+		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -92,6 +94,8 @@ MAN3=		SVK.3 \
 		SVK::Editor::Rename.3 \
 		SVK::Editor::Translate.3 \
 		SVK::Editor::XD.3 \
+		SVK::Help::Index.3 \
+		SVK::Help::zh_tw::Index.3 \
 		SVK::Merge.3 \
 		SVK::Notify.3 \
 		SVK::Patch.3 \
@@ -123,6 +127,7 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PPERL%%,${PPERL}," ${WRKSRC}/bin/svk
+	@${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \;
 
 post-install:
 	@${ECHO}
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index c1174b888b95..084e0251678b 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,2 +1,2 @@
-MD5 (SVK-0.22.tar.gz) = b1ef930a62d44c96760701930c7fe419
-SIZE (SVK-0.22.tar.gz) = 172362
+MD5 (SVK-0.23.tar.gz) = b0b0663c92fa5ed10641ea0052459cc0
+SIZE (SVK-0.23.tar.gz) = 180810
diff --git a/devel/svk/files/patch-lib::SVK::Command::Propset.pm b/devel/svk/files/patch-lib::SVK::Command::Propset.pm
new file mode 100644
index 000000000000..c2de94fd1007
--- /dev/null
+++ b/devel/svk/files/patch-lib::SVK::Command::Propset.pm
@@ -0,0 +1,38 @@
+Index: lib/SVK/Command/Propset.pm
+===================================================================
+--- lib/SVK/Command/Propset.pm	(revision 704)
++++ lib/SVK/Command/Propset.pm	(revision 705)
+@@ -31,15 +31,15 @@
+ sub do_propset_direct {
+     my ($self, $target, $propname, $propvalue) = @_;
+ 
+-    my $fs = $target->{repos}->fs;
+     if ($self->{revprop}) {
++	my $fs = $target->{repos}->fs;
+         my $rev = (defined($self->{rev}) ? $self->{rev} : $target->{revision});
+         $fs->change_rev_prop ($rev, $propname => $propvalue);
+         print loc("Property '%1' set on repository revision %2.\n", $propname, $rev);
+         return;
+     }
+ 
+-    my $root = $fs->revision_root ($fs->youngest_rev);
++    my $root = $target->root;
+     my $kind = $root->check_path ($target->path);
+ 
+     die loc("path %1 does not exist.\n", $target->path) if $kind == $SVN::Node::none;
+@@ -53,13 +53,13 @@
+ 	    $editor->change_dir_prop ($editor->{_root_baton}, $propname, $propvalue);
+ 	}
+ 	else {
+-	    my $baton = $editor->open_directory ($path, 0, -1);
++	    my $baton = $editor->open_directory ($path, 0, $target->{revision});
+ 	    $editor->change_dir_prop ($baton, $propname, $propvalue);
+ 	    $editor->close_directory ($baton);
+ 	}
+     }
+     else {
+-	my $baton = $editor->open_file ($path, 0, -1);
++	my $baton = $editor->open_file ($path, 0, $target->{revision});
+ 	$editor->change_file_prop ($baton, $propname, $propvalue);
+ 	$editor->close_file ($baton, undef);
+     }
diff --git a/devel/svk/pkg-plist b/devel/svk/pkg-plist
index 6679edf2f0bd..fc844c50d937 100644
--- a/devel/svk/pkg-plist
+++ b/devel/svk/pkg-plist
@@ -49,6 +49,8 @@ bin/svk
 %%SITE_PERL%%/SVK/Editor/Status.pm
 %%SITE_PERL%%/SVK/Editor/Translate.pm
 %%SITE_PERL%%/SVK/Editor/XD.pm
+%%SITE_PERL%%/SVK/Help/Index.pod
+%%SITE_PERL%%/SVK/Help/zh_tw/Index.pod
 %%SITE_PERL%%/SVK/I18N.pm
 %%SITE_PERL%%/SVK/I18N/i_default.po
 %%SITE_PERL%%/SVK/I18N/zh_cn.po
@@ -75,6 +77,8 @@ bin/svk
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVK/.packlist
 @dirrm %%SITE_PERL%%/SVK/Resolve
 @dirrm %%SITE_PERL%%/SVK/I18N
+@dirrm %%SITE_PERL%%/SVK/Help/zh_tw
+@dirrm %%SITE_PERL%%/SVK/Help
 @dirrm %%SITE_PERL%%/SVK/Editor
 @dirrm %%SITE_PERL%%/SVK/Command
 @dirrm %%SITE_PERL%%/SVK/Target