Page MenuHomeFreeBSD
Files F137925397

D1954.id54425.diff
No OneTemporary
Actions

D1954.id54425.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -7425,3 +7425,4 @@
sysutils/rsyslog8-devel|sysutils/rsyslog8|2015-02-13|Has expired: EoL, use sysutils/rsyslog8
japanese/mozc-additions||2015-02-15|Obsoleted by mozc script in japanese/mozc-server
math/ruby-numru_units|math/rubygem-numru-units|2015-02-22|Long time broken. Please use math/rubygem-numru-units instead
+lang/ruby19|lang/ruby20|2015-02-24|Upstream support ended February 23, 2015
Index: Mk/bsd.ruby.mk
===================================================================
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -15,7 +15,7 @@
# [variables that a user may define]
#
# RUBY_VER - (See below)
-# RUBY_DEFAULT_VER - Set to (e.g.) "1.9" if you want to refer to "ruby19"
+# RUBY_DEFAULT_VER - Set to (e.g.) "2.0" if you want to refer to "ruby20"
# just as "ruby".
# RUBY_ARCH - (See below)
# RUBY_RD_HTML - Define if you want HTML files generated from RD files.
@@ -172,17 +172,7 @@
RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
.if defined(RUBY_VER)
-. if ${RUBY_VER} == 1.9
-#
-# Ruby 1.9
-#
-RUBY_RELVERSION= 1.9.3
-RUBY_PORTREVISION= 2
-RUBY_PORTEPOCH= 1
-RUBY_PATCHLEVEL= 551
-RUBY19= "" # PLIST_SUB helpers
-
-. elif ${RUBY_VER} == 2.0
+. if ${RUBY_VER} == 2.0
#
# Ruby 2.0
#
@@ -216,11 +206,10 @@
#
# Other versions
#
-IGNORE= Only ruby 1.9, 2.0, 2.1 and 2.2 are supported
+IGNORE= Only ruby 2.0, 2.1 and 2.2 are supported
. endif
.endif # defined(RUBY_VER)
-RUBY19?= "@comment "
RUBY20?= "@comment "
RUBY21?= "@comment "
RUBY22?= "@comment "
@@ -352,7 +341,6 @@
RUBY_SUFFIX="${RUBY_SUFFIX}" \
RUBY_NAME="${RUBY_NAME}" \
RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
- RUBY19=${RUBY19} \
RUBY20=${RUBY20} \
RUBY21=${RUBY21} \
RUBY22=${RUBY22}
@@ -581,19 +569,6 @@
.endif
.endif
-.if defined(USE_RUBY_FEATURES)
-
-_use= ${USE_RUBY_FEATURES:Miconv}
-.if !empty(_use)
-.if (${RUBY_VER} == 1.9)
-BUILD_DEPENDS+= ${DEPEND_RUBY_ICONV}
-RUN_DEPENDS+= ${DEPEND_RUBY_ICONV}
-.endif
-.endif
-
-.undef _use
-.endif
-
.if defined(USE_RAKE)
BUILD_DEPENDS+= ${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
RAKE_BIN= ${LOCALBASE}/bin/rake
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -6,6 +6,15 @@
you update your ports collection, before attempting any port upgrades.
20150224:
+ AFFECTS: Users of lang/ruby19
+
+ lang/ruby19 has reached its end-of-life and has been removed. The
+ default version has been 2.0 for a while. Other available versions
+ are Ruby 2.1 and Ruby 2.2.
+
+ Users who have DEFAULT_VERSIONS=ruby=1.9 in their /etc/make.conf are
+ encouraged to remove it or change it to an available version.
+
AFFECTS: Users of net-p2p/bitcoin (cli utilities)
The bitcoin-cli and bitcoin-tx utilities have been re-packaged into
Index: lang/Makefile
===================================================================
--- lang/Makefile
+++ lang/Makefile
@@ -268,7 +268,6 @@
SUBDIR += rexx-wrapper
SUBDIR += rhino
SUBDIR += rubinius
- SUBDIR += ruby19
SUBDIR += ruby20
SUBDIR += ruby21
SUBDIR += ruby22

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 7:52 AM (8 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26277849
Default Alt Text
D1954.id54425.diff (3 KB)

Event Timeline