From owner-svn-ports-head@FreeBSD.ORG  Sat Aug 18 10:18:29 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EBBB106564A;
	Sat, 18 Aug 2012 10:18:29 +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 E481C8FC14;
	Sat, 18 Aug 2012 10:18:28 +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 q7IAISIh008021;
	Sat, 18 Aug 2012 10:18:28 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7IAISR3008019;
	Sat, 18 Aug 2012 10:18:28 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201208181018.q7IAISR3008019@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Sat, 18 Aug 2012 10:18:28 +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: r302717 - head/lang/erlang
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: Sat, 18 Aug 2012 10:18:29 -0000

Author: olgeni
Date: Sat Aug 18 10:18:27 2012
New Revision: 302717
URL: http://svn.freebsd.org/changeset/ports/302717

Log:
  Pet portlint:
  
  - Avoid using both PORTVERSION and DISTVERSION
  - Move CONFLICTS

Modified:
  head/lang/erlang/Makefile

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Sat Aug 18 09:56:36 2012	(r302716)
+++ head/lang/erlang/Makefile	Sat Aug 18 10:18:27 2012	(r302717)
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	erlang
-DISTVERSION=	R15B01
 PORTVERSION=	15.b.01
 PORTEPOCH=	2
 CATEGORIES=	lang parallel java
@@ -17,7 +16,7 @@ MASTER_SITES=	http://www.erlang.org/down
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
 		${MASTER_SITE_LOCAL:S/$/:local/:S,%SUBDIR%/,olgeni/,}
-DISTNAME=	otp_src_${DISTVERSION}
+DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg			\
 		${ERLANG_DOCS}:erlangorg		\
@@ -25,13 +24,13 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:er
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-CONFLICTS=	erlang-14*
-
 PATCH_SITES=	http://www.erlang.org/download
 
 MAINTAINER=	olgeni@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		\
@@ -58,6 +57,8 @@ DTRACE_DESC=	Enable DTrace support (expe
 
 OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE
 
+ERL_RELEASE=	R${PORTVERSION:S/.//g:U}
+
 .include <bsd.port.options.mk>
 
 # See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
@@ -130,8 +131,8 @@ LIB_DEPENDS+=	iodbc:${PORTSDIR}/database
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
-ERLANG_MAN=	otp_doc_man_${DISTVERSION}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${DISTVERSION}.tar.gz
+ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
+ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
 .if ${PORT_OPTIONS:MTHREADS}