Mon Jun 1 01:46:36 2015 UTC ()
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.


(hiramatsu)
diff -r1.11 -r1.11.2.1 pkgsrc/lang/ruby21-base/Makefile
diff -r1.13.2.1 -r1.13.2.2 pkgsrc/lang/ruby21-base/distinfo
diff -r1.2.8.1 -r1.2.8.2 pkgsrc/lang/ruby21-base/patches/patch-configure
diff -r0 -r1.1.2.2 pkgsrc/lang/ruby21-base/patches/patch-lib_mkmf.rb
cvs diff -r1.11 -r1.11.2.1 pkgsrc/lang/ruby21-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby21-base/Attic/Makefile 2015/03/08 15:52:51 1.11
+++ pkgsrc/lang/ruby21-base/Attic/Makefile 2015/06/01 01:46:36 1.11.2.1
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.11 2015/03/08 15:52:51 taca Exp $ 1# $NetBSD: Makefile,v 1.11.2.1 2015/06/01 01:46:36 hiramatsu Exp $
2# 2#
3 3
4DISTNAME= ${RUBY_DISTNAME} 4DISTNAME= ${RUBY_DISTNAME}
5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} 5PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
 6PKGREVISION= 1
6CATEGORIES= lang ruby 7CATEGORIES= lang ruby
7MASTER_SITES= ${MASTER_SITE_RUBY} 8MASTER_SITES= ${MASTER_SITE_RUBY}
8 9
9MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
10HOMEPAGE= ${RUBY_HOMEPAGE} 11HOMEPAGE= ${RUBY_HOMEPAGE}
11COMMENT= Ruby ${RUBY_VERSION} release minimum base package 12COMMENT= Ruby ${RUBY_VERSION} release minimum base package
12LICENSE= ${RUBY_LICENSE} 13LICENSE= ${RUBY_LICENSE}
13 14
14RUBY_VERSION_SUPPORTED= 21 15RUBY_VERSION_SUPPORTED= 21
15 16
16USE_LANGUAGES= c 17USE_LANGUAGES= c
17USE_TOOLS+= pax yacc 18USE_TOOLS+= pax yacc
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
cvs diff -r1.13.2.1 -r1.13.2.2 pkgsrc/lang/ruby21-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby21-base/Attic/distinfo 2015/04/26 08:36:34 1.13.2.1
+++ pkgsrc/lang/ruby21-base/Attic/distinfo 2015/06/01 01:46:36 1.13.2.2
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1$NetBSD: distinfo,v 1.13.2.1 2015/04/26 08:36:34 tron Exp $ 1$NetBSD: distinfo,v 1.13.2.2 2015/06/01 01:46:36 hiramatsu Exp $
2 2
3SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4 3SHA1 (ruby-2.1.6.tar.bz2) = 380c3a5fa508fdaa2b227dbc00c56f703fd271d4
4RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43 4RMD160 (ruby-2.1.6.tar.bz2) = fa473e794ee0df4cd30aebfa70af16840a618c43
5Size (ruby-2.1.6.tar.bz2) = 12011651 bytes 5Size (ruby-2.1.6.tar.bz2) = 12011651 bytes
6SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5 6SHA1 (patch-configure) = 7f1f6d2dc7d32c96d6ae65562a9bc6d50d2b79dd
7SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2 7SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
8SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc 8SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
9SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb 9SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
10SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 10SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
11SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 11SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
12SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b 12SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b
13SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = fb0cb5a138c2ae311d368ec4472ddd6bc36a0709 13SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = fb0cb5a138c2ae311d368ec4472ddd6bc36a0709
14SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf 14SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf
15SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541 15SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = b0786f50ebab4b5a0ccf916054bc13fbd6820541
16SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb 16SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 92a4bc7b995554b9933b1e9f9ce4df87e365bcfb
17SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e 17SHA1 (patch-ext_tk_tcltklib.c) = 475affcb88a06ac6daf622814a9da5027ca3d34e
 18SHA1 (patch-lib_mkmf.rb) = 04607b73702a8ee7edfbb371ebf88ebe8a4fc428
18SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 19SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
19SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21 20SHA1 (patch-lib_rubygems.rb) = adfbb16b9d90fe38e253bcbd34d0efa712077f21
20SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e 21SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e
21SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970 22SHA1 (patch-lib_rubygems_commands_uninstall__command.rb) = 13b7f3bceb2876228027447640d51fde2700a970
22SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 48824278d5a0f0435d44755fbfcda55032792ea0 23SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 48824278d5a0f0435d44755fbfcda55032792ea0
23SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc 24SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc
24SHA1 (patch-lib_rubygems_defaults.rb) = 5a55a54988b360b995e05e6dda7ed25d9cd1d90f 25SHA1 (patch-lib_rubygems_defaults.rb) = 5a55a54988b360b995e05e6dda7ed25d9cd1d90f
25SHA1 (patch-lib_rubygems_dependency__installer.rb) = d88441fe44de8ee61a5548dfbe0c12aa2bb5ace4 26SHA1 (patch-lib_rubygems_dependency__installer.rb) = d88441fe44de8ee61a5548dfbe0c12aa2bb5ace4
26SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f 27SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f
27SHA1 (patch-lib_rubygems_installer.rb) = e3c077156f135b9a8a368ea39e2728a60e6f4378 28SHA1 (patch-lib_rubygems_installer.rb) = e3c077156f135b9a8a368ea39e2728a60e6f4378
28SHA1 (patch-lib_rubygems_platform.rb) = 965a916814127ef78f43b89b7af5e06d5d83b24f 29SHA1 (patch-lib_rubygems_platform.rb) = 965a916814127ef78f43b89b7af5e06d5d83b24f
29SHA1 (patch-lib_rubygems_specification.rb) = 0b30e2da8b5621ffc0f91fadc94f06ba30f47d41 30SHA1 (patch-lib_rubygems_specification.rb) = 0b30e2da8b5621ffc0f91fadc94f06ba30f47d41
30SHA1 (patch-lib_rubygems_uninstaller.rb) = 87fdddc435440aab57a6d44aba64abd0b2de6907 31SHA1 (patch-lib_rubygems_uninstaller.rb) = 87fdddc435440aab57a6d44aba64abd0b2de6907
cvs diff -r1.2.8.1 -r1.2.8.2 pkgsrc/lang/ruby21-base/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/lang/ruby21-base/patches/Attic/patch-configure 2015/04/26 08:36:34 1.2.8.1
+++ pkgsrc/lang/ruby21-base/patches/Attic/patch-configure 2015/06/01 01:46:36 1.2.8.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-configure,v 1.2.8.1 2015/04/26 08:36:34 tron Exp $ 1$NetBSD: patch-configure,v 1.2.8.2 2015/06/01 01:46:36 hiramatsu Exp $
2 2
3* Adding Interix and MirBSD support. 3* Adding Interix support.
4* Ignore doxygen. 4* Ignore doxygen.
5 5
6--- configure.orig 2014-11-13 13:38:30.000000000 +0000 6--- configure.orig 2014-11-13 13:38:30.000000000 +0000
7+++ configure 7+++ configure
8@@ -5271,7 +5271,7 @@ esac 8@@ -5271,7 +5271,7 @@ esac
9 else 9 else
10 if test x"$target_alias" = x; then 10 if test x"$target_alias" = x; then
11 case "$target_os" in #( 11 case "$target_os" in #(
12- darwin*) : 12- darwin*) :
13+ notdarwin*) : 13+ notdarwin*) :
14  14
15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 15 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
16 $as_echo_n "checking for real target cpu... " >&6; } 16 $as_echo_n "checking for real target cpu... " >&6; }
File Added: pkgsrc/lang/ruby21-base/patches/Attic/patch-lib_mkmf.rb
$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|