From owner-svn-ports-head@FreeBSD.ORG  Wed Aug 15 20:13:48 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 E472A106567B;
	Wed, 15 Aug 2012 20:13:48 +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 CFFD78FC15;
	Wed, 15 Aug 2012 20:13:48 +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 q7FKDmTx006368;
	Wed, 15 Aug 2012 20:13:48 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FKDmLv006366;
	Wed, 15 Aug 2012 20:13:48 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201208152013.q7FKDmLv006366@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 15 Aug 2012 20:13:48 +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: r302601 - head/lang/erlang14
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 15 Aug 2012 20:13:49 -0000

Author: olgeni
Date: Wed Aug 15 20:13:48 2012
New Revision: 302601
URL: http://svn.freebsd.org/changeset/ports/302601

Log:
  - Use the same version numbering scheme as lang/erlang.
  - Document conflict with Erlang R15.

Modified:
  head/lang/erlang14/Makefile

Modified: head/lang/erlang14/Makefile
==============================================================================
--- head/lang/erlang14/Makefile	Wed Aug 15 20:08:56 2012	(r302600)
+++ head/lang/erlang14/Makefile	Wed Aug 15 20:13:48 2012	(r302601)
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r14b04
-PORTREVISION=	3
+DISTVERSION=	R14B04
+PORTVERSION=	14.b.04
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -25,6 +25,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:er
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+CONFLICTS=	erlang-15*
+
 PATCH_SITES=	http://www.erlang.org/download
 
 MAINTAINER=	olgeni@FreeBSD.org