Pullup ticket #4720 - requested by taca

lang/ruby193-base: build fix

Revisions pulled up:
- pkgsrc/lang/ruby193-base/Makefile                             1.50
- pkgsrc/lang/ruby193-base/distinfo                             1.42-1.44
- pkgsrc/lang/ruby193-base/patches/patch-configure              1.12
- pkgsrc/lang/ruby193-base/patches/patch-lib_mkmf.rb            1.3

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Fri Apr  3 08:59:08 UTC 2015

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

   Log Message:
   Disable CPU detection on Darwin, the result for 32-bit (i486) is incompatible
   with pkgsrc MACHINE_ARCH (i386).  Fixes 32-bit build, no change for 64-bit.

---
   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Thu Apr 30 03:25:56 UTC 2015

   Modified Files:
           pkgsrc/lang/ruby193-base: Makefile distinfo
   Added Files:
           pkgsrc/lang/ruby193-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.

4 files changed, 48 insertions, 17 deletions

diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 54c6af931e3..7197f7def09 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2015/03/08 14:53:39 taca Exp $
+# $NetBSD: Makefile,v 1.49.2.1 2015/05/25 01:04:35 hiramatsu Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 4c780461853..1e16b588cfe 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2015/03/08 14:53:39 taca Exp $
+$NetBSD: distinfo,v 1.42.2.1 2015/05/25 01:04:35 hiramatsu Exp $
 
 SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535
 RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01
 Size (ruby-1.9.3-p551.tar.bz2) = 10049332 bytes
-SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b
+SHA1 (patch-configure) = 1ee484ad481734a49824a1a1f8bb5f8f96f6606a
 SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3
 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-ext_dbm_extconf.rb) = cc16af8f4999ef6c54c9652e2748504c31e5ef4e
@@ -18,6 +18,7 @@ SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e6
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef
 SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890
+SHA1 (patch-lib_mkmf.rb) = ddf539a6c0fa91b751a59788e5dd933fc97d31db
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rdoc_text.rb) = cfbf48096ce14da8016177f6a8e6ef4416929647
 SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index aa028881823..ec504d1c3fa 100644
--- a/lang/ruby193-base/patches/patch-configure
+++ b/lang/ruby193-base/patches/patch-configure
@@ -1,11 +1,20 @@
-$NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
+$NetBSD: patch-configure,v 1.11.12.1 2015/05/25 01:04:35 hiramatsu Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	2013-11-22 04:24:15.000000000 +0000
+--- configure.orig	2014-11-13 13:42:20.000000000 +0000
 +++ configure
-@@ -10741,6 +10741,9 @@ esac
+@@ -4666,7 +4666,7 @@ esac
+ else
+     if test x"$target_alias" = x; then
+ 	case "$target_os" in #(
+-  darwin*) :
++  notdarwin*) :
+ 
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
+ $as_echo_n "checking for real target cpu... " >&6; }
+@@ -10900,6 +10900,9 @@ esac
    superux*) :
      	ac_cv_func_setitimer=no
  		 ;; #(
@@ -15,7 +24,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
    *) :
      	LIBS="-lm $LIBS" ;;
  esac
-@@ -11344,7 +11347,13 @@ for ac_header in limits.h sys/file.h sys
+@@ -11503,7 +11506,13 @@ for ac_header in limits.h sys/file.h sys
  		 net/socket.h sys/socket.h process.h atomic.h
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30,7 +39,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -12089,6 +12098,9 @@ fi
+@@ -12248,6 +12257,9 @@ fi
  ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
  #include <time.h>
  #endif
@@ -40,7 +49,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  "
  if test "x$ac_cv_type_struct_timespec" = xyes; then :
  
-@@ -13880,6 +13892,8 @@ else
+@@ -14039,6 +14051,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -49,7 +58,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -15832,7 +15846,7 @@ done
+@@ -15991,7 +16005,7 @@ done
      MAINLIBS="-pthread $MAINLIBS" ;; #(
    *) :
      case "$target_os" in #(
@@ -58,7 +67,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
      LIBS="-pthread $LIBS" ;; #(
    *) :
      LIBS="-l$pthread_lib $LIBS" ;;
-@@ -16282,7 +16296,9 @@ esac ;; #(
+@@ -16441,7 +16455,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -68,7 +77,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -16294,7 +16310,7 @@ esac ;; #(
+@@ -16453,7 +16469,7 @@ esac ;; #(
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes ;; #(
@@ -77,7 +86,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
      	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -16825,7 +16841,7 @@ _ACEOF
+@@ -16984,7 +17000,7 @@ _ACEOF
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -86,7 +95,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -16842,7 +16858,7 @@ _ACEOF
+@@ -17001,7 +17017,7 @@ _ACEOF
  	   LIBRUBY_ALIASES=""
  	fi
  	 ;; #(
@@ -95,7 +104,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -16903,7 +16919,12 @@ esac
+@@ -17062,7 +17078,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -109,7 +118,7 @@ $NetBSD: patch-configure,v 1.11 2013/11/24 14:17:19 taca Exp $
  	 ;; #(
    *) :
       ;;
-@@ -16966,11 +16987,7 @@ if test "$install_doc" != no; then
+@@ -17125,11 +17146,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
diff --git a/lang/ruby193-base/patches/patch-lib_mkmf.rb b/lang/ruby193-base/patches/patch-lib_mkmf.rb
new file mode 100644
index 00000000000..17be8dcffe7
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-lib_mkmf.rb
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_mkmf.rb,v 1.3.2.2 2015/05/25 01:04: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	2014-02-06 05:20:52.000000000 +0000
++++ lib/mkmf.rb
+@@ -1722,6 +1722,7 @@ LDSHARED = #{CONFIG['LDSHARED']}
+ LDSHAREDXX = #{config_string('LDSHAREDXX') || '$(LDSHARED)'}
+ AR = #{CONFIG['AR']}
+ EXEEXT = #{CONFIG['EXEEXT']}
++POSTLINK = #{CONFIG['POSTLINK']}
+ 
+ RUBY_BASE_NAME = #{CONFIG['RUBY_BASE_NAME']}
+ RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}