MirBSD support, like ruby193-base.

This one needs two additional fixes to configure.

4 files changed, 87 insertions, 17 deletions

diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile
index ba891d13301..f12d27e1fae 100644
--- a/lang/ruby19-base/Makefile
+++ b/lang/ruby19-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/06/23 07:30:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2012/07/25 19:27:09 bsiegert Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -47,6 +47,11 @@ LIBS.SunOS+=	-lm
 CONFIGURE_ENV+=	OBJCOPY=:
 .endif
 
+.if ${OPSYS} == "MirBSD"
+# if present, an unsupported sysconf call is used
+CONFIGURE_ENV+=	ac_cv_func_getgrnam_r=no
+.endif
+
 # Ruby build process depends on config.status's content
 CONFIG_STATUS_OVERRIDE=	# empty
 
diff --git a/lang/ruby19-base/distinfo b/lang/ruby19-base/distinfo
index cb2d7323508..d916a1ba4f3 100644
--- a/lang/ruby19-base/distinfo
+++ b/lang/ruby19-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2012/06/02 02:21:15 taca Exp $
+$NetBSD: distinfo,v 1.14 2012/07/25 19:27:09 bsiegert Exp $
 
 SHA1 (ruby-1.9.2-p320.tar.bz2) = f4892311ea4ca2a6c979c9fd3a03c8e473998315
 RMD160 (ruby-1.9.2-p320.tar.bz2) = b4fb13b26cd048d983d127b2c8ec28e82df3a8a2
 Size (ruby-1.9.2-p320.tar.bz2) = 8981382 bytes
-SHA1 (patch-aa) = b54c275b76302feaceadde71d0deec1749c50254
-SHA1 (patch-ab) = 8924a50b312b9b660f4460a65d4887e17ebb1976
+SHA1 (patch-aa) = ea17efe65b449592d1779a043aa8a8c35a8fddd8
+SHA1 (patch-ab) = 3da629cde334b47f18226a01778986a328a291a9
 SHA1 (patch-ac) = c076c99eb886842dc5ac546e1105b7ef2a3edd68
 SHA1 (patch-ad) = 872b9457ff410ccae7e8929fe994a0d1d4d80bb1
 SHA1 (patch-ae) = 5fffd09450e9f6fc4c47d3bdacaf2f4acb48f5b1
diff --git a/lang/ruby19-base/patches/patch-aa b/lang/ruby19-base/patches/patch-aa
index 1c3e1d88142..e03693c490c 100644
--- a/lang/ruby19-base/patches/patch-aa
+++ b/lang/ruby19-base/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2011/03/27 15:49:40 taca Exp $
+$NetBSD: patch-aa,v 1.3 2012/07/25 19:27:09 bsiegert Exp $
 
-* Adding Interix support.
+* Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.in.orig	2011-02-18 10:43:45.000000000 +0000
+--- configure.in.orig	Thu Aug 11 00:38:34 2011
 +++ configure.in
 @@ -351,11 +351,7 @@ AC_SUBST(MAKEDIRS)
  
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2011/03/27 15:49:40 taca Exp $
  AC_SUBST(CAPITARGET)
  
  # checks for UNIX variants that set C preprocessor variables
-@@ -980,6 +976,8 @@ main()
+@@ -982,6 +978,8 @@ main()
  		],
  [superux*], [	ac_cv_func_setitimer=no
  		],
@@ -27,7 +27,17 @@ $NetBSD: patch-aa,v 1.2 2011/03/27 15:49:40 taca Exp $
  [	LIBS="-lm $LIBS"])
  AC_CHECK_LIB(crypt, crypt)
  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
-@@ -1831,7 +1829,9 @@ if test "$with_dln_a_out" != yes; then
+@@ -1062,6 +1060,9 @@ AC_CHECK_MEMBERS([struct stat.st_ctimens
+ 
+ AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
+ @%:@include <time.h>
++@%:@endif
++@%:@ifdef HAVE_SYS_TIME_H
++@%:@ include <sys/time.h>
+ @%:@endif])
+ 
+ AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
+@@ -1834,7 +1835,9 @@ if test "$with_dln_a_out" != yes; then
  			rb_cv_dlopen=yes],
  	[interix*], [	: ${LDSHARED='$(CC) -shared'}
  			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -37,7 +47,25 @@ $NetBSD: patch-aa,v 1.2 2011/03/27 15:49:40 taca Exp $
  			rb_cv_dlopen=yes],
  	[freebsd*|dragonfly*], [
  			: ${LDSHARED='$(CC) -shared'}
-@@ -2188,7 +2188,12 @@ if test "$enable_shared" = 'yes'; then
+@@ -1845,7 +1848,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],
+-	[openbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
++	[openbsd*|mirbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
+ 			if test "$rb_cv_binary_elf" = yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-E"
+ 			fi
+@@ -2141,7 +2144,7 @@ if test "$enable_shared" = 'yes'; then
+ 	   LIBRUBY_ALIASES=""
+ 	fi
+ 	],
+-    [openbsd*], [
++    [openbsd*|mirbsd*], [
+ 	SOLIBS='$(LIBS)'
+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+ 	],
+@@ -2190,7 +2193,12 @@ if test "$enable_shared" = 'yes'; then
  	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
  	],
      [interix*], [
diff --git a/lang/ruby19-base/patches/patch-ab b/lang/ruby19-base/patches/patch-ab
index 662c544c862..29dfed6ffaf 100644
--- a/lang/ruby19-base/patches/patch-ab
+++ b/lang/ruby19-base/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2011/03/27 15:49:40 taca Exp $
+$NetBSD: patch-ab,v 1.3 2012/07/25 19:27:09 bsiegert Exp $
 
-* Adding Interix support.
+* Adding Interix and MirBSD support.
 * Ignore doxygen.
 
---- configure.orig	2011-02-18 12:13:10.000000000 +0000
+--- configure.orig	Sat Apr 21 23:11:44 2012
 +++ configure
-@@ -5979,11 +5979,7 @@ else
+@@ -5976,11 +5976,7 @@ else
    DOXYGEN="$ac_cv_prog_DOXYGEN"
  fi
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2011/03/27 15:49:40 taca Exp $
  
  
  # checks for UNIX variants that set C preprocessor variables
-@@ -9459,6 +9455,9 @@ esac
+@@ -9463,6 +9459,9 @@ esac
    superux*) :
      	ac_cv_func_setitimer=no
  		 ;; #(
@@ -28,7 +28,17 @@ $NetBSD: patch-ab,v 1.2 2011/03/27 15:49:40 taca Exp $
    *) :
      	LIBS="-lm $LIBS" ;;
  esac
-@@ -15256,8 +15255,12 @@ esac ;; #(
+@@ -10835,6 +10834,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 :
+ 
+@@ -15261,8 +15263,12 @@ esac ;; #(
  			rb_cv_dlopen=yes ;; #(
    interix*) :
      	: ${LDSHARED='$(CC) -shared'}
@@ -41,7 +51,25 @@ $NetBSD: patch-ab,v 1.2 2011/03/27 15:49:40 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
-@@ -15756,7 +15759,12 @@ esac
+@@ -15274,7 +15280,7 @@ esac ;; #(
+ 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+ 			fi
+ 			rb_cv_dlopen=yes ;; #(
+-  openbsd*) :
++  openbsd*|mirbsd*) :
+     	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
+ 			if test "$rb_cv_binary_elf" = yes; then
+ 			    LDFLAGS="$LDFLAGS -Wl,-E"
+@@ -15791,7 +15797,7 @@ if test "$enable_shared" = 'yes'; then
+ 	   LIBRUBY_ALIASES=""
+ 	fi
+ 	 ;; #(
+-  openbsd*) :
++  openbsd*|mirbsd*) :
+ 
+ 	SOLIBS='$(LIBS)'
+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+@@ -15851,7 +15857,12 @@ esac
  	 ;; #(
    interix*) :
  
@@ -55,3 +83,12 @@ $NetBSD: patch-ab,v 1.2 2011/03/27 15:49:40 taca Exp $
  	 ;; #(
    *) :
       ;;
+@@ -17323,6 +17334,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;