diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-02-14 21:17:03 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-02-14 21:17:03 +0000 |
| commit | beec8de8c1f7f70c03e9bbef514911277c55b1dc (patch) | |
| tree | 6c25797196a6ae0caba77d8625e7b969b41d1e15 /misc/git | |
| parent | - Fix PLIST on amd64 [1] (diff) | |
Register CONFLICTS between ports that install bin/git.
PR: ports/93315
Submitted by: John E. Hein <jhein@timing.com>
Notes
Notes:
svn path=/head/; revision=156062
Diffstat (limited to 'misc/git')
| -rw-r--r-- | misc/git/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/misc/git/Makefile b/misc/git/Makefile index 4fb16ad01894..fd40799bb912 100644 --- a/misc/git/Makefile +++ b/misc/git/Makefile @@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= GNU Interactive Tools - a file system browser for UNIX systems +CONFLICTS= git-1.* cogito-[0-9]* + GNU_CONFIGURE= YES MAN1= git.1 gitaction.1 gitkeys.1 gitmount.1 \ gitrgrep.1 gitunpack.1 |