2006-02-06 00:08:03 +01:00
|
|
|
# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:53 joerg Exp $
|
2004-09-26 06:43:59 +02:00
|
|
|
|
2005-10-22 19:00:38 +02:00
|
|
|
DISTNAME= SVK-1.05
|
2004-11-09 01:56:47 +01:00
|
|
|
PKGNAME= ${DISTNAME:S/SVK/svk/}
|
2006-02-06 00:08:03 +01:00
|
|
|
PKGREVISION= 2
|
2004-09-26 06:43:59 +02:00
|
|
|
CATEGORIES= devel perl5
|
|
|
|
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=OurNet/CLKAO/}
|
|
|
|
|
2005-10-22 19:00:38 +02:00
|
|
|
MAINTAINER= sommerfeld@NetBSD.org
|
2004-09-26 06:43:59 +02:00
|
|
|
HOMEPAGE= http://svk.elixus.org/
|
2005-10-22 19:00:38 +02:00
|
|
|
COMMENT= Decentralized version control system built on Subversion
|
2004-09-26 06:43:59 +02:00
|
|
|
|
2004-11-10 19:09:07 +01:00
|
|
|
PKG_INSTALLATION_TYPES= overwrite pkgviews
|
|
|
|
|
2005-07-13 20:01:18 +02:00
|
|
|
PERL5_PACKLIST= auto/SVK/.packlist
|
2004-09-26 06:43:59 +02:00
|
|
|
|
|
|
|
MAKE_ENV+= PERL_EXTUTILS_AUTOINSTALL=--skip
|
|
|
|
|
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.
2005-05-10 00:35:27 +02:00
|
|
|
DEPENDS+= p5-subversion>=1.0.7:../../devel/p5-subversion
|
2004-09-26 06:43:59 +02:00
|
|
|
DEPENDS+= p5-Algorithm-Annotate>=0.10:../../devel/p5-Algorithm-Annotate
|
2005-01-16 23:39:50 +01:00
|
|
|
DEPENDS+= p5-Algorithm-Diff>=1.19.01:../../devel/p5-Algorithm-Diff
|
|
|
|
DEPENDS+= p5-Clone>=0.15:../../devel/p5-Clone
|
2004-09-27 01:33:48 +02:00
|
|
|
DEPENDS+= p5-Compress-Zlib>=1.33:../../devel/p5-Compress-Zlib
|
2004-11-11 19:04:36 +01:00
|
|
|
DEPENDS+= p5-Data-Hierarchy>=0.21:../../devel/p5-Data-Hierarchy
|
2004-09-27 01:35:38 +02:00
|
|
|
DEPENDS+= p5-File-BaseDir>=0.02:../../devel/p5-File-BaseDir
|
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]
2004-11-06 22:52:56 +01:00
|
|
|
DEPENDS+= p5-File-Type>=0.22:../../devel/p5-File-Type
|
2005-01-16 23:39:50 +01:00
|
|
|
DEPENDS+= p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw
|
2004-09-27 01:35:38 +02:00
|
|
|
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
|
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]
2004-11-06 22:52:56 +01:00
|
|
|
DEPENDS+= p5-PerlIO-eol>=0.13:../../devel/p5-PerlIO-eol
|
2004-09-26 06:43:59 +02:00
|
|
|
DEPENDS+= p5-PerlIO-via-dynamic>=0.11:../../devel/p5-PerlIO-via-dynamic
|
2005-01-16 23:39:50 +01:00
|
|
|
DEPENDS+= p5-PerlIO-via-symlink>=0.02:../../devel/p5-PerlIO-via-symlink
|
2004-09-27 01:35:38 +02:00
|
|
|
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
|
2005-10-22 19:00:38 +02:00
|
|
|
DEPENDS+= p5-SVN-Mirror>=0.66:../../devel/p5-SVN-Mirror
|
2005-03-03 05:38:36 +01:00
|
|
|
DEPENDS+= p5-SVN-Simple>=0.27:../../devel/p5-SVN-Simple
|
2004-09-26 06:43:59 +02:00
|
|
|
DEPENDS+= p5-TimeDate>=1.14:../../time/p5-TimeDate
|
2005-01-16 23:39:50 +01:00
|
|
|
DEPENDS+= p5-URI>=1.30:../../www/p5-URI
|
2005-05-10 00:40:52 +02:00
|
|
|
DEPENDS+= p5-YAML>=0.38:../../textproc/p5-YAML
|
2005-03-03 05:38:36 +01:00
|
|
|
DEPENDS+= p5-Class-Autouse>=1.15:../../devel/p5-Class-Autouse
|
2005-10-23 01:22:17 +02:00
|
|
|
DEPENDS+= p5-IO-Pager>=0.06:../../devel/p5-IO-Pager
|
2004-09-26 06:43:59 +02:00
|
|
|
|
|
|
|
.include "../../lang/perl5/module.mk"
|
|
|
|
.include "../../mk/bsd.pkg.mk"
|