aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerald <gerald@FreeBSD.org>2009-02-24 08:28:40 +0800
committergerald <gerald@FreeBSD.org>2009-02-24 08:28:40 +0800
commit564d79d4a9299c845ac2e40f03feb1ba0e94fe06 (patch)
tree805dac74323607964e5d7b52eb6f54ceb405094b
parent9e0c1198c856e4e1e65100388328e5616ec72121 (diff)
downloadfreebsd-ports-gnome-564d79d4a9299c845ac2e40f03feb1ba0e94fe06.tar.gz
freebsd-ports-gnome-564d79d4a9299c845ac2e40f03feb1ba0e94fe06.tar.zst
freebsd-ports-gnome-564d79d4a9299c845ac2e40f03feb1ba0e94fe06.zip
After my latest updates this port no longer installs a program by the
name of git, thus remove conflicts with git and cogito.
-rw-r--r--misc/git/Makefile2
-rw-r--r--misc/gnuit/Makefile2
2 files changed, 0 insertions, 4 deletions
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 994dea510a8e..b240e8c5d56b 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -14,8 +14,6 @@ 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 gitdpkgname.1 gitfm.1 gitinternal.1 \
gitkeys.1 gitmount.1 gitps.1 gitregrep.1 gitrfgrep.1 \
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 994dea510a8e..b240e8c5d56b 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -14,8 +14,6 @@ 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 gitdpkgname.1 gitfm.1 gitinternal.1 \
gitkeys.1 gitmount.1 gitps.1 gitregrep.1 gitrfgrep.1 \