From owner-svn-ports-head@FreeBSD.ORG  Mon Mar 31 04:27:54 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 690B825E;
 Mon, 31 Mar 2014 04:27:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5584936B;
 Mon, 31 Mar 2014 04:27:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2V4RsbF073976;
 Mon, 31 Mar 2014 04:27:54 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2V4Rrs6073974;
 Mon, 31 Mar 2014 04:27:53 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201403310427.s2V4Rrs6073974@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Mon, 31 Mar 2014 04:27:53 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2014 04:27:54 -0000

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