[pkgsrc/pkgsrc-2015Q1]: pkgsrc/lang/ruby22-base Pullup ticket #4722 - request...

[hiramatsu <hiramatsu%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd523f8a943c
branches:  pkgsrc-2015Q1
changeset: 649268:bd523f8a943c
user:      hiramatsu <hiramatsu%pkgsrc.org@localhost>
date:      Tue Jun 09 02:05:35 2015 +0000

description:
Pullup ticket #4722 - requested by taca
lang/ruby22-base: build fix

Revisions pulled up:
- pkgsrc/lang/ruby22-base/Makefile                              1.2
- pkgsrc/lang/ruby22-base/distinfo                              1.4
- pkgsrc/lang/ruby22-base/patches/patch-configure               1.2
- pkgsrc/lang/ruby22-base/patches/patch-lib_mkmf.rb             1.1

---
   Module Name:    pkgsrc
   Committed By:   sevan
   Date:           Wed Apr 22 19:04:35 UTC 2015

   Modified Files:
           pkgsrc/lang/ruby22-base: distinfo
           pkgsrc/lang/ruby22-base/patches: patch-configure

   Log Message:
   Remove mention of MirBSD in patch description as support is there by default now

   Reviewed by wiz@

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Thu Apr 30 03:27:52 UTC 2015

   Modified Files:
           pkgsrc/lang/ruby22-base: Makefile distinfo
   Added Files:
           pkgsrc/lang/ruby22-base/patches: patch-lib_mkmf.rb

   Log Message:
   Avoid to generate empty command line on some platforms:

   $(DLLIB): $(OBJS) Makefile
   ...
           $(Q) $(POSTLINK)

  And POSTLINK is empty macro.  In such case, GNU make ignore empty command
   line but BSD make tries to execute it and causes error.

   Bump PKGREVISION.

diffstat:

 lang/ruby22-base/Makefile                  |   3 ++-
 lang/ruby22-base/distinfo                  |   5 +++--
 lang/ruby22-base/patches/patch-configure   |   4 ++--
 lang/ruby22-base/patches/patch-lib_mkmf.rb |  21 +++++++++++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r e85216d81d70 -r bd523f8a943c lang/ruby22-base/Makefile
--- a/lang/ruby22-base/Makefile Mon Jun 01 01:47:25 2015 +0000
+++ b/lang/ruby22-base/Makefile Tue Jun 09 02:05:35 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/03/08 16:24:55 taca Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2015/06/09 02:05:35 hiramatsu Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r e85216d81d70 -r bd523f8a943c lang/ruby22-base/distinfo
--- a/lang/ruby22-base/distinfo Mon Jun 01 01:47:25 2015 +0000
+++ b/lang/ruby22-base/distinfo Tue Jun 09 02:05:35 2015 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.1.2.1 2015/04/26 08:47:12 tron Exp $
+$NetBSD: distinfo,v 1.1.2.2 2015/06/09 02:05:35 hiramatsu Exp $
 
 SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b
 RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d
 Size (ruby-2.2.2.tar.bz2) = 13314437 bytes
-SHA1 (patch-configure) = 8653ddb8482539cc3b7b8195c30a5a87a6f8e856
+SHA1 (patch-configure) = 729397349d70492303534873194e35d4ffb98ba5
 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
+SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7
diff -r e85216d81d70 -r bd523f8a943c lang/ruby22-base/patches/patch-configure
--- a/lang/ruby22-base/patches/patch-configure  Mon Jun 01 01:47:25 2015 +0000
+++ b/lang/ruby22-base/patches/patch-configure  Tue Jun 09 02:05:35 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.1 2015/03/08 16:24:55 taca Exp $
+$NetBSD: patch-configure,v 1.1.2.1 2015/06/09 02:05:35 hiramatsu Exp $
 
-* Adding Interix and MirBSD support.
+* Adding Interix support.
 * Ignore doxygen.
 
 --- configure.orig     2015-02-27 07:34:18.000000000 +0000
diff -r e85216d81d70 -r bd523f8a943c lang/ruby22-base/patches/patch-lib_mkmf.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby22-base/patches/patch-lib_mkmf.rb        Tue Jun 09 02:05:35 2015 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_mkmf.rb,v 1.1.2.2 2015/06/09 02:05:35 hiramatsu Exp $
+
+Avoid to generate empty command line on some platforms:
+
+$(DLLIB): $(OBJS) Makefile
+...
+       $(Q) $(POSTLINK)
+
+And POSTLINK is empty macro.  In such case, GNU make ignore empty command
+line but BSD make tries to execute it and causes error.
+
+--- lib/mkmf.rb.orig   2015-02-13 05:00:23.000000000 +0000
++++ lib/mkmf.rb
+@@ -1939,6 +1939,7 @@ LDSHARED = #{CONFIG['LDSHARED']}
+ LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
+ AR = #{CONFIG['AR']}
+ EXEEXT = #{CONFIG['EXEEXT']}
++POSTLINK = #{CONFIG['POSTLINK']}
+ 
+ }
+     CONFIG.each do |key, val|