Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Jun 2016 12:23:38 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416238 - head/Mk
Message-ID:  <201606011223.u51CNcub037885@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Wed Jun  1 12:23:38 2016
New Revision: 416238
URL: https://svnweb.freebsd.org/changeset/ports/416238

Log:
  Fix up Mk/bsd.ruby.mk after removing lang/ruby20
  
  Reported by:	mat via #bsdports

Modified:
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Wed Jun  1 11:47:40 2016	(r416237)
+++ head/Mk/bsd.ruby.mk	Wed Jun  1 12:23:38 2016	(r416238)
@@ -15,7 +15,7 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.or
 # [variables that a user may define]
 #
 # RUBY_VER		- (See below)
-# RUBY_DEFAULT_VER	- Set to (e.g.) "2.0" if you want to refer to "ruby20"
+# RUBY_DEFAULT_VER	- Set to (e.g.) "2.1" if you want to refer to "ruby21"
 #			  just as "ruby".
 # RUBY_ARCH		- (See below)
 # RUBY_RD_HTML		- Define if you want HTML files generated from RD files.
@@ -165,17 +165,7 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 .if defined(RUBY_VER)
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-. if ${RUBY_VER} == 2.0
-#
-# Ruby 2.0
-#
-RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	0
-RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	648
-RUBY20=			""	# PLIST_SUB helpers
-
-. elif ${RUBY_VER} == 2.1
+. if ${RUBY_VER} == 2.1
 #
 # Ruby 2.1
 #
@@ -211,14 +201,13 @@ RUBY23=			""	# PLIST_SUB helpers
 #
 # Other versions
 #
-IGNORE=	Only ruby 2.0, 2.1, 2.2 and 2.3 are supported
+IGNORE=	Only ruby 2.1, 2.2 and 2.3 are supported
 _INVALID_RUBY_VER=	1
 . endif
 .endif # defined(RUBY_VER)
 
 .if !defined(_INVALID_RUBY_VER)
 
-RUBY20?=		"@comment "
 RUBY21?=		"@comment "
 RUBY22?=		"@comment "
 RUBY23?=		"@comment "
@@ -340,7 +329,6 @@ PLIST_SUB+=		${PLIST_RUBY_DIRS:C,DIR="($
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
 			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
-			RUBY20=${RUBY20} \
 			RUBY21=${RUBY21} \
 			RUBY22=${RUBY22} \
 			RUBY23=${RUBY23}



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