Overhaul buildlink3 processing of Ruby.

* Don't buildlink in ruby/rubyversion.mk any more but define
  RUBY_USE_PTHREAD (use of pthread).
* In ruby/buildlink3.mk, buildlink via mk/pthread.buildlink3.mk as to
  RUBY_USE_PTHREAD.
* Also the same logic in ruby/Makefile.common.
* Buildlink of bdb, libiconv, zlib, openssl in each ruby*-base/Makefile.

5 files changed, 33 insertions, 6 deletions

diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common
index 82972a08ba5..f00bf6030d4 100644
--- a/lang/ruby/Makefile.common
+++ b/lang/ruby/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2012/02/18 06:28:46 taca Exp $
+# $NetBSD: Makefile.common,v 1.27 2012/03/21 15:40:12 taca Exp $
 #
 # Ruby base distribution common definition
 # used by databases/ruby-gdbm/Makefile
@@ -88,4 +88,10 @@ do-patch:
 CONFIGURE_ARGS+=	--disable-pthread
 .else
 CONFIGURE_ARGS+=	--enable-pthread
+
+PTHREAD_OPTS+=		native
+PTHREAD_AUTO_VARS=	yes
+
+.include "../../mk/pthread.buildlink3.mk"
 .endif
+.include "../../mk/dlopen.buildlink3.mk"
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index b6c9c8d2931..b449c4091d8 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2011/11/08 15:19:01 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2012/03/21 15:40:12 taca Exp $
 
 BUILDLINK_TREE+=	${RUBY_BASE}
 
@@ -23,6 +23,15 @@ buildlink-bin-ruby:
 	if ${TEST} -f $$f; then \
 		${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
 	fi
+
+.if empty(RUBY_USE_PTHREAD:M[nN][oO])
+PTHREAD_OPTS+=		native
+PTHREAD_AUTO_VARS=	yes
+
+.include "../../mk/pthread.buildlink3.mk"
+.endif
+.include "../../mk/dlopen.buildlink3.mk"
+
 .endif # RUBY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-${RUBY_BASE}
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index a4514c3f4fb..0ac3d52ac2a 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2012/01/20 17:05:11 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2012/03/21 15:40:12 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -156,5 +156,9 @@ post-install:
 .endfor
 	${RUBY_GENERATE_PLIST}
 
+.include "../../mk/bdb.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../lang/ruby/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile
index 20784fda94b..f0c71e92e2b 100644
--- a/lang/ruby19-base/Makefile
+++ b/lang/ruby19-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/03/12 12:30:28 fhajny Exp $
+# $NetBSD: Makefile,v 1.22 2012/03/21 15:40:13 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -157,5 +157,9 @@ post-install:
 .endfor
 	${RUBY_GENERATE_PLIST}
 
+.include "../../mk/bdb.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../lang/ruby/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 7353597703e..5106da25de6 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/03/12 12:32:26 fhajny Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/21 15:40:13 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -161,6 +161,10 @@ post-install:
 .endfor
 	${RUBY_GENERATE_PLIST}
 
-.include "../../lang/ruby/Makefile.common"
+.include "../../mk/bdb.buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libyaml/buildlink3.mk"
+.include "../../lang/ruby/Makefile.common"
 .include "../../mk/bsd.pkg.mk"