Thu Apr 30 03:27:52 2015 UTC ()
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.


(taca)
diff -r1.1 -r1.2 pkgsrc/lang/ruby22-base/Makefile
diff -r1.3 -r1.4 pkgsrc/lang/ruby22-base/distinfo
diff -r0 -r1.1 pkgsrc/lang/ruby22-base/patches/patch-lib_mkmf.rb
cvs diff -r1.1 -r1.2 pkgsrc/lang/ruby22-base/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby22-base/Attic/Makefile 2015/03/08 16:24:55 1.1
+++ pkgsrc/lang/ruby22-base/Attic/Makefile 2015/04/30 03:27:52 1.2
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.1 2015/03/08 16:24:55 taca Exp $ 1# $NetBSD: Makefile,v 1.2 2015/04/30 03:27:52 taca 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= 22 15RUBY_VERSION_SUPPORTED= 22
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.3 -r1.4 pkgsrc/lang/ruby22-base/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ruby22-base/Attic/distinfo 2015/04/22 19:04:35 1.3
+++ pkgsrc/lang/ruby22-base/Attic/distinfo 2015/04/30 03:27:52 1.4
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.3 2015/04/22 19:04:35 sevan Exp $ 1$NetBSD: distinfo,v 1.4 2015/04/30 03:27:52 taca Exp $
2 2
3SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b 3SHA1 (ruby-2.2.2.tar.bz2) = de97ec6132ac76bb7c0f92b5ca4682138093af1b
4RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d 4RMD160 (ruby-2.2.2.tar.bz2) = af9f1c4de12fc25c0d6e20bf339cc13e7d89df2d
5Size (ruby-2.2.2.tar.bz2) = 13314437 bytes 5Size (ruby-2.2.2.tar.bz2) = 13314437 bytes
6SHA1 (patch-configure) = 729397349d70492303534873194e35d4ffb98ba5 6SHA1 (patch-configure) = 729397349d70492303534873194e35d4ffb98ba5
7SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 7SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959
 8SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d
8SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 9SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051
9SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079 10SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079
10SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7 11SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 3e7003250d6241a4c4bf879de1b9fb3053cc10c7
11SHA1 (patch-lib_rubygems_config__file.rb) = 64cea598fa63433d432a5e5bcc85cdff96ed0f49 12SHA1 (patch-lib_rubygems_config__file.rb) = 64cea598fa63433d432a5e5bcc85cdff96ed0f49
12SHA1 (patch-lib_rubygems_defaults.rb) = 82d31b7deced68f2dd9e2c60cdc5c39bbfc9a900 13SHA1 (patch-lib_rubygems_defaults.rb) = 82d31b7deced68f2dd9e2c60cdc5c39bbfc9a900
13SHA1 (patch-lib_rubygems_dependency__installer.rb) = 33279f961cc4c530f0d81c8b415a79fdd26a1f84 14SHA1 (patch-lib_rubygems_dependency__installer.rb) = 33279f961cc4c530f0d81c8b415a79fdd26a1f84
14SHA1 (patch-lib_rubygems_install__update__options.rb) = 8ec3a2387f3a83e19d76b7a900ebf3b37bdcc043 15SHA1 (patch-lib_rubygems_install__update__options.rb) = 8ec3a2387f3a83e19d76b7a900ebf3b37bdcc043
15SHA1 (patch-lib_rubygems_installer.rb) = 864f3f8fe2949aedd85f730e447d8495f58d3b25 16SHA1 (patch-lib_rubygems_installer.rb) = 864f3f8fe2949aedd85f730e447d8495f58d3b25
16SHA1 (patch-lib_rubygems_platform.rb) = 2bddd029a2678de5a5d016af33f629caa712fbce 17SHA1 (patch-lib_rubygems_platform.rb) = 2bddd029a2678de5a5d016af33f629caa712fbce
17SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 18SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116
18SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 19SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7
19SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885 20SHA1 (patch-man_ri.1) = b07be05375977cfac0f88765a95e85db4f858885
20SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c 21SHA1 (patch-man_ruby.1) = 88ca6703fd58a89726618ca7dfc7912bad312b1c
File Added: pkgsrc/lang/ruby22-base/patches/Attic/patch-lib_mkmf.rb
$NetBSD: patch-lib_mkmf.rb,v 1.1 2015/04/30 03:27:52 taca 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|