3 files changed, 18 insertions, 6 deletions

diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 7beabdd68dab..e8e0d8ce6949 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	svk
-PORTVERSION=	2.0.2
-PORTREVISION=	3
+PORTVERSION=	2.2.0
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	../../authors/id/C/CL/CLKAO
@@ -47,6 +46,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/List/MoreUtils.pm:${PORTSDIR}/lang/p5-L
 		p5-PerlIO-via-symlink>=0.02:${PORTSDIR}/devel/p5-PerlIO-via-symlink \
 		p5-SVN-Simple>=0.27:${PORTSDIR}/devel/p5-SVN-Simple \
 		p5-SVN-Mirror>=0.71:${PORTSDIR}/devel/p5-SVN-Mirror \
+		p5-Time-Progress>=0:${PORTSDIR}/devel/p5-Time-Progress \
 		p5-YAML-Syck>=0.60:${PORTSDIR}/textproc/p5-YAML-Syck \
 		p5-version>=0.68:${PORTSDIR}/devel/p5-version
 RUN_DEPENDS=	${BUILD_DEPENDS}
@@ -59,6 +59,7 @@ MAN3=		SVK.3 \
 		SVK::Command::Add.3 \
 		SVK::Command::Admin.3 \
 		SVK::Command::Annotate.3 \
+		SVK::Command::Branch.3 \
 		SVK::Command::Cat.3 \
 		SVK::Command::Checkout.3 \
 		SVK::Command::Cleanup.3 \
@@ -130,6 +131,7 @@ MAN3=		SVK.3 \
 		SVK::Log::FilterPipeline.3 \
 		SVK::Logger.3 \
 		SVK::Merge.3 \
+		SVK::Merge::Info.3 \
 		SVK::MimeDetect.3 \
 		SVK::MimeDetect::FileLibMagic.3 \
 		SVK::MimeDetect::FileMMagic.3 \
@@ -144,6 +146,7 @@ MAN3=		SVK.3 \
 		SVK::Patchset.3 \
 		SVK::Path.3 \
 		SVK::Path::Checkout.3 \
+		SVK::Project.3 \
 		SVK::Resolve.3 \
 		SVK::Target::Universal.3 \
 		SVK::Util.3 \
@@ -175,4 +178,7 @@ pre-everything::
 	@${ECHO} "ports tree and upgrade it with 'portupgrade -R svk'."
 	@${ECHO} ""
 
+regression-test:
+	cd ${WRKSRC} && ${MAKE} test
+
 .include <bsd.port.post.mk>
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index 6af8ce40708f..71167d471d3d 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,3 +1,3 @@
-MD5 (SVK-v2.0.2.tar.gz) = 501d823231bd276e5b8f22b6ebe6cf2e
-SHA256 (SVK-v2.0.2.tar.gz) = 405b59c6398c50356f036292668bd653f43e296a3b301be64c90ffcd0e169530
-SIZE (SVK-v2.0.2.tar.gz) = 445041
+MD5 (SVK-v2.2.0.tar.gz) = cd241de739d367cb2d5f1ce48597bda2
+SHA256 (SVK-v2.2.0.tar.gz) = 3ef585c6e38c86da69741080315c2064a7a96a5b3a969d74dabfaab26fc33544
+SIZE (SVK-v2.2.0.tar.gz) = 519646
diff --git a/devel/svk/pkg-plist b/devel/svk/pkg-plist
index f39bc937c16e..1d862d9e159a 100644
--- a/devel/svk/pkg-plist
+++ b/devel/svk/pkg-plist
@@ -5,6 +5,7 @@ bin/svk
 %%SITE_PERL%%/SVK/Command/Add.pm
 %%SITE_PERL%%/SVK/Command/Admin.pm
 %%SITE_PERL%%/SVK/Command/Annotate.pm
+%%SITE_PERL%%/SVK/Command/Branch.pm
 %%SITE_PERL%%/SVK/Command/Cat.pm
 %%SITE_PERL%%/SVK/Command/Checkout.pm
 %%SITE_PERL%%/SVK/Command/Cleanup.pm
@@ -54,6 +55,7 @@ bin/svk
 %%SITE_PERL%%/SVK/Editor/Delay.pm
 %%SITE_PERL%%/SVK/Editor/Diff.pm
 %%SITE_PERL%%/SVK/Editor/Dynamic.pm
+%%SITE_PERL%%/SVK/Editor/FilterProp.pm
 %%SITE_PERL%%/SVK/Editor/InteractiveCommitter.pm
 %%SITE_PERL%%/SVK/Editor/InteractiveStatus.pm
 %%SITE_PERL%%/SVK/Editor/MapRev.pm
@@ -61,9 +63,9 @@ bin/svk
 %%SITE_PERL%%/SVK/Editor/Patch.pm
 %%SITE_PERL%%/SVK/Editor/Rename.pm
 %%SITE_PERL%%/SVK/Editor/Serialize.pm
-%%SITE_PERL%%/SVK/Editor/Sign.pm
 %%SITE_PERL%%/SVK/Editor/Status.pm
 %%SITE_PERL%%/SVK/Editor/SubTree.pm
+%%SITE_PERL%%/SVK/Editor/Tee.pm
 %%SITE_PERL%%/SVK/Editor/Translate.pm
 %%SITE_PERL%%/SVK/Editor/TxnCleanup.pm
 %%SITE_PERL%%/SVK/Editor/View.pm
@@ -94,6 +96,7 @@ bin/svk
 %%SITE_PERL%%/SVK/Log/FilterPipeline.pm
 %%SITE_PERL%%/SVK/Logger.pm
 %%SITE_PERL%%/SVK/Merge.pm
+%%SITE_PERL%%/SVK/Merge/Info.pm
 %%SITE_PERL%%/SVK/MimeDetect.pm
 %%SITE_PERL%%/SVK/MimeDetect/FileLibMagic.pm
 %%SITE_PERL%%/SVK/MimeDetect/FileMMagic.pm
@@ -111,6 +114,7 @@ bin/svk
 %%SITE_PERL%%/SVK/Path/Checkout.pm
 %%SITE_PERL%%/SVK/Path/Txn.pm
 %%SITE_PERL%%/SVK/Path/View.pm
+%%SITE_PERL%%/SVK/Project.pm
 %%SITE_PERL%%/SVK/Resolve.pm
 %%SITE_PERL%%/SVK/Resolve/AraxisMerge.pm
 %%SITE_PERL%%/SVK/Resolve/Emacs.pm
@@ -124,6 +128,7 @@ bin/svk
 %%SITE_PERL%%/SVK/Resolve/TkDiff.pm
 %%SITE_PERL%%/SVK/Resolve/TortoiseMerge.pm
 %%SITE_PERL%%/SVK/Resolve/Vim.pm
+%%SITE_PERL%%/SVK/Resolve/WinMerge.pm
 %%SITE_PERL%%/SVK/Resolve/XXDiff.pm
 %%SITE_PERL%%/SVK/Root.pm
 %%SITE_PERL%%/SVK/Root/Checkout.pm
@@ -142,6 +147,7 @@ bin/svk
 @dirrm %%SITE_PERL%%/SVK/Mirror/Backend
 @dirrm %%SITE_PERL%%/SVK/Mirror
 @dirrm %%SITE_PERL%%/SVK/MimeDetect
+@dirrm %%SITE_PERL%%/SVK/Merge
 @dirrm %%SITE_PERL%%/SVK/Log/Filter
 @dirrm %%SITE_PERL%%/SVK/Log
 @dirrm %%SITE_PERL%%/SVK/Inspector