Page MenuHomeFreeBSD
Files F146886485

D1954.id3957.diff
No OneTemporary
Actions

D1954.id3957.diff
View Options

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

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 7, 12:12 PM (45 m, 21 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29366135
Default Alt Text
D1954.id3957.diff (1 KB)

Event Timeline