diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 6 | ||||
| -rw-r--r-- | lang/ruby20/Makefile | 2 | ||||
| -rw-r--r-- | lang/ruby20/files/patch-ext_openssl_extconf.rb | 15 | ||||
| -rw-r--r-- | lang/ruby21/Makefile | 2 | ||||
| -rw-r--r-- | lang/ruby21/files/patch-ext_openssl_extconf.rb | 15 | ||||
| -rw-r--r-- | lang/ruby22/Makefile | 2 | ||||
| -rw-r--r-- | lang/ruby22/files/patch-ext_openssl_extconf.rb | 15 |
7 files changed, 51 insertions, 6 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 5d977fd8de51..331202c5cd6a 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -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 diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile index 077cc07deab9..959bc616bc1b 100644 --- a/lang/ruby20/Makefile +++ b/lang/ruby20/Makefile @@ -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 diff --git a/lang/ruby20/files/patch-ext_openssl_extconf.rb b/lang/ruby20/files/patch-ext_openssl_extconf.rb new file mode 100644 index 000000000000..2577c1c1ec13 --- /dev/null +++ b/lang/ruby20/files/patch-ext_openssl_extconf.rb @@ -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") diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile index 4026cb9a5d55..8ca7cd0b6925 100644 --- a/lang/ruby21/Makefile +++ b/lang/ruby21/Makefile @@ -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 diff --git a/lang/ruby21/files/patch-ext_openssl_extconf.rb b/lang/ruby21/files/patch-ext_openssl_extconf.rb new file mode 100644 index 000000000000..2577c1c1ec13 --- /dev/null +++ b/lang/ruby21/files/patch-ext_openssl_extconf.rb @@ -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") diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile index 55f6ec165c55..da67a81398c6 100644 --- a/lang/ruby22/Makefile +++ b/lang/ruby22/Makefile @@ -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 diff --git a/lang/ruby22/files/patch-ext_openssl_extconf.rb b/lang/ruby22/files/patch-ext_openssl_extconf.rb new file mode 100644 index 000000000000..2577c1c1ec13 --- /dev/null +++ b/lang/ruby22/files/patch-ext_openssl_extconf.rb @@ -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") |