- Disable pthread support by default to fix breakage of some ruby applications

  (migemo, mod_ruby, etc.).
- Remove WITHOUT_PTHREADS knob and add WITH_PTHREADS knob.
- Bump PORTREVISION.

Approved by:	portmgr (krion)

1 files changed, 15 insertions, 5 deletions

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index dba404c17e5c..9d0ce5c1748c 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
@@ -41,11 +41,11 @@ WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--enable-shared --with-openssl-include=${OPENSSLINC}
 
-.if defined(WITHOUT_PTHREADS)
-CONFIGURE_ARGS+=--disable-pthread
-PKGNAMESUFFIX=	-nopthreads
-.else
+.if defined(WITH_PTHREADS)
 CONFIGURE_ARGS+=--enable-pthread
+PKGNAMESUFFIX=	-pthreads
+.else
+CONFIGURE_ARGS+=--disable-pthread
 .endif
 
 .if defined(DEBUG)
@@ -71,6 +71,9 @@ EXTRA_PATCHES=	${PATCHDIR}/extrapatch-eval.c
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+		LIBS="${LIBS} ${PTHREAD_LIBS}"
+
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 MLINKS=		${RUBY_NAME}.1 ruby.1
 IF_DEFAULT=	""
@@ -121,6 +124,13 @@ OBSOLETED_MODULES=	bigfloat \
 			yaml \
 			zlib
 
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "NOTE:"
+	@${ECHO_MSG} "You can enable pthread support by defining WITH_PTHREADS variable,"
+	@${ECHO_MSG} "but not recommended since this might break some ruby apps."
+	@${ECHO_MSG} ""
+
 post-extract:
 	${MV} ${WRKSRC}/ext/dl/h2rb ${WRKSRC}/bin/