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.

6 files changed, 58 insertions, 31 deletions

diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 4c780461853..c3eb1adb2b4 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.43 2015/04/03 08:59:08 jperkin 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
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index aa028881823..ec59e12915d 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.12 2015/04/03 08:59:08 jperkin 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/ruby200-base/distinfo b/lang/ruby200-base/distinfo
index 54c08d19b67..3dae2ac8547 100644
--- a/lang/ruby200-base/distinfo
+++ b/lang/ruby200-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2015/03/08 14:59:12 taca Exp $
+$NetBSD: distinfo,v 1.22 2015/04/03 09:01:11 jperkin Exp $
 
 SHA1 (ruby-2.0.0-p643.tar.bz2) = d1d7d324a1f2530d67d54464fe09646583e4dda1
 RMD160 (ruby-2.0.0-p643.tar.bz2) = 5ae5f1548547fe7bcce12d996419e2ac293bea9f
 Size (ruby-2.0.0-p643.tar.bz2) = 10772113 bytes
-SHA1 (patch-configure) = 47db420cdef6b4b001a973c972a01613ea065587
+SHA1 (patch-configure) = aaa93fd2e4f130bb2cb852b15b58a1840e57dba5
 SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec
 SHA1 (patch-ext_dbm_extconf.rb) = 7322637de769b7d01650e1ed566e891801ce3e92
 SHA1 (patch-ext_tk_extconf.rb) = b5141d995afc455e4d64b578200f01d9dc75c310
diff --git a/lang/ruby200-base/patches/patch-configure b/lang/ruby200-base/patches/patch-configure
index 672997697ba..737ce44053e 100644
--- a/lang/ruby200-base/patches/patch-configure
+++ b/lang/ruby200-base/patches/patch-configure
@@ -1,10 +1,19 @@
-$NetBSD: patch-configure,v 1.6 2015/03/08 14:59:12 taca Exp $
+$NetBSD: patch-configure,v 1.7 2015/04/03 09:01:11 jperkin Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
 --- configure.orig	2015-02-25 10:52:37.000000000 +0000
 +++ configure
+@@ -5193,7 +5193,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; }
 @@ -8385,6 +8385,10 @@ esac
    superux*) :
      	ac_cv_func_setitimer=no
diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo
index 4d43da7d271..7615f36917d 100644
--- a/lang/ruby21-base/distinfo
+++ b/lang/ruby21-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2015/03/08 15:08:33 taca Exp $
+$NetBSD: distinfo,v 1.14 2015/04/03 09:02:24 jperkin Exp $
 
 SHA1 (ruby-2.1.5.tar.bz2) = d822e022bb8875724852f049f499f101d24a7fe5
 RMD160 (ruby-2.1.5.tar.bz2) = 32019c949a8c9bb716f6683a20f19231da452fda
 Size (ruby-2.1.5.tar.bz2) = 11994454 bytes
-SHA1 (patch-configure) = 40da4aec83fcb9cf026d2b458ff3beb6dcf7776a
+SHA1 (patch-configure) = 3c9f007caddd7155c3f3495f81eabe55b86651a5
 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2
 SHA1 (patch-ext_tk_extconf.rb) = fc80ef5a2859736ae85303cfb2fc78ce8bc70fbc
 SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
diff --git a/lang/ruby21-base/patches/patch-configure b/lang/ruby21-base/patches/patch-configure
index ca9c2b7dcff..86939d94b3a 100644
--- a/lang/ruby21-base/patches/patch-configure
+++ b/lang/ruby21-base/patches/patch-configure
@@ -1,11 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
+$NetBSD: patch-configure,v 1.3 2015/04/03 09:02:24 jperkin Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	2014-05-08 15:52:19.000000000 +0000
+--- configure.orig	2014-11-13 13:38:30.000000000 +0000
 +++ configure
-@@ -8571,6 +8571,10 @@ esac
+@@ -5271,7 +5271,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; }
+@@ -8631,6 +8631,10 @@ esac
  		ac_cv_func_isinf=yes
  		ac_cv_func_isnan=yes
  		 ;; #(
@@ -16,7 +25,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
    nacl) :
  
    LIBS="-lm $LIBS"
-@@ -16204,6 +16208,8 @@ else
+@@ -16323,6 +16327,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -25,7 +34,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -20007,7 +20013,9 @@ esac ;; #(
+@@ -20040,7 +20046,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -35,7 +44,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -21008,7 +21016,7 @@ esac
+@@ -21041,7 +21049,7 @@ esac
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
@@ -44,7 +53,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -21087,7 +21095,12 @@ esac
+@@ -21120,7 +21128,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -58,7 +67,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -21245,7 +21258,7 @@ esac
+@@ -21278,7 +21291,7 @@ esac
  esac
  if test "$enable_rpath" = yes; then
      test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
@@ -67,7 +76,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
      test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
      LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
-@@ -21421,11 +21434,7 @@ if test "$install_doc" != no; then
+@@ -21591,11 +21604,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
@@ -80,7 +89,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -22010,7 +22019,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
+@@ -22180,7 +22189,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; t
  elif test -z "${ruby_version}"; then
      as_fn_error $? "No ruby version, No place for bundled libraries" "$LINENO" 5
  else
@@ -89,7 +98,7 @@ $NetBSD: patch-configure,v 1.2 2014/05/21 03:19:57 taca Exp $
  fi
  
  
-@@ -23516,17 +23525,7 @@ which seems to be undefined.  Please mak
+@@ -23686,17 +23695,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {