From 17ffd4ad8f302a55b7749506d71c274b2e8541a0 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Fri, 8 Sep 2006 23:32:13 +0000
Subject: Make sure to revert pthread handling as before.

---
 lang/ruby/rubyversion.mk | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index deedf4685e1..e8f48b6f0d4 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.24 2006/09/08 02:36:51 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.25 2006/09/08 23:32:13 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -147,6 +147,12 @@ RUBY_NOSHLIBMAJOR=	"@comment "
 RUBY_NOSHLIBMAJOR=
 .endif
 
+.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-9].*)
+RUBY_NOPTHREAD=	yes
+.else
+RUBY_NOPTHREAD=	no
+.endif
+
 #
 # RUBY_DLEXT is suffix of extention library.
 #
@@ -259,9 +265,7 @@ RUBY_GENERATE_PLIST =	( \
 .endif
 
 .if !empty(RUBY_NOVERSION:M[nN][oO])
-# Common macros.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M1.[0-9].*)
-PTHREAD_OPTS+=  native
+.if !empty(RUBY_NOPTHREAD:M[nN][oO])
 .include "../../mk/pthread.buildlink3.mk"
 .endif
 .include "../../mk/bdb.buildlink3.mk"
-- 
cgit v1.2.3