svn commit: r338496 - in head: Mk lang/ruby20/files

[Steve Wills]

Author: swills
Date: Thu Jan  2 20:46:29 2014
New Revision: 338496
URL: http://svnweb.freebsd.org/changeset/ports/338496

Log:
  - Fix mkmf DESTDIR issue with patch from upstream
  
  Obtained from:	http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=41756&r2=41755&pathrev=41756

Added:
  head/lang/ruby20/files/patch-mkmf.rb   (contents, props changed)
Modified:
  head/Mk/bsd.ruby.mk

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Thu Jan  2 20:35:17 2014	(r338495)
+++ head/Mk/bsd.ruby.mk	Thu Jan  2 20:46:29 2014	(r338496)
@@ -204,7 +204,7 @@ RUBY20=			"@comment "
 # Ruby 2.0
 #
 RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	2
+RUBY_PORTREVISION=	3
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	353
 

Added: head/lang/ruby20/files/patch-mkmf.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ruby20/files/patch-mkmf.rb	Thu Jan  2 20:46:29 2014	(r338496)
@@ -0,0 +1,44 @@
+--- lib/mkmf.rb.orig	2014-01-02 19:26:11.544779781 +0000
++++ lib/mkmf.rb	2014-01-02 19:27:02.558776514 +0000
+@@ -189,21 +189,21 @@
+       ]
+     elsif $configure_args.has_key?('--vendor')
+       dirs = [
+-        ['BINDIR',        '$(DESTDIR)$(bindir)'],
+-        ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'],
+-        ['RUBYLIBDIR',    '$(DESTDIR)$(vendorlibdir)$(target_prefix)'],
+-        ['RUBYARCHDIR',   '$(DESTDIR)$(vendorarchdir)$(target_prefix)'],
+-        ['HDRDIR',        '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
+-        ['ARCHHDRDIR',    '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
++        ['BINDIR',        '$(bindir)'],
++        ['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'],
++        ['RUBYLIBDIR',    '$(vendorlibdir)$(target_prefix)'],
++        ['RUBYARCHDIR',   '$(vendorarchdir)$(target_prefix)'],
++        ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
++        ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+       ]
+     else
+       dirs = [
+-        ['BINDIR',        '$(DESTDIR)$(bindir)'],
+-        ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'],
+-        ['RUBYLIBDIR',    '$(DESTDIR)$(sitelibdir)$(target_prefix)'],
+-        ['RUBYARCHDIR',   '$(DESTDIR)$(sitearchdir)$(target_prefix)'],
+-        ['HDRDIR',        '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
+-        ['ARCHHDRDIR',    '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
++        ['BINDIR',        '$(bindir)'],
++        ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
++        ['RUBYLIBDIR',    '$(sitelibdir)$(target_prefix)'],
++        ['RUBYARCHDIR',   '$(sitearchdir)$(target_prefix)'],
++        ['HDRDIR',        '$(rubyhdrdir)/ruby$(target_prefix)'],
++        ['ARCHHDRDIR',    '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
+       ]
+     end
+     dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
+@@ -1740,7 +1740,6 @@
+   end
+ 
+   def with_destdir(dir)
+-    return dir unless $extmk
+     dir = dir.sub($dest_prefix_pattern, '')
+     /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
+   end