diff options
| author | obache <obache@pkgsrc.org> | 2013-09-11 01:26:00 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2013-09-11 01:26:00 +0000 |
| commit | 08ee541bdc0b1b3702c09d8267f676c715c97897 (patch) | |
| tree | 9c0557aa14e68e309000d319686325814ae1b6f6 /devel | |
| parent | 52599304804f56e337d0a334769a28ea79aae278 (diff) | |
| download | pkgsrc-08ee541bdc0b1b3702c09d8267f676c715c97897.tar.gz | |
marked to supersede the previous package name.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/git-base/Makefile | 3 | ||||
| -rw-r--r-- | devel/git-docs/Makefile | 3 | ||||
| -rw-r--r-- | devel/git-gitk/Makefile | 3 | ||||
| -rw-r--r-- | devel/git/Makefile | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index e8cfa8e4189..1a5f2c52acf 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/09/10 08:17:38 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2013/09/11 01:26:00 obache Exp $ .include "../../devel/git/Makefile.common" @@ -6,6 +6,7 @@ PKGNAME= git-base-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (base package) CONFLICTS+= scmgit-base-[0-9]* +SUPERSEDES+= scmgit-base-[0-9]* DEPENDS+= p5-Error>=0.17015:../../devel/p5-Error # for git-send-email diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile index 67169713ba0..46b9b6e05e5 100644 --- a/devel/git-docs/Makefile +++ b/devel/git-docs/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2013/09/10 08:17:38 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2013/09/11 01:26:00 obache Exp $ PKGNAME= git-docs-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (documentation) CONFLICTS+= scmgit-docs-[0-9]* +SUPERSEDES+= scmgit-docs-[0-9]* DISTINFO_FILE= ../../devel/git-base/distinfo diff --git a/devel/git-gitk/Makefile b/devel/git-gitk/Makefile index 36178d0bf42..b79f0e76780 100644 --- a/devel/git-gitk/Makefile +++ b/devel/git-gitk/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2013/09/09 13:55:58 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2013/09/11 01:26:00 obache Exp $ PKGNAME= git-gitk-${GIT_VERSION} COMMENT= GIT Tree History Storage Tool (gitk) CONFLICTS+= git-base<1.7.12nb1 CONFLICTS+= scmgit-gitk-[0-9]* +SUPERSEDES+= scmgit-gitk-[0-9]* DEPENDS+= git-base>=1.7.12nb1:../../devel/git-base diff --git a/devel/git/Makefile b/devel/git/Makefile index a16f9b3e839..ce39b35d9d5 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/09/09 13:56:27 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2013/09/11 01:26:00 obache Exp $ .include "../../devel/git/Makefile.version" @@ -11,6 +11,8 @@ MASTER_SITES= http://www.kernel.org/pub/software/scm/git/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= GIT version control suite meta-package +SUPERSEDES+= scmgit-[0-8]* + META_PACKAGE= yes DEPENDS+= git-base>=${GIT_VERSION}:../../devel/git-base |