diff options
| author | obache <obache@pkgsrc.org> | 2010-02-22 09:20:30 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2010-02-22 09:20:30 +0000 |
| commit | aaca543be73265737cfcff4abb2b699e71c96a29 (patch) | |
| tree | ade0afa3b91548a7df229f6766b1b46728f7f223 /devel | |
| parent | eeb12508695f01cd04938a12b5ca683127a6dc18 (diff) | |
| download | pkgsrc-aaca543be73265737cfcff4abb2b699e71c96a29.tar.gz | |
conflicts with misc/git are resolved with git-4.9.5nb1.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/scmgit-base/Makefile | 4 | ||||
| -rw-r--r-- | devel/scmgit-docs/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile index b1c7fbe4bf6..ed9743711a4 100644 --- a/devel/scmgit-base/Makefile +++ b/devel/scmgit-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2010/02/03 23:26:17 minskim Exp $ +# $NetBSD: Makefile,v 1.23 2010/02/22 09:20:30 obache Exp $ # .include "../../devel/scmgit/Makefile.common" @@ -8,7 +8,7 @@ COMMENT= GIT Tree History Storage Tool (base package) PKG_DESTDIR_SUPPORT= user-destdir -CONFLICTS+= git-[0-9]* # misc/git +CONFLICTS+= git<4.9.5nb1 # misc/git DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error diff --git a/devel/scmgit-docs/Makefile b/devel/scmgit-docs/Makefile index 09f46f0faf4..840c5456a4d 100644 --- a/devel/scmgit-docs/Makefile +++ b/devel/scmgit-docs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/08/31 10:08:59 seb Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/22 09:20:30 obache Exp $ # PKGNAME= scmgit-docs-${GIT_VERSION} @@ -6,6 +6,8 @@ COMMENT= GIT Tree History Storage Tool (documentation) PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS+= git<4.9.5nb1 # misc/git + DISTINFO_FILE= ../../devel/scmgit-base/distinfo BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc |