From owner-svn-ports-head@FreeBSD.ORG  Mon Dec  2 08:59:14 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1865B96E;
 Mon,  2 Dec 2013 08:59:14 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 04E461D5C;
 Mon,  2 Dec 2013 08:59:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB28xDYW035446;
 Mon, 2 Dec 2013 08:59:13 GMT (envelope-from mr@svn.freebsd.org)
Received: (from mr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rB28xDn0035445;
 Mon, 2 Dec 2013 08:59:13 GMT (envelope-from mr@svn.freebsd.org)
Message-Id: <201312020859.rB28xDn0035445@svn.freebsd.org>
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Mon, 2 Dec 2013 08:59:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335470 - head/cad/qcad
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.16
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, 02 Dec 2013 08:59:14 -0000

Author: mr
Date: Mon Dec  2 08:59:13 2013
New Revision: 335470
URL: http://svnweb.freebsd.org/changeset/ports/335470

Log:
  Register conflicts with texlive-base-* since it has one file in common.
  
  PR:		ports/184368
  Submitted by:	lbartoletti

Modified:
  head/cad/qcad/Makefile

Modified: head/cad/qcad/Makefile
==============================================================================
--- head/cad/qcad/Makefile	Mon Dec  2 08:29:54 2013	(r335469)
+++ head/cad/qcad/Makefile	Mon Dec  2 08:59:13 2013	(r335470)
@@ -18,6 +18,8 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/b
 		${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo
 
+CONFLICTS=	texlive-base-*
+
 FETCH_ARGS=	-Fpr
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_JOBS_UNSAFE=yes