summaryrefslogtreecommitdiff
path: root/lang/ruby
diff options
context:
space:
mode:
authortaca <taca>2005-11-03 07:23:41 +0000
committertaca <taca>2005-11-03 07:23:41 +0000
commite2af86c9f02c8035a3e56c1b0e9da083d335c3c5 (patch)
treecc67110723947bc3e8e400425bcf5afb96c8f34a /lang/ruby
parent5c969b60f77945e7d2ac64dc5bd6f52fde75a5e4 (diff)
downloadpkgsrc-e2af86c9f02c8035a3e56c1b0e9da083d335c3c5.tar.gz
Drop support of ruby16 base packages.
Diffstat (limited to 'lang/ruby')
-rw-r--r--lang/ruby/rubyversion.mk25
1 files changed, 7 insertions, 18 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index cfc30e7063d..ba7d148446f 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.15 2005/11/02 08:56:17 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.16 2005/11/03 07:23:41 taca Exp $
#
.ifndef _RUBYVERSION_MK
@@ -7,7 +7,6 @@ _RUBYVERSION_MK= # defined
.include "../../mk/bsd.prefs.mk"
# current supported Ruby's version
-RUBY16_VERSION?= 1.6.8
RUBY18_VERSION?= 1.8.3
# RUBY_VERSION_DEFAULT defines default version for Ruby related
@@ -22,9 +21,7 @@ RUBY_VERSION_DEFAULT?= 1.8
# Default value is set to ${RUBY_VERSION_DEFAULT}
#
.if !defined(RUBY_VERSION)
-.if ${RUBY_VERSION_DEFAULT} == "1.6"
-RUBY_VERSION?= ${RUBY16_VERSION}
-.elif ${RUBY_VERSION_DEFAULT} == "1.8"
+.if ${RUBY_VERSION_DEFAULT} == "1.8"
RUBY_VERSION?= ${RUBY18_VERSION}
.endif
.endif
@@ -33,18 +30,18 @@ RUBY_VERSION?= ${RUBY18_VERSION}
# supported by the package. It should be defined by The pacakges
# for specific version Ruby.
#
-RUBY_VERSION_SUPPORTED?= 16 18
+RUBY_VERSION_SUPPORTED?= 18
# RUBY_VERSION_LIST defines the list of ${RUBY_VER} which is known to
# this framework.
#
-RUBY_VERSION_LIST= 16,18
+RUBY_VERSION_LIST= 18
# RUBY_NOVERSION should be set to "Yes" if the package dosen't depend on
# any specific version of ruby command. In this case, package's
# name begin with "ruby-".
# If RUBY_NOVERSION is "No" (default), the package's name is begin
-# with ${RUBY_NAME}; "ruby16-", "ruby18" and so on.
+# with ${RUBY_NAME}; "ruby18", "ruby19", and so on.
#
# It also affects to RUBY_DOCDIR, RUBY_EXAMPLESDIR...
#
@@ -67,15 +64,11 @@ RUBY_VER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
# RUBY_REQD Minimum required Ruby's version
#
.if defined(RUBY_HAS_ARCHLIB) && empty(RUBY_HAS_ARCHLIB:M[nN][oO])
-.if ${RUBY_VER} == "16"
-RUBY_REQD?= ${RUBY16_VERSION}
-.elif ${RUBY_VER} == "18"
+.if ${RUBY_VER} == "18"
RUBY_REQD?= ${RUBY18_VERSION}
.endif
.else
-.if ${RUBY_VER} == "16"
-RUBY_REQD?= 1.6.8
-.elif ${RUBY_VER} == "18"
+.if ${RUBY_VER} == "18"
RUBY_REQD?= 1.8.1
.endif
.endif
@@ -122,11 +115,7 @@ RDOC?= ${PREFIX}/bin/rdoc${RUBY_VER}
#
# RUBY_ARCH is used architecture depended direcotry name.
#
-.if ${OPSYS} == "Linux" && ${RUBY_VER} == "16"
-RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}-gnu
-.else
RUBY_ARCH?= ${LOWER_ARCH}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
-.endif
#
# Ruby shared library version handling.