diff options
| author | swills <swills@FreeBSD.org> | 2016-12-27 03:00:05 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2016-12-27 03:00:05 +0800 |
| commit | a4a7f11fac63b326e978d87c154970844a80b462 (patch) | |
| tree | 7cecfa71aa3e7dce86fb9f492e04909f883e098a /Mk | |
| parent | 7c127bab959e775cfdb71e846b006e8d65763adf (diff) | |
| download | freebsd-ports-gnome-a4a7f11fac63b326e978d87c154970844a80b462.tar.gz freebsd-ports-gnome-a4a7f11fac63b326e978d87c154970844a80b462.tar.zst freebsd-ports-gnome-a4a7f11fac63b326e978d87c154970844a80b462.zip | |
Add Ruby 2.4.0
While here, remove local patches that are no longer needed and simplify
post-patch target.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.ruby.mk | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index c52107410d5e..5baf03057662 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -76,7 +76,7 @@ PYTHON_DEFAULT?= 2.7 PYTHON2_DEFAULT?= 2.7 # Possible values: 3.3, 3.4, 3.5, 3.6 PYTHON3_DEFAULT?= 3.5 -# Possible values: 2.1, 2.2, 2.3 +# Possible values: 2.1, 2.2, 2.3, 2.4 RUBY_DEFAULT?= 2.2 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel .if !defined(SSL_DEFAULT) diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 06c6b8e1ff81..76d7de61df44 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -180,13 +180,23 @@ RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY23= "" # PLIST_SUB helpers +. elif ${RUBY_VER} == 2.4 +# +# Ruby 2.4 +# +RUBY_RELVERSION= 2.4.0 +RUBY_PORTREVISION= 0 +RUBY_PORTEPOCH= 1 +RUBY_PATCHLEVEL= 0 +RUBY24= "" # PLIST_SUB helpers + # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. . else # # Other versions # -IGNORE= Only ruby 2.1, 2.2 and 2.3 are supported +IGNORE= Only ruby 2.1, 2.2, 2.3 and 2.4 are supported _INVALID_RUBY_VER= 1 . endif .endif # defined(RUBY_VER) @@ -196,6 +206,7 @@ _INVALID_RUBY_VER= 1 RUBY21?= "@comment " RUBY22?= "@comment " RUBY23?= "@comment " +RUBY24?= "@comment " .if defined(BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}) .if ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} == "yes" |