From owner-svn-ports-all@FreeBSD.ORG Sun Jun 23 06:57:46 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B8A5EEF3; Sun, 23 Jun 2013 06:57:46 +0000 (UTC) (envelope-from tota@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9057211B0; Sun, 23 Jun 2013 06:57:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5N6vkCW038509; Sun, 23 Jun 2013 06:57:46 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5N6vkx5038508; Sun, 23 Jun 2013 06:57:46 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201306230657.r5N6vkx5038508@svn.freebsd.org> From: TAKATSU Tomonari Date: Sun, 23 Jun 2013 06:57:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321622 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jun 2013 06:57:46 -0000 Author: tota Date: Sun Jun 23 06:57:46 2013 New Revision: 321622 URL: http://svnweb.freebsd.org/changeset/ports/321622 Log: - Fix the value of RUBY_PROVIDED to be able to compare with RUBY_REQUIRE correctly - Define RUBY_RELVERSION_CODE - Add descriptions about RUBY_RELVERSION and RUBY_RELVERSION_CODE PR: ports/179830 Submitted by: tota (myself) Modified: head/Mk/bsd.ruby.mk Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Sun Jun 23 06:35:15 2013 (r321621) +++ head/Mk/bsd.ruby.mk Sun Jun 23 06:57:46 2013 (r321622) @@ -69,10 +69,15 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.or # # RUBY_PKGNAMEPREFIX - Common PKGNAMEPREFIX for ruby ports # (default: ruby${RUBY_SUFFIX}-) -# RUBY_VERSION - Full version of ruby without preview/beta suffix in +# RUBY_RELVERSION - Full version of ruby without preview/beta suffix in # the form of `x.y.z' (see below for current value). -# RUBY_VERSION_CODE - Full integer version of ruby without preview/beta -# suffix in the form of `xyz'. +# RUBY_RELVERSION_CODE - Integer version of RUBY_RELVERSION in the form of +# `xyz'. +# RUBY_VERSION - Composite version of RUBY_RELVERSION and +# RUBY_PATCHLEVEL in the form of `x.y.z.p'. +# (default: ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}) +# RUBY_VERSION_CODE - Composite integer version of RUBY_VERSION in the form +# of `xyzp'. # RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, # ruby-gdbm, etc.). # RUBY_PORTREVISION - PORTREVISION for the standard ruby ports. @@ -275,6 +280,7 @@ RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} +RUBY_RELVERSION_CODE?= ${RUBY_RELVERSION:S/.//g} RUBY_VERSION_CODE?= ${RUBY_VERSION:S/.//g} RUBY_VER= ${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/} RUBY_SUFFIX= ${RUBY_VER:S/.//} @@ -362,7 +368,7 @@ USE_RUBY= yes .if exists(${RUBY}) RUBY_PROVIDED!= ${RUBY} -e '\ - Ruby = ${RUBY_VERSION_CODE}; \ + Ruby = ${RUBY_RELVERSION_CODE}; \ value = begin; ${RUBY_REQUIRE}; end and puts value' .else RUBY_PROVIDED= "should be" # the latest version is going to be installed