diff options
| author | wiz <wiz@pkgsrc.org> | 2013-09-10 08:17:38 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-09-10 08:17:38 +0000 |
| commit | af3364d984aae9deef41200cf9fa0744737ba723 (patch) | |
| tree | ca7ba9147ef1325d3761214993249d7bf4cbdf11 /devel | |
| parent | 52ee351af2fe6681d85df299abc9b7a5accfa6a7 (diff) | |
| download | pkgsrc-af3364d984aae9deef41200cf9fa0744737ba723.tar.gz | |
Remove old conflicts line that breaks git meta package.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/git-base/Makefile | 3 | ||||
| -rw-r--r-- | devel/git-docs/Makefile | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index 1d5c525c3a2..e8cfa8e4189 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2013/09/09 13:54:44 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2013/09/10 08:17:38 wiz Exp $ .include "../../devel/git/Makefile.common" PKGNAME= git-base-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (base package) -CONFLICTS+= git<4.9.5nb1 # misc/git CONFLICTS+= scmgit-base-[0-9]* DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile index 6aa5f231d0a..67169713ba0 100644 --- a/devel/git-docs/Makefile +++ b/devel/git-docs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2013/09/09 13:55:14 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2013/09/10 08:17:38 wiz Exp $ PKGNAME= git-docs-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (documentation) -CONFLICTS+= git<4.9.5nb1 # misc/git CONFLICTS+= scmgit-docs-[0-9]* DISTINFO_FILE= ../../devel/git-base/distinfo |