Unbreak build on MirBSD by pre-including sys/types.h and sys/time.h in

header checks.
This will be submitted upstream.

3 files changed, 75 insertions, 31 deletions

diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 81f37ee224b..4b7c31ecb7a 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2013/02/22 16:20:48 taca Exp $
+$NetBSD: distinfo,v 1.19 2013/04/30 21:30:59 bsiegert Exp $
 
 SHA1 (ruby-1.9.3-p392.tar.bz2) = de73455ff6500372d647fb49d24cc130fbd5815e
 RMD160 (ruby-1.9.3-p392.tar.bz2) = 4d12f62ce294a9c8fe27369413253097241e3fb0
 Size (ruby-1.9.3-p392.tar.bz2) = 10024221 bytes
-SHA1 (patch-configure) = e72a5414a9e706962692e645173c5b47ddb41932
-SHA1 (patch-configure.in) = 0996411e3125a298c770f4eead0edbc530a0a584
+SHA1 (patch-configure) = 4b9c2ea8933345a06987ad9120341b2713669c95
+SHA1 (patch-configure.in) = 7812319d8286032f2ecf7ce22dc018ae2684f384
 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rubygems.rb) = 2aed4990a868dc92668a78da7bcff2050ff3dd66
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index b6758e4607f..bc86ea19e84 100644
--- a/lang/ruby193-base/patches/patch-configure
+++ b/lang/ruby193-base/patches/patch-configure
@@ -1,22 +1,55 @@
-$NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca Exp $
+$NetBSD: patch-configure,v 1.7 2013/04/30 21:30:59 bsiegert Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	2013-02-06 13:17:31.000000000 +0000
+--- configure.orig	Fri Feb 22 09:44:18 2013
 +++ configure
-@@ -10722,6 +10722,10 @@ esac
+@@ -10722,6 +10722,9 @@ esac
    superux*) :
      	ac_cv_func_setitimer=no
  		 ;; #(
 +  interix*) :
-+	LIBS="-lm $LIBS"
-+	ac_cv_func_getpgrp_void=yes
-+		 ;;
++    	LIBS="-lm $LIBS"
++		ac_cv_func_getpgrp_void=yes ;; #(
    *) :
      	LIBS="-lm $LIBS" ;;
  esac
-@@ -15784,7 +15788,7 @@ done
+@@ -11325,7 +11328,13 @@ for ac_header in limits.h sys/file.h sys
+ 		 net/socket.h sys/socket.h process.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
++#include <sys/types.h>
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++
++"
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -12053,6 +12062,9 @@ fi
+ ac_fn_c_check_type "$LINENO" "struct timespec" "ac_cv_type_struct_timespec" "#ifdef HAVE_TIME_H
+ #include <time.h>
+ #endif
++#ifdef HAVE_SYS_TIME_H
++# include <sys/time.h>
++#endif
+ "
+ if test "x$ac_cv_type_struct_timespec" = xyes; then :
+ 
+@@ -13844,6 +13856,8 @@ else
+ # ifdef _MSC_VER
+ #  include <malloc.h>
+ #  define alloca _alloca
++# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
++#   include <stdlib.h>
+ # else
+ #  ifdef HAVE_ALLOCA_H
+ #   include <alloca.h>
+@@ -15784,7 +15798,7 @@ done
      MAINLIBS="-pthread $MAINLIBS" ;; #(
    *) :
      case "$target_os" in #(
@@ -25,20 +58,17 @@ $NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca Exp $
      LIBS="-pthread $LIBS" ;; #(
    *) :
      LIBS="-l$pthread_lib $LIBS" ;;
-@@ -16233,8 +16237,12 @@ esac ;; #(
- 			rb_cv_dlopen=yes ;; #(
+@@ -16234,7 +16248,9 @@ esac ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
-+			LDFLAGS="$LDFLAGS -Wl,-E"
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
-+			# use special random-slot linkage in 0x[56]XXXXXXX
- 			LIBPATHFLAG=" -L%1\$-s"
 +			DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))'
+ 			LIBPATHFLAG=" -L%1\$-s"
 +			RPATHFLAG=' -Wl,-R%1$-s'
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -16246,7 +16254,7 @@ esac ;; #(
+@@ -16246,7 +16262,7 @@ esac ;; #(
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes ;; #(
@@ -47,16 +77,16 @@ $NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca Exp $
      	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
-@@ -16775,7 +16783,7 @@ _ACEOF
+@@ -16775,7 +16791,7 @@ _ACEOF
    freebsd*|dragonfly*) :
  
  	SOLIBS='$(LIBS)'
 -	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
