 @@ -1,14 +1,14 @@
-# $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}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
 PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 #PKGREVISION=
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby  ${RUBY_VERSION} release minimum package
 LICENSE=	gnu-gpl-v2 OR ruby-license
 @@ -37,26 +37,31 @@ CONFIGURE_ENV+=		INSTALL="${INSTALL} ${C
 .if !empty(PKGSRC_COMPILER:Msunpro)
 LIBS.SunOS+=	-B static -lsunmath -B dynamic -lm
 LDFLAGS.SunOS+=	-L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib
 CONFIGURE_ENV+=	LDSHARED="${CC} -G"
 .else
 LIBS.SunOS+=	-lm
 .endif
 .if ${OPSYS} == "SunOS"
 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
 MAKE_DIRS+=	${RUBY_SITERIDIR}
 FILES_SUBST+=	DATE=${DATE:Q}
 REQD_DIRS+=	${GEM_HOME}/cache
 REQD_DIRS+=	${GEM_HOME}/doc
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
 SUBST_FILES.conf=	lib/rubygems/config_file.rb
 SUBST_SED.conf=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"

 @@ -1,20 +1,20 @@
-$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-aa) = ea17efe65b449592d1779a043aa8a8c35a8fddd8
-SHA1 (patch-ab) = 8924a50b312b9b660f4460a65d4887e17ebb1976
+SHA1 (patch-ab) = 3da629cde334b47f18226a01778986a328a291a9
 SHA1 (patch-ac) = c076c99eb886842dc5ac546e1105b7ef2a3edd68
 SHA1 (patch-ad) = 872b9457ff410ccae7e8929fe994a0d1d4d80bb1
 SHA1 (patch-ae) = 5fffd09450e9f6fc4c47d3bdacaf2f4acb48f5b1
 SHA1 (patch-af) = 5a1024b66537e6dacefdc8a3aaa3d6c38c9ae171
 SHA1 (patch-ag) = b99faa57872a04da29433ce122d94204932a10e0
 SHA1 (patch-ah) = 33f95f111266ae5bf6f527ccbcd124ce25859890
 SHA1 (patch-ai) = 3e4073e5e11739c0ba3e1c65f89dee169cac11cf
 SHA1 (patch-aj) = 245221025da25b6aa28d527672ca4bf0610b92dd
 SHA1 (patch-ak) = ac49cec94313d22058183f1a3af520591433b726
 SHA1 (patch-al) = c4f44e897e525c13a0276a3743fd203e290f6f97
 SHA1 (patch-am) = 2136ab402ae94805c1585677eaa8cc6a83696374
 SHA1 (patch-an) = 296f5dfdad2afcbf9eca56a329a1424e5659d29c
 SHA1 (patch-ao) = 90789a3e4cfa020a503fda61406883c9e3a26772

 @@ -1,53 +1,81 @@
-$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)
  AC_CHECK_TOOL(DOT, dot)
  AC_CHECK_TOOL(DOXYGEN, doxygen)
 -if test x"$DOXYGEN" = x; then
 -    CAPITARGET=nodoc
 -else
 -    CAPITARGET=capi
 -fi
 +CAPITARGET=nodoc
  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
  		],
 +[interix*], [	LIBS="-lm $LIBS"
 +		ac_cv_func_getpgrp_void=yes],
  [	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"
 +			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*], [
  			: ${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*], [
 -	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
 +	SOLIBS='$(LIBS)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 +	# link explicitly to 0x48000000
 +	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
 +	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 +	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
  	])
  fi
  if test "$enable_rpath" = yes; then

 @@ -1,57 +1,94 @@
-$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
 -if test x"$DOXYGEN" = x; then
 -    CAPITARGET=nodoc
 -else
 -    CAPITARGET=capi
 -fi
 +CAPITARGET=nodoc
  # 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
  		 ;; #(
 +  interix*)	LIBS="-lm $LIBS"
 +	ac_cv_func_getpgrp_void=yes
 +		 ;; #(
    *) :
      	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'}
 +			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))'
 +			RPATHFLAG=' -Wl,-R%1$-s'
  			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*) :
 -	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
 +	SOLIBS='$(LIBS)'
 +	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 +	# link explicitly to 0x48000000
 +	LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552'
 +	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 +	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
  	 ;; #(
    *) :
       ;;
@@ -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 ;;