Date: Mon, 30 Mar 2015 19:17:33 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382712 - head/Mk Message-ID: <201503301917.t2UJHX4u064383@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Mar 30 19:17:33 2015 New Revision: 382712 URL: https://svnweb.freebsd.org/changeset/ports/382712 QAT: https://qat.redports.org/buildarchive/r382712/ Log: Improve invalid version detection Reported by: dvl, zi Submitted by: bdrewery Tested by: zi Modified: head/Mk/bsd.ruby.mk Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Mon Mar 30 19:09:06 2015 (r382711) +++ head/Mk/bsd.ruby.mk Mon Mar 30 19:17:33 2015 (r382712) @@ -202,9 +202,12 @@ RUBY22= "" # PLIST_SUB helpers # Other versions # IGNORE= Only ruby 2.0, 2.1 and 2.2 are supported +_INVALID_RUBY_VER= 1 . endif .endif # defined(RUBY_VER) +.if !defined(_INVALID_RUBY_VER) + RUBY20?= "@comment " RUBY21?= "@comment " RUBY22?= "@comment " @@ -233,8 +236,11 @@ _RUBY_SYSLIBDIR?= ${PREFIX}/lib _RUBY_SITEDIR?= ${_RUBY_SYSLIBDIR}/ruby/site_ruby _RUBY_VENDORDIR?= ${_RUBY_SYSLIBDIR}/ruby/vendor_ruby .endif +.endif # defined(RUBY) +.if !defined(_INVALID_RUBY_VER) + .if defined(LANG) && !empty(LANG) GEM_ENV+= LANG=${LANG} .else @@ -617,4 +623,5 @@ PLIST_SUB+= RUBY_RD_HTML_FILES="@commen BUILD_DEPENDS+= ${DEPEND_RUBY_RDTOOL} .endif +.endif # _INVALID_RUBY_VER .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503301917.t2UJHX4u064383>