From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 15 23:30:32 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8A40AFA9;
 Thu, 15 Nov 2012 23:30:32 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 68C638FC15;
 Thu, 15 Nov 2012 23:30:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAFNUWSX075767;
 Thu, 15 Nov 2012 23:30:32 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAFNUWJS075766;
 Thu, 15 Nov 2012 23:30:32 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201211152330.qAFNUWJS075766@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Thu, 15 Nov 2012 23:30:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307468 - head/news/leafnode
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.14
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: Thu, 15 Nov 2012 23:30:32 -0000

Author: mandree
Date: Thu Nov 15 23:30:32 2012
New Revision: 307468
URL: http://svnweb.freebsd.org/changeset/ports/307468

Log:
  Update CONFLICTS.
  
  Suggested by:	ketas's ports conflicts checker
  Feature safe:	yes

Modified:
  head/news/leafnode/Makefile   (contents, props changed)

Modified: head/news/leafnode/Makefile
==============================================================================
--- head/news/leafnode/Makefile	Thu Nov 15 23:03:02 2012	(r307467)
+++ head/news/leafnode/Makefile	Thu Nov 15 23:30:32 2012	(r307468)
@@ -22,6 +22,8 @@ MAKE_JOBS_SAFE=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 
+CONFLICTS=	newsx-1* s-news-0*
+
 .include <bsd.port.pre.mk>
 
 .if exists(/var/spool/news/leaf.node) && !defined(PACKAGE_BUILDING)