svn commit: r404313 - in head: Mk lang/ruby21 lang/ruby21/files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Wed Dec 23 19:10:49 UTC 2015
Author: sunpoet
Date: Wed Dec 23 19:10:47 2015
New Revision: 404313
URL: https://svnweb.freebsd.org/changeset/ports/404313
Log:
- Update to 2.1.8
- Add LICENSE_FILE
- Use USES=autoreconf instead of USE_AUTOTOOLS=autoconf
- Use USES=libedit
- Silence patch and build messages
Changes: https://www.ruby-lang.org/en/news/2015/12/16/ruby-2-1-8-released/
http://svn.ruby-lang.org/repos/ruby/tags/v2_1_8/ChangeLog
Security: 3b50881d-1860-4721-aab1-503290e23f6c
Differential Revision: https://reviews.freebsd.org/D4668
PR: 205487
Exp-run by: antoine
MFH: 2015Q4
Modified:
head/Mk/bsd.ruby.mk
head/lang/ruby21/Makefile
head/lang/ruby21/distinfo
head/lang/ruby21/files/patch-ext_openssl_extconf.rb
head/lang/ruby21/files/patch-ext_readline_extconf.rb
Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk Wed Dec 23 19:09:55 2015 (r404312)
+++ head/Mk/bsd.ruby.mk Wed Dec 23 19:10:47 2015 (r404313)
@@ -181,7 +181,7 @@ RUBY20= "" # PLIST_SUB helpers
#
# Ruby 2.1
#
-RUBY_RELVERSION= 2.1.7
+RUBY_RELVERSION= 2.1.8
RUBY_PORTREVISION= 0
RUBY_PORTEPOCH= 1
RUBY_PATCHLEVEL= 0
Modified: head/lang/ruby21/Makefile
==============================================================================
--- head/lang/ruby21/Makefile Wed Dec 23 19:09:55 2015 (r404312)
+++ head/lang/ruby21/Makefile Wed Dec 23 19:10:47 2015 (r404313)
@@ -15,6 +15,8 @@ COMMENT?= Object-oriented interpreted sc
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
+LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
+LICENSE_FILE_RUBY= ${WRKSRC}/COPYING
# Using LIB_DEPENDS finds the libffi from gcc which causes problems
BUILD_DEPENDS= libffi>=0:${PORTSDIR}/devel/libffi
@@ -34,20 +36,19 @@ GNU_CONFIGURE= yes
# Keep this, else ruby will fail to load libraries dependent of libpthread.
LIBS+= -lpthread -L${LOCALBASE}/lib
MAKE_ENV= LC_ALL=C
-USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
USE_OPENSSL= yes
-USES= cpe execinfo tar:xz
+USES= autoreconf cpe execinfo tar:xz
WRKSRC= ${RUBY_WRKSRC}
-NOT_FOR_ARCHS= ia64
-NOT_FOR_ARCHS_REASON_ia64= does not build
-
RUBY_VER= 2.1
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
RUBY_NO_RUN_DEPENDS= yes
+NOT_FOR_ARCHS= ia64
+NOT_FOR_ARCHS_REASON_ia64= does not build
+
OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC
OPTIONS_DEFAULT= RDOC LIBEDIT
OPTIONS_SINGLE= EDIT
@@ -64,9 +65,8 @@ CAPIDOCS_BUILD_DEPENDS= doxygen>0:${PORT
CAPIDOCS_CONFIGURE_ENABLE= install-capi
GMP_CONFIGURE_WITH= gmp
GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
-LIBEDIT_BUILD_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
LIBEDIT_CONFIGURE_ON= --enable-libedit --with-libedit-dir=${LOCALBASE}
-LIBEDIT_RUN_DEPENDS= libedit>=0:${PORTSDIR}/devel/libedit
+LIBEDIT_USES= libedit
RDOC_CONFIGURE_ENABLE= install-rdoc
READLINE_BUILD_DEPENDS= readline>=0:${PORTSDIR}/devel/readline
READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${LOCALBASE}
@@ -142,20 +142,20 @@ post-patch:
# Remove modules we don't want
#
.for d in win32ole
- ${RM} -rf ${BUILD_WRKSRC}/ext/${d}
+ @${RM} -rf ${BUILD_WRKSRC}/ext/${d}
.endfor
# We get rake from ports.
.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
- ${RM} -rf ${BUILD_WRKSRC}/${d}
+ @${RM} -rf ${BUILD_WRKSRC}/${d}
.endfor
# We get the gem executable from ports.
- ${RM} ${BUILD_WRKSRC}/bin/gem
+ @${RM} ${BUILD_WRKSRC}/bin/gem
#
# Prepare modules we are wanting to build via external ports
#
.for d in gdbm tk
- ${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
+ @${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
.endfor
post-build:
@@ -170,7 +170,7 @@ post-build:
@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
post-build-CAPIDOCS-on:
- ${FIND} ${WRKSRC}/doc -type d -empty -delete
+ @${FIND} ${WRKSRC}/doc -type d -empty -delete
pre-install:
${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
Modified: head/lang/ruby21/distinfo
==============================================================================
--- head/lang/ruby21/distinfo Wed Dec 23 19:09:55 2015 (r404312)
+++ head/lang/ruby21/distinfo Wed Dec 23 19:10:47 2015 (r404313)
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-2.1.7.tar.xz) = 225c067d9820fe52fcffbfb91d5b5243708a0b666b9929bea466e9379eb40ad7
-SIZE (ruby/ruby-2.1.7.tar.xz) = 9371208
+SHA256 (ruby/ruby-2.1.8.tar.xz) = 94eeae3b3e3ac93cfd205e1aaef4c5325227b7656cbb2fc1ee217618145dd19d
+SIZE (ruby/ruby-2.1.8.tar.xz) = 9382672
Modified: head/lang/ruby21/files/patch-ext_openssl_extconf.rb
==============================================================================
--- head/lang/ruby21/files/patch-ext_openssl_extconf.rb Wed Dec 23 19:09:55 2015 (r404312)
+++ head/lang/ruby21/files/patch-ext_openssl_extconf.rb Wed Dec 23 19:10:47 2015 (r404313)
@@ -10,6 +10,6 @@
+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")
+ have_func("SSLv3_method")
+ have_func("SSLv3_server_method")
+ have_func("SSLv3_client_method")
Modified: head/lang/ruby21/files/patch-ext_readline_extconf.rb
==============================================================================
--- head/lang/ruby21/files/patch-ext_readline_extconf.rb Wed Dec 23 19:09:55 2015 (r404312)
+++ head/lang/ruby21/files/patch-ext_readline_extconf.rb Wed Dec 23 19:10:47 2015 (r404313)
@@ -1,13 +1,5 @@
--- ext/readline/extconf.rb.orig 2014-05-01 11:59:37.000000000 +0000
+++ ext/readline/extconf.rb 2015-10-23 04:05:44.000000000 +0000
-@@ -37,6 +37,7 @@
- case enable_libedit
- when true
- # --enable-libedit
-+ dir_config("libedit")
- unless (readline.have_header("editline/readline.h") ||
- readline.have_header("readline/readline.h")) &&
- have_library("edit", "readline")
@@ -62,7 +63,7 @@ else
end
More information about the svn-ports-all
mailing list