From beec8de8c1f7f70c03e9bbef514911277c55b1dc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 14 Feb 2006 21:17:03 +0000 Subject: [PATCH] Register CONFLICTS between ports that install bin/git. PR: ports/93315 Submitted by: John E. Hein --- devel/cogito/Makefile | 2 ++ devel/git/Makefile | 2 ++ misc/git/Makefile | 2 ++ misc/gnuit/Makefile | 2 ++ 4 files changed, 8 insertions(+) diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile index c27411722f47..84701ae384ff 100644 --- a/devel/cogito/Makefile +++ b/devel/cogito/Makefile @@ -20,6 +20,8 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ rsync:${PORTSDIR}/net/rsync +CONFLICTS= git-[0-9]* + USE_BZIP2= yes USE_GMAKE= yes diff --git a/devel/git/Makefile b/devel/git/Makefile index c71c6c5794dc..122fa731e7b0 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -19,6 +19,8 @@ RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \ wish8.4:${PORTSDIR}/x11-toolkits/tk84 LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 +CONFLICTS= cogito-[0-9]* git-4.* + USE_PERL5= yes USE_PYTHON= yes USE_ICONV= yes 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 diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile index 4fb16ad01894..fd40799bb912 100644 --- a/misc/gnuit/Makefile +++ b/misc/gnuit/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