diff options
author | marino <marino@FreeBSD.org> | 2014-09-11 14:05:04 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2014-09-11 14:05:04 +0800 |
commit | bd9ca1f8ee6a5623576986258b616b7ef36b4b23 (patch) | |
tree | 30e616b24514241440993839633fed121207c5e7 /lang/modula3 | |
parent | 885a907a22391d7edab06ab159ffd96b9d6bd006 (diff) | |
download | freebsd-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 'lang/modula3')
-rw-r--r-- | lang/modula3/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile index b88b0bf0667f..fd5420443aa6 100644 --- a/lang/modula3/Makefile +++ b/lang/modula3/Makefile @@ -26,7 +26,7 @@ DST1= m3-bootstrap.AMD64.FREEBSD.92.tar.bz2:boot DST2= m3-bootstrap.x86_64.DRAGONFLY.36.tar.bz2:boot ONLY_FOR_ARCHS= amd64 -CONFLICTS_INSTALL= cvsup-* +CONFLICTS_INSTALL= binary-cvsup-* USES= gmake pgsql USE_XORG= xaw xmu xext xt sm ice x11 |