From owner-svn-ports-all@FreeBSD.ORG  Tue Nov  6 23:35:00 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EC40886B;
 Tue,  6 Nov 2012 23:35:00 +0000 (UTC) (envelope-from cy@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 D141A8FC15;
 Tue,  6 Nov 2012 23:35:00 +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 qA6NZ0SQ087646;
 Tue, 6 Nov 2012 23:35:00 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6NZ06b087644;
 Tue, 6 Nov 2012 23:35:00 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201211062335.qA6NZ06b087644@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 6 Nov 2012 23:35:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307111 - head/x11-toolkits/open-motif
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 23:35:01 -0000

Author: cy
Date: Tue Nov  6 23:35:00 2012
New Revision: 307111
URL: http://svnweb.freebsd.org/changeset/ports/307111

Log:
  Remove redundant conflict.
  
  Feature safe:	yes

Modified:
  head/x11-toolkits/open-motif/Makefile

Modified: head/x11-toolkits/open-motif/Makefile
==============================================================================
--- head/x11-toolkits/open-motif/Makefile	Tue Nov  6 23:31:28 2012	(r307110)
+++ head/x11-toolkits/open-motif/Makefile	Tue Nov  6 23:35:00 2012	(r307111)
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/
 		jpeg:${PORTSDIR}/graphics/jpeg
 
 MAKE_JOBS_UNSAFE=	yes
-CONFLICTS=	lesstif-[0-9]* open-motif-[0-0]*
+CONFLICTS=	lesstif-[0-9]*
 # WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/motif-${PORTVERSION}