3 files changed, 26 insertions, 6 deletions

diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 4b35344ce50f..310d77e38e3e 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	svk
-PORTVERSION=	0.21
+PORTVERSION=	0.22
 PORTREVISION=	0
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
@@ -24,8 +24,8 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/subversio
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/Data/Hierarchy.pm:${PORTSDIR}/devel/p5-Data-Hierarchy \
 		${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
-		${SITE_PERL}/File/BaseDir.pm:${PORTSDIR}/devel/p5-File-BaseDir \
-		${SITE_PERL}/File/MimeInfo.pm:${PORTSDIR}/devel/p5-File-MimeInfo \
+		${SITE_PERL}/File/Type.pm:${PORTSDIR}/devel/p5-File-Type \
+		${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \
 		${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 \
@@ -35,7 +35,6 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/SVN/Core.pm:${PORTSDIR}/devel/subversio
 		${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}/Text/Diff.pm:${PORTSDIR}/textproc/p5-Text-Diff \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -49,6 +48,7 @@ MAN1=		svk.1
 MAN3=		SVK.3 \
 		SVK::Command.3 \
 		SVK::Command::Add.3 \
+		SVK::Command::Admin.3 \
 		SVK::Command::Annotate.3 \
 		SVK::Command::Cat.3 \
 		SVK::Command::Checkout.3 \
@@ -75,6 +75,8 @@ MAN3=		SVK.3 \
 		SVK::Command::Propget.3 \
 		SVK::Command::Proplist.3 \
 		SVK::Command::Propset.3 \
+		SVK::Command::Pull.3 \
+		SVK::Command::Push.3 \
 		SVK::Command::Resolved.3 \
 		SVK::Command::Revert.3 \
 		SVK::Command::Smerge.3 \
@@ -93,8 +95,10 @@ MAN3=		SVK.3 \
 		SVK::Merge.3 \
 		SVK::Notify.3 \
 		SVK::Patch.3 \
+		SVK::Resolve.3 \
 		SVK::Target.3 \
 		SVK::Target::Universal.3 \
+		SVK::Util.3 \
 		SVK::XD.3
 
 .include <bsd.port.pre.mk>
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index dbd2f3f759f7..c1174b888b95 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,2 +1,2 @@
-MD5 (SVK-0.21.tar.gz) = 3d0d854275e8e339c834a90c45ca5e1a
-SIZE (SVK-0.21.tar.gz) = 140232
+MD5 (SVK-0.22.tar.gz) = b1ef930a62d44c96760701930c7fe419
+SIZE (SVK-0.22.tar.gz) = 172362
diff --git a/devel/svk/pkg-plist b/devel/svk/pkg-plist
index f9b4be9fac82..6679edf2f0bd 100644
--- a/devel/svk/pkg-plist
+++ b/devel/svk/pkg-plist
@@ -2,6 +2,7 @@ bin/svk
 %%SITE_PERL%%/SVK.pm
 %%SITE_PERL%%/SVK/Command.pm
 %%SITE_PERL%%/SVK/Command/Add.pm
+%%SITE_PERL%%/SVK/Command/Admin.pm
 %%SITE_PERL%%/SVK/Command/Annotate.pm
 %%SITE_PERL%%/SVK/Command/Cat.pm
 %%SITE_PERL%%/SVK/Command/Checkout.pm
@@ -28,6 +29,8 @@ bin/svk
 %%SITE_PERL%%/SVK/Command/Propget.pm
 %%SITE_PERL%%/SVK/Command/Proplist.pm
 %%SITE_PERL%%/SVK/Command/Propset.pm
+%%SITE_PERL%%/SVK/Command/Pull.pm
+%%SITE_PERL%%/SVK/Command/Push.pm
 %%SITE_PERL%%/SVK/Command/Resolved.pm
 %%SITE_PERL%%/SVK/Command/Revert.pm
 %%SITE_PERL%%/SVK/Command/Smerge.pm
@@ -53,11 +56,24 @@ bin/svk
 %%SITE_PERL%%/SVK/Merge.pm
 %%SITE_PERL%%/SVK/Notify.pm
 %%SITE_PERL%%/SVK/Patch.pm
+%%SITE_PERL%%/SVK/Resolve.pm
+%%SITE_PERL%%/SVK/Resolve/AraxisMerge.pm
+%%SITE_PERL%%/SVK/Resolve/Emacs.pm
+%%SITE_PERL%%/SVK/Resolve/FileMerge.pm
+%%SITE_PERL%%/SVK/Resolve/GtkDiff.pm
+%%SITE_PERL%%/SVK/Resolve/Guiffy.pm
+%%SITE_PERL%%/SVK/Resolve/KDiff3.pm
+%%SITE_PERL%%/SVK/Resolve/Meld.pm
+%%SITE_PERL%%/SVK/Resolve/P4WinMerge.pm
+%%SITE_PERL%%/SVK/Resolve/TkDiff.pm
+%%SITE_PERL%%/SVK/Resolve/TortoiseMerge.pm
+%%SITE_PERL%%/SVK/Resolve/XXDiff.pm
 %%SITE_PERL%%/SVK/Target.pm
 %%SITE_PERL%%/SVK/Target/Universal.pm
 %%SITE_PERL%%/SVK/Util.pm
 %%SITE_PERL%%/SVK/XD.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVK/.packlist
+@dirrm %%SITE_PERL%%/SVK/Resolve
 @dirrm %%SITE_PERL%%/SVK/I18N
 @dirrm %%SITE_PERL%%/SVK/Editor
 @dirrm %%SITE_PERL%%/SVK/Command