aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormarino <marino@FreeBSD.org>2014-09-11 14:05:04 +0800
committermarino <marino@FreeBSD.org>2014-09-11 14:05:04 +0800
commitbd9ca1f8ee6a5623576986258b616b7ef36b4b23 (patch)
tree30e616b24514241440993839633fed121207c5e7 /net
parent885a907a22391d7edab06ab159ffd96b9d6bd006 (diff)
downloadfreebsd-ports-gnome-bd9ca1f8ee6a5623576986258b616b7ef36b4b23.tar.gz
freebsd-ports-gnome-bd9ca1f8ee6a5623576986258b616b7ef36b4b23.tar.zst
freebsd-ports-gnome-bd9ca1f8ee6a5623576986258b616b7ef36b4b23.zip
Update conflicts between modula3 and cvsup*
Modula3 provides a newer cvsup which is unconditionally installed. This put the port in conflict with the two expiring cvsup ports. They've been removed, but a new cvsup-static port took their place. Update the CONFLICTS_INSTALL on both modula3 and cvsup-static as a follow-up to change in cvsup-* ports.
Diffstat (limited to 'net')
-rw-r--r--net/cvsup-static/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/cvsup-static/Makefile b/net/cvsup-static/Makefile
index b533580a9209..e34d21fda4f0 100644
--- a/net/cvsup-static/Makefile
+++ b/net/cvsup-static/Makefile
@@ -14,6 +14,8 @@ COMMENT= File distribution system optimized for CVS
ONLY_FOR_ARCHS= amd64
+CONFLICTS_INSTALL= modula3-*
+
DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH}
NO_BUILD= yes