ports/186313: commit references a PR

[dfilter service]

The following reply was made to PR ports/186313; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/186313: commit references a PR
Date: Sat,  1 Feb 2014 16:29:43 +0000 (UTC)

 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}
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"