Date: Thu, 11 Sep 2014 06:05:04 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367906 - in head: lang/modula3 net/cvsup-static Message-ID: <201409110605.s8B654Ea023338@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Sep 11 06:05:04 2014 New Revision: 367906 URL: http://svnweb.freebsd.org/changeset/ports/367906 QAT: https://qat.redports.org/buildarchive/r367906/ Log: 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. Modified: head/lang/modula3/Makefile head/net/cvsup-static/Makefile Modified: head/lang/modula3/Makefile ============================================================================== --- head/lang/modula3/Makefile Thu Sep 11 06:00:05 2014 (r367905) +++ head/lang/modula3/Makefile Thu Sep 11 06:05:04 2014 (r367906) @@ -26,7 +26,7 @@ DST1= m3-bootstrap.AMD64.FREEBSD.92.tar 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 Modified: head/net/cvsup-static/Makefile ============================================================================== --- head/net/cvsup-static/Makefile Thu Sep 11 06:00:05 2014 (r367905) +++ head/net/cvsup-static/Makefile Thu Sep 11 06:05:04 2014 (r367906) @@ -14,6 +14,8 @@ COMMENT= File distribution system optimi ONLY_FOR_ARCHS= amd64 +CONFLICTS_INSTALL= modula3-* + DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} NO_BUILD= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409110605.s8B654Ea023338>