From owner-svn-ports-all@FreeBSD.ORG  Wed Aug 15 13:46:11 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 8B861106564A;
	Wed, 15 Aug 2012 13:46:11 +0000 (UTC)
	(envelope-from olgeni@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 760978FC12;
	Wed, 15 Aug 2012 13:46:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7FDkBf2062085;
	Wed, 15 Aug 2012 13:46:11 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FDkBtA062082;
	Wed, 15 Aug 2012 13:46:11 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201208151346.q7FDkBtA062082@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 15 Aug 2012 13:46:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302576 - in head/lang: erlang erlang14
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Wed, 15 Aug 2012 13:46:11 -0000

Author: olgeni
Date: Wed Aug 15 13:46:10 2012
New Revision: 302576
URL: http://svn.freebsd.org/changeset/ports/302576

Log:
  Remove conflicts with lang/erlang-lite, removed in r302575.

Modified:
  head/lang/erlang/Makefile
  head/lang/erlang14/Makefile

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Wed Aug 15 13:44:43 2012	(r302575)
+++ head/lang/erlang/Makefile	Wed Aug 15 13:46:10 2012	(r302576)
@@ -37,8 +37,6 @@ DOC_DISTFILES=	armstrong_thesis_2003.pdf
 		mnesia_overview.pdf:publications	\
 		programming_rules.pdf:erlangse
 
-CONFLICTS?=	erlang-lite-r[0-9]*
-
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 

Modified: head/lang/erlang14/Makefile
==============================================================================
--- head/lang/erlang14/Makefile	Wed Aug 15 13:44:43 2012	(r302575)
+++ head/lang/erlang14/Makefile	Wed Aug 15 13:46:10 2012	(r302576)
@@ -37,8 +37,6 @@ DOC_DISTFILES=	armstrong_thesis_2003.pdf
 		mnesia_overview.pdf:publications	\
 		programming_rules.pdf:erlangse
 
-CONFLICTS?=	erlang-lite-r[0-9]*
-
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}