Update to 1.00.

Upstream changes:

[Changes for 1.00 - 9 May, 2005]

* Fix backspace in prompt function for certain terminals.
  [Martijn van Beers <martijn@eekeek.org>]

* Fix the case that when checkout creates parent directory for you,
  the state wasn't properly flushed due to inappropriate lock.
  [matthewd]

* Document --file for everything that supports --message. [matthewd]

* Support 'vim -d' and 'gvim -df' for conflict resolution.
  [Derrick Daugherty <derrick@blinky-lights.org>]

[Changes for 0.994 - 29 Apr, 2005]

* Fix the warning "Revision too large" when doing svk log -l1 on a
  checkout which is not HEAD.

* Fix an edge case in post-commit checkout optimization on deleted
  entry.  This was causing stacktrace and not updating the checkout
  metadata accordingly.

* Only consider a g-merge to be a change when the merge source and destination
  paths are the same.  This eliminates empty revisions created by
  push. [matthewd]

* Improve the "Depot path" information, display the full path inside
  the repository instead of the checkout-point. [gugod]

* make sure $ENV{SVKPAGER} refers to an executable. [gugod]

* Fix svk diff on 0-length file on checkout.

[Changes for 0.993 - 25 Apr, 2005]

* Save commit message from editor in a tmpfile if commit fails. [#8336]

* Fix tests for bdb backend.

* svk import -C should not actually create import path nor turn path
  into copath. [#8719]

* Fix a bug that a dummy switch won't update revision metadata, which
  might be non-exist for the new branch.

* Ignore existing locks when trying to unlock a mirror.

* Added examples to the intro. [jesse]

[Changes for 0.992 - 18 Apr, 2005]

* Fix keyword translation for undesired characters. [matthewd]

* Fix svk switch from a removed branch.

* Don't trust LML would return a valid encoding that Encode knows.
  [Eric Gillespie <epg@pretzelnet.org>]

* Recognize merge-conflict error, so no stacktrace for it.

* svk info now skips files not under version control. [#8220] [gugod]

* Fix locked mirror messages.

* Various pool usage fixes.

[Changes for 0.991 - 29 Mar, 2005]

* Fix a regression for smerge supplying message from editor.

* Fix an edge case that push doesn't report empty merge when
  the mirrored remote repository is completely empty.

* Proper locking for svn::mirror objects, and mirror --unlock.

* svk patch subcommands are now options. [jesse]

* Support HEAD, BASE, and {DATE} in many commands using -r. [gugod]

* Support mkdir multiple copaths. [hcchien]

* Add --summary to smerge and push to show logs for changes to be merged. [#7791]

* Optionally support paging help text with IO::Pager. [gugod]

* Fix support for replace with history.

* Don't trust LML would return a valid encoding that Encode knows.
  [Eric Gillespie <epg@pretzelnet.org>]

* Make multiple -r options to dwim. [#7038]

* Allow import into mirrored path, and cleanup old code.

* Allow merge -c -REV to rollback rev.  This is the same as -rREV:REV-1.

* Add missing -c help to merge. [Ethan Tuttle <ethan@etuttle.com>]

* Make checkout, update, and merge deal with unwritable checkout copy
  more gracefully.

* Fix move on mirrored path.

* Fix rm for scheduled symlinks.

* Proper message for cp nonexisting parent without -p.

* Properly skip special node types like socket or device in checkout_delta.

* On writing mixed-eol files, don't croak on normalization.

* When doing file-anchored merges, ensure file is opened before
  cb_merged is called.

* When doing file-level merge, translate and report the target path
  properly.

* Do proper eol translation per svn:eol on local (yours) node
  before textual merges are invoked.

* Proper io layer ordering, and force re-translation for merge text
  when needed.

* Reopen FH in prepare_fh when needed, since apply_textdelta already
  closed the fh for us.

* Propset now works on multiple overlapping copaths. [#8139]

* Fix a buglet that two props set on a added node will be reported
  as added and prop-modified.

* Make svk info work on removed path. [mathhewd]

* Reflect errors in bin/svk exit codes. [matthewd]

* Update various help messages [#7217] [#7877] [hcchien]

* svk verify now only checks with the content guarded by PGP block.

* Fix a bug that interactive merge dies out horribly when you
  edit the merged file, exit with saving and answer a)bort.

3 files changed, 8 insertions, 31 deletions

diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index c3ad14fb8ce..18c92cd2e99 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/09 22:35:27 epg Exp $
 
-DISTNAME=	SVK-0.30
+DISTNAME=	SVK-1.00
 PKGNAME=	${DISTNAME:S/SVK/svk/}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
@@ -15,7 +15,7 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SVK/.packlist
 
 MAKE_ENV+=	PERL_EXTUTILS_AUTOINSTALL=--skip
 
-DEPENDS+=	p5-subversion>=1.0.4:../../devel/p5-subversion
+DEPENDS+=	p5-subversion>=1.0.7:../../devel/p5-subversion
 DEPENDS+=	p5-Algorithm-Annotate>=0.10:../../devel/p5-Algorithm-Annotate
 DEPENDS+=	p5-Algorithm-Diff>=1.19.01:../../devel/p5-Algorithm-Diff
 DEPENDS+=	p5-Clone>=0.15:../../devel/p5-Clone
@@ -33,7 +33,7 @@ DEPENDS+=	p5-PerlIO-via-symlink>=0.02:../../devel/p5-PerlIO-via-symlink
 DEPENDS+=	p5-Pod-Escapes>=1.04:../../textproc/p5-Pod-Escapes
 DEPENDS+=	p5-Pod-Simple>=3.02:../../textproc/p5-Pod-Simple
 DEPENDS+=	p5-Regexp-Shellish>=0.93:../../devel/p5-Regexp-Shellish
-DEPENDS+=	p5-SVN-Mirror>=0.55:../../devel/p5-SVN-Mirror
+DEPENDS+=	p5-SVN-Mirror>=0.58:../../devel/p5-SVN-Mirror
 DEPENDS+=	p5-SVN-Simple>=0.27:../../devel/p5-SVN-Simple
 DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 DEPENDS+=	p5-URI>=1.30:../../www/p5-URI
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index dd3e86241e7..ab7f0c20e52 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/03/03 04:38:36 epg Exp $
+$NetBSD: distinfo,v 1.8 2005/05/09 22:35:27 epg Exp $
 
-SHA1 (SVK-0.30.tar.gz) = adce506657433bdf2e341a35987918ef838ff361
-RMD160 (SVK-0.30.tar.gz) = 5f4c1f94057d7ea3b3b8bbeb7c2d3f552ae4382b
-Size (SVK-0.30.tar.gz) = 219461 bytes
-SHA1 (patch-aa) = b8a95604f2089998e5f2707c3c2366e7c63b6de8
+SHA1 (SVK-1.00.tar.gz) = af672a4f0b44efcd92042f683f063973a672d668
+RMD160 (SVK-1.00.tar.gz) = 1546e80b8e054017cc2e79c5e6b9630077735899
+Size (SVK-1.00.tar.gz) = 235278 bytes
diff --git a/devel/svk/patches/patch-aa b/devel/svk/patches/patch-aa
deleted file mode 100644
index 79f3124dcfd..00000000000
--- a/devel/svk/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/03/03 04:38:36 epg Exp $
-
---- lib/SVK/Util.pm.orig	2005-03-01 11:22:43.000000000 -0500
-+++ lib/SVK/Util.pm
-@@ -254,7 +254,7 @@ Get the current encoding from locale
- sub get_encoding {
-     return 'utf8' if $^O eq 'darwin';
-     local $@;
--    return resolve_alias (eval {
-+    my $result = resolve_alias (eval {
- 	require Locale::Maketext::Lexicon;
-         local $Locale::Maketext::Lexicon::Opts{encoding} = 'locale';
-         Locale::Maketext::Lexicon::encoding();
-@@ -262,6 +262,8 @@ sub get_encoding {
-         require 'open.pm';
-         return open::_get_locale_encoding();
-     } || 'utf8');
-+    $result ||= resolve_alias('C');
-+    return $result;
- }
- 
- =head3 get_encoder ([$encoding])