diff options
| author | taca <taca> | 2004-11-29 07:05:00 +0000 |
|---|---|---|
| committer | taca <taca> | 2004-11-29 07:05:00 +0000 |
| commit | d14c573ac4cc576b46b84edd72bc261a1d69bfb9 (patch) | |
| tree | ce5ceedd6be40ed9d108137727c3e52b697f09c8 /lang/ruby | |
| parent | be10d1caa2376742a11986d7765fb26b2848f4ad (diff) | |
| download | pkgsrc-d14c573ac4cc576b46b84edd72bc261a1d69bfb9.tar.gz | |
- set RUBY_REQD proper value.
- use RUBY_REQD in buildlink3.mk.
Fix RUBY_REQD undefined in some case.
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/buildlink3.mk | 10 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 13 |
2 files changed, 15 insertions, 8 deletions
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk index eaab74033ac..035ebd6509c 100644 --- a/lang/ruby/buildlink3.mk +++ b/lang/ruby/buildlink3.mk @@ -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 @@ BUILDLINK_PACKAGES+= ${RUBY_NAME} .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}/util.h 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 --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index c431a6c76fd..6eced3f35b1 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -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 @@ RUBY_VERSION_DEFAULT?= 1.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_VERS_TEENY= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} # 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} |