Update to 0.25.

No longer need shared-mime-info, p5-Text-Diff, or p5-File-MimeInfo.
New dependencies p5-File-Type and p5-PerlIO-eol.

Upstream change log:

[Changes for 0.25 - 25 Oct, 2004]

* Fix the mkdir sequence which causes first-time svk users fatal error.
  [Autrijus]

[Changes for 0.24 - 24 Oct, 2004]

* Fix svk ps regression for svn 1.0.x.

* Fallback to getpwuid($<) in case $ENV{HOME} or $ENV{USER} is not
  set, as is the case in Fink.  Reported by Christian Schaffner.
  [Autrijus]

* Fix "svk pull -a" when the current directory is not a
  checkout path. [Autrijus]

* Fix checkout_delta cache on win32. [Autrijus]

* Fix svk move copath destination with trailing slash.

* Make svk move checks if the target already exists before doing
  anything that might leave the checkout in an inconsistent state.

* "svk cp //depotpath" should be parsed as "svk cp //depotpath .",
  not "svk cp . //depotpath".  Reported by Jesse Vincent. [Autrijus]

* New: svk admin rmcache.

* The old commit message prompt is now split into two:
 - Those with editable target list now shows:
   "=== Targets to commit (you may delete items from it) ==="
 - Those without editable targets now shows:
   "=== Please enter your commit message above this line ==="
 [Autrijus]

* If SVN::Core version is too old, die with a meaningful message.
  [Autrijus]

[Changes for 0.23 - 18 Oct, 2004]

* New: commit / smerge -P creats patch, and obsoletes unintuitive svk
  patch create.

* New: svk merge now supports -cN which means -r N-1:N.

* New: svk mirror --recover. [Autrijus]

* New: svk mkdir -p and svk copy -p to create intermediate directories.

* New: svk pull DEPOTPATH. [Jesse Vincent]

* Proper svn:eol-style support with the same semantics as svn. [Autrijus]

* Proper upper/lower case normalization for Win32 filesystems. [Autrijus]

* The SVK Help system, as SVK/Help/[lang/]/*.pod. [Autrijus]

* The log produced by smerge -l no longer contains the duplicated logs
  that were merged from the current target.

* smerge -I and repeated smerge now works on checkout.

* commit --import or import now treats obstructed items as replaced.

* Don't skip explicit targets on svk add.

* Correctly obtain the user name on non-unix platforms. [Autrijus]

* Fix pool abuse in history tracing code. [Autrijus]

* Fix smerge -IB.

* svk patch delete now works.

* svk delete now works within mirrored paths.

* svk annotate now works on files with CR/CRLF line endings. [Autrijus]

[Changes for 0.22 - 4 Oct, 2004]

* Interactive merge support is now default. [Autrijus]

* svk patch apply.

* Modular external merge tool support, with the following supported:
  AraxisMerge, Emacs, FileMerge, GtkDiff, Guiffy, KDiff3, Meld,
  P4WinMerge, TkDiff, TortoiseMerge, XXDiff. [Autrijus]

* Patch format changed, it's now unidiff with FreezeThaw-serialized
  SVK::Patch. [Autrijus]

* merge and smerge now supports -f and -t options to deduce copy
  source as target. [Eric Lindvall]

* Experimental depotpath auto-vivification from URL. [Autrijus]
  This allows you to svk checkout URL and svk cp URL local-branch.

* Experimental svk push and pull support.

* sync and update now supports -s and -m to sync and/or merge from
  branch source. [Autrijus]

* revert now also marks nodes as resolved.

* mirror, checkout and switch now all support --list, --detach and
  --relocate. [Autrijus]

* New aliases: cm => cmerge, depot => depotmap, sw => switch.

* Implement "svk depot --add", "svk depot --delete". [Autrijus]

* prop{get,set,edit,del} on revprops. [Autrijus]

* Fix smerge -l that trims logs before another smerge in the other
  direction.

* Use svn's internal streamy diff library instead of
  Text::Diff. [Autrijus]

* svk import --to-checkout can import a directory and turn it to a
  checkout path in-place . [Autrijus]

* -s (--sign) is renamed to -S.

* rename import --force to --from-checkout.

* $Revision$ now means $Rev$, not $FileRev$, to agree with Subversion.

* "svk mirror --list" and "svk sync --all" now operates on all depots,
  if no arguments is given, instead of on //. [Autrijus]

* svk admin to wrap svnadmin. [Autrijus]

* svk cleanup --all. [Autrijus]

* "svk diff PATH1 PATH2 PATH3 ..." works as svn does. [Autrijus]

* We now use the self-contained File::Type instead of
  File::MimeInfo. [Autrijus]

2 files changed, 9 insertions, 11 deletions

diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 80b17ca405a..31b2eb8c829 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/11/06 21:52:56 epg Exp $
 
-DISTNAME=	SVK-0.21
-PKGNAME=	svk-0.21
+DISTNAME=	SVK-0.25
+PKGNAME=	svk-0.25
 PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
@@ -20,22 +20,20 @@ DEPENDS+=	p5-Algorithm-Annotate>=0.10:../../devel/p5-Algorithm-Annotate
 DEPENDS+=	p5-Compress-Zlib>=1.33:../../devel/p5-Compress-Zlib
 DEPENDS+=	p5-Data-Hierarchy>=0.19:../../devel/p5-Data-Hierarchy
 DEPENDS+=	p5-File-BaseDir>=0.02:../../devel/p5-File-BaseDir
-DEPENDS+=	p5-File-MimeInfo>=0.10:../../devel/p5-File-MimeInfo
+DEPENDS+=	p5-File-Type>=0.22:../../devel/p5-File-Type
 DEPENDS+=	p5-IO-Digest>=0.10:../../devel/p5-IO-Digest
 DEPENDS+=p5-Locale-Maketext-Lexicon>=0.42:../../misc/p5-Locale-Maketext-Lexicon
 DEPENDS+=p5-Locale-Maketext-Simple>=0.12:../../misc/p5-Locale-Maketext-Simple
+DEPENDS+=	p5-PerlIO-eol>=0.13:../../devel/p5-PerlIO-eol
 DEPENDS+=	p5-PerlIO-via-dynamic>=0.11:../../devel/p5-PerlIO-via-dynamic
 DEPENDS+=	p5-PerlIO-via-symlink>=0.01:../../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.47:../../devel/p5-SVN-Mirror
+DEPENDS+=	p5-SVN-Mirror>=0.48:../../devel/p5-SVN-Mirror
 DEPENDS+=	p5-SVN-Simple>=0.25:../../devel/p5-SVN-Simple
-DEPENDS+=	p5-Text-Diff>=0.35:../../textproc/p5-Text-Diff
 DEPENDS+=	p5-TimeDate>=1.14:../../time/p5-TimeDate
 DEPENDS+=	p5-YAML>=0.35:../../textproc/p5-YAML
 
-.include "../../databases/shared-mime-info/buildlink3.mk"
-
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/svk/distinfo b/devel/svk/distinfo
index b96b5ffc9aa..33dc0e2c9ba 100644
--- a/devel/svk/distinfo
+++ b/devel/svk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/09/26 04:43:59 epg Exp $
+$NetBSD: distinfo,v 1.2 2004/11/06 21:52:56 epg Exp $
 
-SHA1 (SVK-0.21.tar.gz) = 34427a1054eeb9c6542fbb14513a73ee8b731b48
-Size (SVK-0.21.tar.gz) = 140232 bytes
+SHA1 (SVK-0.25.tar.gz) = ab09f8a23339f227ccb07971e306cdc102214685
+Size (SVK-0.25.tar.gz) = 183533 bytes