svn commit: r302576 - in head/lang: erlang erlang14

[Jimmy Olgeni]

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}