-+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)\$(TEENY)'
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -16792,7 +16800,7 @@ _ACEOF
+@@ -16792,7 +16808,7 @@ _ACEOF
  	   LIBRUBY_ALIASES=""
  	fi
  	 ;; #(
@@ -65,7 +95,7 @@ $NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca Exp $
  
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-@@ -16853,7 +16861,12 @@ esac
+@@ -16853,7 +16869,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -79,7 +109,7 @@ $NetBSD: patch-configure,v 1.6 2013/02/06 15:48:31 taca Exp $
  	 ;; #(
    *) :
       ;;
-@@ -16916,11 +16929,7 @@ if test "$install_doc" != no; then
+@@ -16916,11 +16937,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi
diff --git a/lang/ruby193-base/patches/patch-configure.in b/lang/ruby193-base/patches/patch-configure.in
index 91e43d73ddd..8e39b6bf807 100644
--- a/lang/ruby193-base/patches/patch-configure.in
+++ b/lang/ruby193-base/patches/patch-configure.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
+$NetBSD: patch-configure.in,v 1.6 2013/04/30 21:30:59 bsiegert Exp $
 
 * Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.in.orig	2012-11-13 10:02:45.000000000 +0000
+--- configure.in.orig	Tue Nov 13 10:02:20 2012
 +++ configure.in
 @@ -1128,6 +1128,8 @@ main()
  		],
@@ -14,7 +14,21 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  [	LIBS="-lm $LIBS"])
  AC_CHECK_LIB(crypt, crypt)
  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
-@@ -1194,6 +1196,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens
+@@ -1168,7 +1170,12 @@ AC_CHECK_HEADERS(limits.h sys/file.h sys
+ 		 syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \
+ 		 sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \
+ 		 ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \
+-		 net/socket.h sys/socket.h process.h)
++		 net/socket.h sys/socket.h process.h,,,[
++@%:@include <sys/types.h>
++@%:@ifdef HAVE_SYS_TIME_H
++@%:@include <sys/time.h>
++@%:@endif
++])
+ 
+ AC_TYPE_SIZE_T
+ RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
+@@ -1194,6 +1201,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens
  
  AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
  @%:@include <time.h>
@@ -24,7 +38,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  @%:@endif])
  
  AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@@ -1786,7 +1791,7 @@ if test x"$enable_pthread" = xyes; then
+@@ -1786,7 +1796,7 @@ if test x"$enable_pthread" = xyes; then
  	[root], [],
  	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
  	        [AS_CASE(["$target_os"],
@@ -33,7 +47,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  		    [LIBS="-l$pthread_lib $LIBS"])])
      else
  	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
-@@ -2017,7 +2022,9 @@ if test "$with_dln_a_out" != yes; then
+@@ -2017,7 +2027,9 @@ if test "$with_dln_a_out" != yes; then
  			rb_cv_dlopen=yes],
  	[interix*], [	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -43,7 +57,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  			rb_cv_dlopen=yes],
  	[freebsd*|dragonfly*], [
  			: ${LDSHARED='$(CC) -shared'}
-@@ -2028,7 +2035,7 @@ if test "$with_dln_a_out" != yes; then
+@@ -2028,7 +2040,7 @@ if test "$with_dln_a_out" != yes; then
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
  			fi
  			rb_cv_dlopen=yes],
@@ -52,7 +66,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -Wl,-E"
  			fi
-@@ -2327,7 +2334,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2327,7 +2339,7 @@ AS_CASE("$enable_shared", [yes], [
  	],
      [freebsd*|dragonfly*], [
  	SOLIBS='$(LIBS)'
@@ -61,7 +75,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  	if test "$rb_cv_binary_elf" != "yes" ; then
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -2343,7 +2350,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2343,7 +2355,7 @@ AS_CASE("$enable_shared", [yes], [
  	   LIBRUBY_ALIASES=""
  	fi
  	],
@@ -70,7 +84,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
  	],
-@@ -2393,7 +2400,12 @@ AS_CASE("$enable_shared", [yes], [
+@@ -2393,7 +2405,12 @@ AS_CASE("$enable_shared", [yes], [
  	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
  	],
      [interix*], [
@@ -84,7 +98,7 @@ $NetBSD: patch-configure.in,v 1.5 2013/01/31 15:56:14 taca Exp $
  	])
  ], [
    LIBRUBYARG_SHARED=
-@@ -2438,11 +2450,7 @@ if test "$install_doc" != no; then
+@@ -2438,11 +2455,7 @@ if test "$install_doc" != no; then
      else
  	RDOCTARGET="nodoc"
      fi