From 33c1abf0c08bc541c72ae6ea731aa1e380aba1fd Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sat, 2 Jun 2012 02:23:33 +0000
Subject: * Don't use --enable-wide-getaddrinfo on SunOS. * Add a patch from
 Ruby's repository, r35698; make sure to keep space   between "-o" and output
 filename.

Bump PKGREVISION.
---
 lang/ruby193-base/Makefile                  | 10 ++--------
 lang/ruby193-base/distinfo                  |  3 ++-
 lang/ruby193-base/patches/patch-lib_mkmf.rb | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 lang/ruby193-base/patches/patch-lib_mkmf.rb

diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index dc53a663a85..44267d0ea24 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2012/05/08 16:08:53 hans Exp $
+# $NetBSD: Makefile,v 1.14 2012/06/02 02:23:33 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 DIST_SUBDIR=	ruby193-base-201202170
@@ -89,13 +90,6 @@ PLIST.io=	yes
 CONFIGURE_ENV+=	ac_cv_header_ucontext_h=no
 .endif
 
-#
-# work around for getaddrinfo(3)
-#
-.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6-9])
-CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
-.endif
-
 #
 # work around for Linux
 #
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 8afb50b12e1..2e3d3397fe1 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2012/04/22 08:17:16 taca Exp $
+$NetBSD: distinfo,v 1.7 2012/06/02 02:23:33 taca Exp $
 
 SHA1 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = afb497dc10ea3d83ecbe3ccd9ed45fba1457721c
 RMD160 (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = bca45d750cfd8523e838903c8693749652960d60
@@ -6,6 +6,7 @@ Size (ruby193-base-201202170/ruby-1.9.3-p194.tar.bz2) = 9841223 bytes
 SHA1 (patch-configure) = 3045588df7baca5e100363eaef64567d6a59d527
 SHA1 (patch-configure.in) = c6671d30e11dfb2d5e4b253b6f3e53cf32af0152
 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
+SHA1 (patch-lib_mkmf.rb) = a4547a4bcbf1f533e264578c455ef1c7e6c9aa74
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6
 SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
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..fc2ee0084dc
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-lib_mkmf.rb
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_mkmf.rb,v 1.1 2012/06/02 02:23:33 taca Exp $
+
+Make sure to keep space; patch from Ruby's repository, r35698.
+
+--- lib/mkmf.rb.orig	2012-02-17 04:24:39.000000000 +0000
++++ lib/mkmf.rb
+@@ -1687,8 +1687,9 @@ LIBRUBY = #{CONFIG['LIBRUBY']}
+ LIBRUBY_A = #{CONFIG['LIBRUBY_A']}
+ LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
+ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
+-OUTFLAG = #{OUTFLAG}
+-COUTFLAG = #{COUTFLAG}
++empty =
++OUTFLAG = #{OUTFLAG}$(empty)
++COUTFLAG = #{COUTFLAG}$(empty)
+ 
+ RUBY_EXTCONF_H = #{$extconf_h}
+ cflags   = #{CONFIG['cflags']}
-- 
cgit v1.2.3