[pkgsrc/trunk]: pkgsrc/lang/ruby * Fix dependency condition to inverse when R...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/337e8865eb77
branches:  trunk
changeset: 590766:337e8865eb77
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Jul 22 03:36:11 2011 +0000

description:
* Fix dependency condition to inverse when RUBY_RDOC_REQD is defined.
* Minor clean up.

diffstat:

 lang/ruby/rdoc.mk |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r 6fc82d11ad3f -r 337e8865eb77 lang/ruby/rdoc.mk
--- a/lang/ruby/rdoc.mk Fri Jul 22 03:19:19 2011 +0000
+++ b/lang/ruby/rdoc.mk Fri Jul 22 03:36:11 2011 +0000
@@ -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_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