Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Aug 2012 10:18:28 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302717 - head/lang/erlang
Message-ID:  <201208181018.q7IAISR3008019@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208181018.q7IAISR3008019>