aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2009-02-24 00:28:40 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2009-02-24 00:28:40 +0000
commit9430a8e47d04cad72918aa926364434281447e83 (patch)
tree727c8c81acd075a417564b39ac98d20ac9057062 /misc
parent1c7f35fe8035af5dba2220edd64fae9b4a6aa034 (diff)
downloadports-9430a8e47d04cad72918aa926364434281447e83.tar.gz
ports-9430a8e47d04cad72918aa926364434281447e83.zip
Notes
Diffstat (limited to 'misc')
-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 \