pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ruby - set RUBY_REQD proper value.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bd218d2dcefc
branches: trunk
changeset: 484705:bd218d2dcefc
user: taca <taca%pkgsrc.org@localhost>
date: Mon Nov 29 07:05:00 2004 +0000
description:
- set RUBY_REQD proper value.
- use RUBY_REQD in buildlink3.mk.
Fix RUBY_REQD undefined in some case.
diffstat:
lang/ruby/buildlink3.mk | 10 +++++-----
lang/ruby/rubyversion.mk | 13 ++++++++++---
2 files changed, 15 insertions(+), 8 deletions(-)
diffs (69 lines):
diff -r 2dbf229bed7e -r bd218d2dcefc lang/ruby/buildlink3.mk
--- a/lang/ruby/buildlink3.mk Mon Nov 29 05:53:40 2004 +0000
+++ b/lang/ruby/buildlink3.mk Mon Nov 29 07:05:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/11/27 13:57:21 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/11/29 07:05:00 taca Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
RUBY_BASE_BUILDLINK3_MK:= ${RUBY_BASE_BUILDLINK3_MK}+
@@ -17,9 +17,9 @@
.if !empty(RUBY_BASE_BUILDLINK3_MK:M+)
.if ${RUBY_VER} == "16"
RUBYSRCDIR= ../../lang/ruby16
-BUILDLINK_DEPENDS.ruby16?= ruby16>=1.6.8
+BUILDLINK_DEPENDS.ruby16?= ruby16>=${RUBY_REQD}
BUILDLINK_PKGSRCDIR.ruby16?= ${RUBYSRCDIR}
-EVAL_PREFIX+= BUILDLINK_PREFIX.ruby16=ruby16
+EVAL_PREFIX+= BUILDLINK_PREFIX.ruby16=${RUBY_NAME}
BUILDLINK_PREFIX.ruby16_DEFAULT= ${LOCALBASE}
BUILDLINK_FILES.ruby16= lib/libruby${RUBY_VER}.*
BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/config.h
@@ -40,9 +40,9 @@
BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/version.h
.elif ${RUBY_VER} == "18"
RUBYSRCDIR= ../../lang/ruby18
-BUILDLINK_DEPENDS.ruby18?= ruby18>=1.8.1
+BUILDLINK_DEPENDS.ruby18?= ruby18>=${RUBY_REQD}
BUILDLINK_PKGSRCDIR.ruby18?= ${RUBYSRCDIR}
-EVAL_PREFIX+= BUILDLINK_PREFIX.ruby18=ruby18
+EVAL_PREFIX+= BUILDLINK_PREFIX.ruby18=${RUBY_NAME}
BUILDLINK_FILES.ruby18= lib/libruby${RUBY_VER}.*
BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/config.h
BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/defines.h
diff -r 2dbf229bed7e -r bd218d2dcefc lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Mon Nov 29 05:53:40 2004 +0000
+++ b/lang/ruby/rubyversion.mk Mon Nov 29 07:05:00 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.2 2004/11/28 15:38:35 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.3 2004/11/29 07:05:00 taca Exp $
#
.ifndef _RUBYVERSION_MK
@@ -26,10 +26,8 @@
#
.if !defined(RUBY_VERSION)
.if ${RUBY_VERSION_DEFAULT} == "1.6"
-RUBY_REQD?= 1.6.8
RUBY_VERSION?= ${RUBY16_VERSION}
.elif ${RUBY_VERSION_DEFAULT} == "1.8"
-RUBY_REQD?= 1.8.1
RUBY_VERSION?= ${RUBY18_VERSION}
.endif
.endif
@@ -62,6 +60,15 @@
#
RUBY_VER= ${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
+#
+# RUBY_REQD is minimum required Ruby's version
+#
+.if ${RUBY_VER} == "16"
+RUBY_REQD?= 1.6.8
+.elif ${RUBY_VER} == "18"
+RUBY_REQD?= 1.8.1
+.endif
+
# RUBY_SUFFIX is appended to Ruby's commands; ruby, irb and so on.
#
RUBY_SUFFIX?= ${RUBY_VER}
Home |
Main Index |
Thread Index |
Old Index