ports/153461: [Update]lang/ruby18: update to 330 patchlevel

[Wen Heping]

>Number:         153461
>Category:       ports
>Synopsis:       [Update]lang/ruby18: update to 330 patchlevel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 27 03:10:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Wen Heping
>Release:        FreeBSD 9.0
>Organization:
FreeBSD
>Environment:
>Description:
1 update lang/ruby18 to 330 patchlevel
2 update lang/ruby19 to 136 patchlevel
3 remove the support of FreeBSD6 in lang/ruby18
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Mk/bsd.ruby.mk.orig	2010-12-27 09:39:46.000000000 +0800
+++ Mk/bsd.ruby.mk	2010-12-27 09:41:24.000000000 +0800
@@ -173,7 +173,7 @@
 RUBY_RELVERSION=	1.8.7
 RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	302
+RUBY_PATCHLEVEL=	330
 
 .  if ${RUBY_PATCHLEVEL} == 0
 RUBY_VERSION?=		${RUBY_RELVERSION}
@@ -201,7 +201,7 @@
 RUBY_RELVERSION=	1.9.2
 RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	0
+RUBY_PATCHLEVEL=	136
 
 RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
 RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
--- lang/ruby18/Makefile.orig	2010-12-27 10:13:40.000000000 +0800
+++ lang/ruby18/Makefile	2010-12-27 09:45:17.000000000 +0800
@@ -20,9 +20,9 @@
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
-CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} --enable-shared
+CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} --enable-shared --enable-pthread
 CONFIGURE_ENV=	CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
-		LDFLAGS="-L${OPENSSLLIB} ${LDFLAGS}" \
+		LDFLAGS="-L${OPENSSLLIB} ${PTHREAD_LIBS} ${LDFLAGS}" \
 		LIBS="-L${OPENSSLLIB} ${LDFLAGS}" \
 		CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
 USE_OPENSSL=	yes
@@ -58,21 +58,6 @@
 
 PKGNAMESUFFIX=	#empty
 
-#
-# pthreads in earlier versions has problems with malloc after fork
-#
-.if ${OSVERSION} < 702000
-WITHOUT_PTHREADS=	yes
-.endif
-
-.if defined(WITHOUT_PTHREADS)
-CONFIGURE_ARGS+=--disable-pthread
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+nopthreads
-.else
-LDFLAGS+=	${PTHREAD_LIBS}
-CONFIGURE_ARGS+=--enable-pthread
-.endif
-
 .if defined(WITH_ONIGURUMA)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}+oniguruma
 BUILD_DEPENDS+=	${NONEXISTENT}:${ONIGURUMA_PORTDIR}:patch
--- lang/ruby18/distinfo.orig	2010-12-27 10:13:50.000000000 +0800
+++ lang/ruby18/distinfo	2010-12-27 09:47:45.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-1.8.7-p302.tar.bz2) = 3537cc81cc2378a2bc319cd16c4237ddee14a2839cfd1515b27dce108d061a68
-SIZE (ruby/ruby-1.8.7-p302.tar.bz2) = 4184764
+SHA256 (ruby/ruby-1.8.7-p330.tar.bz2) = 486c73b023b564c07e062e2e61114e81de970913b04fac6798d0fbe8b7723790
+SIZE (ruby/ruby-1.8.7-p330.tar.bz2) = 4191156
--- lang/ruby18/pkg-plist.orig	2010-12-27 10:14:05.000000000 +0800
+++ lang/ruby18/pkg-plist	2010-12-27 10:06:48.000000000 +0800
@@ -391,6 +391,7 @@
 %%RUBY_LIBDIR%%/openssl/bn.rb
 %%RUBY_LIBDIR%%/openssl/buffering.rb
 %%RUBY_LIBDIR%%/openssl/cipher.rb
+%%RUBY_LIBDIR%%/openssl/config.rb
 %%RUBY_LIBDIR%%/openssl/digest.rb
 %%RUBY_LIBDIR%%/openssl/pkcs7.rb
 %%RUBY_LIBDIR%%/openssl/ssl.rb
--- lang/ruby19/distinfo.orig	2010-12-27 10:14:30.000000000 +0800
+++ lang/ruby19/distinfo	2010-12-27 09:55:23.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (ruby/ruby-1.9.2-p0.tar.bz2) = d8a02cadf57d2571cd4250e248ea7e4b
-SHA256 (ruby/ruby-1.9.2-p0.tar.bz2) = e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
-SIZE (ruby/ruby-1.9.2-p0.tar.bz2) = 8495472
+SHA256 (ruby/ruby-1.9.2-p136.tar.bz2) = 33092509aad118f07f0483a3db1d4c5adaccf4bb0324cd43f44e3bd3dd1858cb
+SIZE (ruby/ruby-1.9.2-p136.tar.bz2) = 8819324
--- lang/ruby19/pkg-plist.orig	2010-12-27 10:14:22.000000000 +0800
+++ lang/ruby19/pkg-plist	2010-12-27 10:15:48.000000000 +0800
@@ -1035,6 +1035,9 @@
 %%GEMS_DIR%%/specifications/minitest.gemspec
 %%GEMS_DIR%%/specifications/rake.gemspec
 %%GEMS_DIR%%/specifications/rdoc.gemspec
+%%GEMS_DIR%%/specifications/minitest-1.6.0.gemspec
+%%GEMS_DIR%%/specifications/rake-0.8.7.gemspec
+%%GEMS_DIR%%/specifications/rdoc-2.5.8.gemspec
 @dirrm %%GEMS_DIR%%/specifications
 @dirrm %%GEMS_DIR%%/gems
 @dirrm %%GEMS_DIR%%/doc


>Release-Note:
>Audit-Trail:
>Unformatted: