svn commit: r382973 - in head: Mk lang/ruby20 lang/ruby20/files lang/ruby21 lang/ruby21/files lang/ruby22 lang/ruby22/files

[Bryan Drewery]

Author: bdrewery
Date: Wed Apr  1 23:26:10 2015
New Revision: 382973
URL: https://svnweb.freebsd.org/changeset/ports/382973

Log:
  - Fix runtime with OpenSSL after the removal of SSLv2 in head.
  - Make the main LOCALBASE/bin files into symlinks to the actual version to
    make it simpler to tell which version is default.

Added:
  head/lang/ruby20/files/patch-ext_openssl_extconf.rb   (contents, props changed)
  head/lang/ruby21/files/patch-ext_openssl_extconf.rb   (contents, props changed)
  head/lang/ruby22/files/patch-ext_openssl_extconf.rb   (contents, props changed)
Modified:
  head/Mk/bsd.ruby.mk
  head/lang/ruby20/Makefile
  head/lang/ruby21/Makefile
  head/lang/ruby22/Makefile

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Wed Apr  1 23:24:50 2015	(r382972)
+++ head/Mk/bsd.ruby.mk	Wed Apr  1 23:26:10 2015	(r382973)
@@ -172,7 +172,7 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 # Ruby 2.0
 #
 RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	643
 RUBY20=			""	# PLIST_SUB helpers
@@ -182,7 +182,7 @@ RUBY20=			""	# PLIST_SUB helpers
 # Ruby 2.1
 #
 RUBY_RELVERSION=	2.1.5
-RUBY_PORTREVISION=	3
+RUBY_PORTREVISION=	4
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY21=			""	# PLIST_SUB helpers
@@ -192,7 +192,7 @@ RUBY21=			""	# PLIST_SUB helpers
 # Ruby 2.2
 #
 RUBY_RELVERSION=	2.2.1
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY22=			""	# PLIST_SUB helpers

Modified: head/lang/ruby20/Makefile
==============================================================================
--- head/lang/ruby20/Makefile	Wed Apr  1 23:24:50 2015	(r382972)
+++ head/lang/ruby20/Makefile	Wed Apr  1 23:26:10 2015	(r382973)
@@ -212,7 +212,7 @@ post-install:
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
-	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
+	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 

Added: head/lang/ruby20/files/patch-ext_openssl_extconf.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ruby20/files/patch-ext_openssl_extconf.rb	Wed Apr  1 23:26:10 2015	(r382973)
@@ -0,0 +1,15 @@
+--- ext/openssl/extconf.rb.orig	2015-04-01 22:28:09 UTC
++++ ext/openssl/extconf.rb
+@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
+ have_func("SSL_SESSION_get_id")
+ have_func("SSL_SESSION_cmp")
+ have_func("OPENSSL_cleanse")
+-have_func("SSLv2_method")
+-have_func("SSLv2_server_method")
+-have_func("SSLv2_client_method")
++have_func("SSLv23_method")
++have_func("SSLv23_server_method")
++have_func("SSLv23_client_method")
+ have_func("TLSv1_1_method")
+ have_func("TLSv1_1_server_method")
+ have_func("TLSv1_1_client_method")

Modified: head/lang/ruby21/Makefile
==============================================================================
--- head/lang/ruby21/Makefile	Wed Apr  1 23:24:50 2015	(r382972)
+++ head/lang/ruby21/Makefile	Wed Apr  1 23:26:10 2015	(r382973)
@@ -207,7 +207,7 @@ post-install:
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
-	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
+	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 

Added: head/lang/ruby21/files/patch-ext_openssl_extconf.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ruby21/files/patch-ext_openssl_extconf.rb	Wed Apr  1 23:26:10 2015	(r382973)
@@ -0,0 +1,15 @@
+--- ext/openssl/extconf.rb.orig	2015-04-01 22:28:09 UTC
++++ ext/openssl/extconf.rb
+@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
+ have_func("SSL_SESSION_get_id")
+ have_func("SSL_SESSION_cmp")
+ have_func("OPENSSL_cleanse")
+-have_func("SSLv2_method")
+-have_func("SSLv2_server_method")
+-have_func("SSLv2_client_method")
++have_func("SSLv23_method")
++have_func("SSLv23_server_method")
++have_func("SSLv23_client_method")
+ have_func("TLSv1_1_method")
+ have_func("TLSv1_1_server_method")
+ have_func("TLSv1_1_client_method")

Modified: head/lang/ruby22/Makefile
==============================================================================
--- head/lang/ruby22/Makefile	Wed Apr  1 23:24:50 2015	(r382972)
+++ head/lang/ruby22/Makefile	Wed Apr  1 23:26:10 2015	(r382973)
@@ -207,7 +207,7 @@ post-install:
 #
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 . for FILE in ${INSTALLED_SCRIPTS}
-	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
+	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 .endif
 

Added: head/lang/ruby22/files/patch-ext_openssl_extconf.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/ruby22/files/patch-ext_openssl_extconf.rb	Wed Apr  1 23:26:10 2015	(r382973)
@@ -0,0 +1,15 @@
+--- ext/openssl/extconf.rb.orig	2015-04-01 22:28:09 UTC
++++ ext/openssl/extconf.rb
+@@ -100,9 +100,9 @@ have_func("OBJ_NAME_do_all_sorted")
+ have_func("SSL_SESSION_get_id")
+ have_func("SSL_SESSION_cmp")
+ have_func("OPENSSL_cleanse")
+-have_func("SSLv2_method")
+-have_func("SSLv2_server_method")
+-have_func("SSLv2_client_method")
++have_func("SSLv23_method")
++have_func("SSLv23_server_method")
++have_func("SSLv23_client_method")
+ have_func("TLSv1_1_method")
+ have_func("TLSv1_1_server_method")
+ have_func("TLSv1_1_client_method")