Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 1 Feb 2014 16:29:36 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342184 - head/Mk
Message-ID:  <201402011629.s11GTauA053566@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: zi
Date: Sat Feb  1 16:29:36 2014
New Revision: 342184
URL: http://svnweb.freebsd.org/changeset/ports/342184
QAT: https://qat.redports.org/buildarchive/r342184/

Log:
  - Honor user-defined LANG/LC_ALL/LC_CTYPE before defaulting (improves upon fix committed in r342091)
  - Ensure LANG/LC_ALL/LC_CTYPE are defined in GEM_ENV for all versions of ruby
  
  PR:		ports/186313
  Reviewed by:	swills@
  With hat:	ruby@

Modified:
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Sat Feb  1 16:21:45 2014	(r342183)
+++ head/Mk/bsd.ruby.mk	Sat Feb  1 16:29:36 2014	(r342184)
@@ -186,8 +186,6 @@ RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p$
 
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
 
-GEM_ENV?=		LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 LC_CTYPE=UTF-8
-
 RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir="${PREFIX}/include/ruby-1.9/" \
 			--with-rubylibprefix="${PREFIX}/lib/ruby" \
 			--docdir="${RUBY_DOCDIR}" \
@@ -213,8 +211,6 @@ RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p$
 
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
 
-GEM_ENV?=		LC_CTYPE=UTF-8
-
 RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir="${PREFIX}/include/ruby-2.0/" \
 			--with-rubylibprefix="${PREFIX}/lib/ruby" \
 			--docdir="${RUBY_DOCDIR}" \
@@ -246,6 +242,24 @@ _RUBY_VENDORDIR?=	${_RUBY_SYSLIBDIR}/rub
 .endif
 #      defined(RUBY)
 
+.if defined(LANG) && !empty(LANG)
+GEM_ENV+=		LANG=${LANG}
+.else
+GEM_ENV+=		LANG=en_US.UTF-8
+.endif
+
+.if defined(LC_ALL) && !empty(LC_ALL)
+GEM_ENV+=		LC_ALL=${LC_ALL}
+.else
+GEM_ENV+=		LC_ALL=en_US.UTF-8
+.endif
+
+.if defined(LC_CTYPE) && !empty(LC_CTYPE)
+GEM_ENV+=		LC_CTYPE=${LC_CTYPE}
+.else
+GEM_ENV+=		LC_CTYPE=UTF-8
+.endif
+
 RUBY_DEFAULT_SUFFIX?=	${RUBY_DEFAULT_VER:S/.//}
 
 RUBY_DISTVERSION?=	${RUBY_VERSION}

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