From owner-svn-ports-all@FreeBSD.ORG Sat Feb 15 07:23:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70008116; Sat, 15 Feb 2014 07:23:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 38AD31D78; Sat, 15 Feb 2014 07:23:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1F7NvHH076772; Sat, 15 Feb 2014 07:23:57 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1F7NvtG076771; Sat, 15 Feb 2014 07:23:57 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201402150723.s1F7NvtG076771@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 15 Feb 2014 07:23:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344325 - 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.17 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: Sat, 15 Feb 2014 07:23:57 -0000 Author: sunpoet Date: Sat Feb 15 07:23:56 2014 New Revision: 344325 URL: http://svnweb.freebsd.org/changeset/ports/344325 QAT: https://qat.redports.org/buildarchive/r344325/ Log: - Group common variable declarations together Reviewed by: swills Modified: head/Mk/bsd.ruby.mk Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Sat Feb 15 03:03:18 2014 (r344324) +++ head/Mk/bsd.ruby.mk Sat Feb 15 07:23:56 2014 (r344325) @@ -181,16 +181,6 @@ RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 484 -RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} -RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} - -RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} - -RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-1.9/" \ - --with-rubylibprefix="${PREFIX}/lib/ruby" \ - --docdir="${RUBY_DOCDIR}" \ - --with-soname=ruby19 - # # PLIST_SUB helpers # @@ -206,23 +196,12 @@ RUBY_PORTREVISION= 4 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 353 -RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} -RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} - -RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} - -RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-2.0/" \ - --with-rubylibprefix="${PREFIX}/lib/ruby" \ - --docdir="${RUBY_DOCDIR}" \ - --with-soname=ruby20 - # # PLIST_SUB helpers # RUBY19= "@comment " RUBY20= "" - . else # # Other versions @@ -231,6 +210,16 @@ IGNORE= Only ruby 1.9 and 2.0 are suppor . endif .endif # defined(RUBY_VER) +RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} +RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} + +RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} + +RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ + --with-rubylibprefix="${PREFIX}/lib/ruby" \ + --docdir="${RUBY_DOCDIR}" \ + --with-soname=ruby${RUBY_SUFFIX} + CONFIGURE_TARGET?= ${ARCH}-portbld-freebsd${OSREL:C/\..*//} RUBY_ARCH?= ${ARCH}-freebsd${OSREL:C/\..*//}