svn commit: r311243 - in head: . lang lang/erlang lang/erlang14

[Jimmy Olgeni]

Author: olgeni
Date: Wed Jan 30 17:07:20 2013
New Revision: 311243
URL: http://svnweb.freebsd.org/changeset/ports/311243

Log:
  Back when Erlang R15 was imported, lang/erlang14 was added as a
  safety fallback option.
  
  Since no issues came up with R15 it can now be removed.

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

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Jan 30 16:57:55 2013	(r311242)
+++ head/MOVED	Wed Jan 30 17:07:20 2013	(r311243)
@@ -4016,3 +4016,5 @@ sysutils/salt|sysutils/py-salt|2013-01-2
 sysutils/salt-cloud|sysutils/py-salt-cloud|2013-01-27|Rename to consistency with other Python ports
 deskutils/py-dosage|deskutils/dosage|2013-01-28|Rename - it's a standalone application
 textproc/clucene-contrib|textproc/clucene|2013-01-28|Integrated into textproc/clucene
+textproc/clucene-contrib|textproc/clucene|2013-01-28|Integrated into textproc/clucene
+lang/erlang14||2013-01-30|Not needed; no issues came up with R15

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Wed Jan 30 16:57:55 2013	(r311242)
+++ head/lang/Makefile	Wed Jan 30 17:07:20 2013	(r311243)
@@ -58,7 +58,6 @@
     SUBDIR += embryo
     SUBDIR += eperl
     SUBDIR += erlang
-    SUBDIR += erlang14
     SUBDIR += execline
     SUBDIR += expect
     SUBDIR += expect-devel

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Wed Jan 30 16:57:55 2013	(r311242)
+++ head/lang/erlang/Makefile	Wed Jan 30 17:07:20 2013	(r311243)
@@ -29,8 +29,6 @@ PATCH_SITES=	http://www.erlang.org/downl
 MAINTAINER=	olgeni at FreeBSD.org
 COMMENT=	A functional programming language from Ericsson
 
-CONFLICTS=	erlang-14*
-
 DOC_DISTFILES=	armstrong_thesis_2003.pdf:joe		\
 		bjarnelic.pdf:publications		\
 		erlang-book-part1.pdf:erlangorg		\