diff options
| author | taca <taca@pkgsrc.org> | 2011-07-22 03:36:11 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-07-22 03:36:11 +0000 |
| commit | 007db3046141eb1f318b63d8f0cd03de95ba868f (patch) | |
| tree | 7500ddc353f9de7ccd194473f624b7484acf0b53 /lang | |
| parent | aa5b4024a966433a2b33f157e2183f915f583e27 (diff) | |
| download | pkgsrc-007db3046141eb1f318b63d8f0cd03de95ba868f.tar.gz | |
* Fix dependency condition to inverse when RUBY_RDOC_REQD is defined.
* Minor clean up.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/rdoc.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lang/ruby/rdoc.mk b/lang/ruby/rdoc.mk index 0c8e494d2bc..e1eb405ca7f 100644 --- a/lang/ruby/rdoc.mk +++ b/lang/ruby/rdoc.mk @@ -1,4 +1,4 @@ -# $NetBSD: rdoc.mk,v 1.2 2011/07/22 03:18:44 taca Exp $ +# $NetBSD: rdoc.mk,v 1.3 2011/07/22 03:36:11 taca Exp $ .if !defined(_RUBY_RDOC_MK) _RUBY_RDOC_MK= # defined @@ -37,18 +37,20 @@ _RUBY_RDOC_MAJOR= ${RUBY19_RDOC_VERS:C/\.[0-9\.]+$//} _RUBY_RDOC_MINORS= ${RUBY19_RDOC_VERS:C/^([0-9]+)\.*//} . endif +_RUBY_RDOC_REQD= NO + . if ${_RDOC_REQD_MAJOR} > ${_RUBY_RDOC_MAJOR} -_RUBY_RDOC_REQD= yes +_RUBY_RDOC_REQD= YES . elif ${_RDOC_REQD_MAJOR} == ${_RUBY_RDOC_MAJOR} . if !empty(_RUBY_RDOC_MINORS) && ${_RDOC_REQD_MINORS} > ${_RUBY_RDOC_MINORS} -_RUBY_RDOC_REQD= yes +_RUBY_RDOC_REQD= YES . endif . endif -. if defined(_RUBY_RDOC_REQD) +. if empty(_RUBY_RDOC_REQD:M[nN][oO]) RDOC= ${PREFIX}/bin/rdoc -. if !empty(RUBY_BUILD_RI:M[nN][oO]) || !empty(RUBY_BUILD_RDOC:M[nN][oO]) -# for safety, use newer rdoc on runtime, too. +. if empty(RUBY_BUILD_RI:M[nN][oO]) && empty(RUBY_BUILD_RDOC:M[nN][oO]) +# rdoc will be required at runtime, too. DEPENDS+= ${RUBY_PKGPREFIX}-rdoc>=${RUBY_RDOC_REQD}:../../devel/ruby-rdoc . endif . endif |