[pkgsrc/pkgsrc-2015Q1]: pkgsrc/lang/ruby21-base Pullup ticket #4721 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0fbca16837b
branches:  pkgsrc-2015Q1
changeset: 649266:d0fbca16837b
user:      hiramatsu <hiramatsu%pkgsrc.org@localhost>
date:      Mon Jun 01 01:46:36 2015 +0000

description:
Pullup ticket #4721 - requested by taca
lang/ruby21-base: build fix

Revisions pulled up:
- pkgsrc/lang/ruby21-base/Makefile                              1.12
- pkgsrc/lang/ruby21-base/distinfo                              1.17
- pkgsrc/lang/ruby21-base/patches/patch-configure               1.4
- pkgsrc/lang/ruby21-base/patches/patch-lib_mkmf.rb             1.1

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

   Modified Files:
           pkgsrc/lang/ruby21-base: distinfo
           pkgsrc/lang/ruby21-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:20 UTC 2015

   Modified Files:
           pkgsrc/lang/ruby21-base: Makefile distinfo
   Added Files:
           pkgsrc/lang/ruby21-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/ruby21-base/Makefile                  |   3 ++-
 lang/ruby21-base/distinfo                  |   5 +++--
 lang/ruby21-base/patches/patch-configure   |   4 ++--
 lang/ruby21-base/patches/patch-lib_mkmf.rb |  21 +++++++++++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 77fcf666123d -r d0fbca16837b lang/ruby21-base/Makefile
--- a/lang/ruby21-base/Makefile Sun May 31 13:27:57 2015 +0000
+++ b/lang/ruby21-base/Makefile Mon Jun 01 01:46:36 2015 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2015/03/08 15:52:51 taca Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2015/06/01 01:46:36 hiramatsu Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
diff -r 77fcf666123d -r d0fbca16837b lang/ruby21-base/distinfo
--- a/lang/ruby21-base/distinfo Sun May 31 13:27:57 2015 +0000
+++ b/lang/ruby21-base/distinfo Mon Jun 01 01:46:36 2015 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13.2.1 2015/04/26 08:36:34 tron Exp $
+$NetBSD: distinfo,v 1.13.2.2 2015/06/01 01:46:36 hiramatsu Exp $
 
 SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4
 RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43
 Size (ruby-2.1.6.tar.bz2) = 12011651 bytes
-SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5
+SHA1 (patch-configure) = 7f1f6d2dc7d32c96d6ae65562a9bc6d50d2b79dd
 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
 SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
 SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
@@ -15,6 +15,7 @@
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb
 SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e
+SHA1 (patch-lib_mkmf.rb) = 04607b73702a8ee7edfbb371ebf88ebe8a4fc428
 SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
 SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21
 SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
diff -r 77fcf666123d -r d0fbca16837b lang/ruby21-base/patches/patch-configure
--- a/lang/ruby21-base/patches/patch-configure  Sun May 31 13:27:57 2015 +0000
+++ b/lang/ruby21-base/patches/patch-configure  Mon Jun 01 01:46:36 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.2.8.1 2015/04/26 08:36:34 tron Exp $
+$NetBSD: patch-configure,v 1.2.8.2 2015/06/01 01:46:36 hiramatsu Exp $
 
-* Adding Interix and MirBSD support.
+* Adding Interix support.
 * Ignore doxygen.
 
 --- configure.orig     2014-11-13 13:38:30.000000000 +0000
diff -r 77fcf666123d -r d0fbca16837b lang/ruby21-base/patches/patch-lib_mkmf.rb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby21-base/patches/patch-lib_mkmf.rb        Mon Jun 01 01:46:36 2015 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_mkmf.rb,v 1.1.2.2 2015/06/01 01:46:36 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-03-17 16:56:55.000000000 +0000
++++ lib/mkmf.rb
+@@ -1909,6 +1909,7 @@ LDSHARED = #{CONFIG['LDSHARED']}
+ LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
+ AR = #{CONFIG['AR']}
+ EXEEXT = #{CONFIG['EXEEXT']}
++POSTLINK = #{CONFIG['POSTLINK']}
+ 
+ }
+     CONFIG.each do |key, val|