Date: Mon, 31 Mar 2014 04:27:53 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349701 - in head: net/c3270 x11/x3270 Message-ID: <201403310427.s2V4Rrs6073974@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon Mar 31 04:27:53 2014 New Revision: 349701 URL: http://svnweb.freebsd.org/changeset/ports/349701 QAT: https://qat.redports.org/buildarchive/r349701/ Log: Register conflicts due to x3270if. Approved by: araujo Modified: head/net/c3270/Makefile head/x11/x3270/Makefile Modified: head/net/c3270/Makefile ============================================================================== --- head/net/c3270/Makefile Mon Mar 31 03:30:22 2014 (r349700) +++ head/net/c3270/Makefile Mon Mar 31 04:27:53 2014 (r349701) @@ -12,6 +12,9 @@ COMMENT= Full-screen curses-based remote WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/} +# Conflict due to x3270if +CONFLICTS x3270-* + USE_GMAKE= yes GNU_CONFIGURE= yes Modified: head/x11/x3270/Makefile ============================================================================== --- head/x11/x3270/Makefile Mon Mar 31 03:30:22 2014 (r349700) +++ head/x11/x3270/Makefile Mon Mar 31 04:27:53 2014 (r349701) @@ -10,6 +10,9 @@ EXTRACT_SUFX= ga7-src.tgz MAINTAINER= ecrist@secure-computing.net COMMENT= 3270 Terminal emulator +# Conflict due to x3270if +CONFLICTS= c3270-* + BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403310427.s2V4Rrs6073974>