Thu Jun 16 15:14:31 2011 UTC ()
Include rdoc.mk to use devel/rdoc instead of ruby{18,19}-base.

If the package needs newer version in ruby{18,19}-base, set
RUBY_RDOC_REQD to minimum rdoc's version.  ruby{18,19}-base have
these versions.

	ruby18-base: rdoc 1.0.1
	ruby19-base: rdoc 2.5.8

A package RUBY_RDOC_REQD set and built with devel/ruby-rdoc, it
will be also depends devel/ruby-rdoc package not only build time.
Because, files generated by rdoc commands of devel/ruby-rdoc may
not usable with ri commands in ruby{18,19}-base.


(taca)
diff -r1.29 -r1.30 pkgsrc/lang/ruby/modules.mk
cvs diff -r1.29 -r1.30 pkgsrc/lang/ruby/modules.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/modules.mk 2010/11/06 23:44:01 1.29
+++ pkgsrc/lang/ruby/modules.mk 2011/06/16 15:14:31 1.30
@@ -1,31 +1,36 @@ @@ -1,31 +1,36 @@
1# $NetBSD: modules.mk,v 1.29 2010/11/06 23:44:01 obache Exp $ 1# $NetBSD: modules.mk,v 1.30 2011/06/16 15:14:31 taca Exp $
2 2
3.if !defined(_RUBY_MODULE_MK) 3.if !defined(_RUBY_MODULE_MK)
4_RUBY_MODULE_MK= # defined 4_RUBY_MODULE_MK= # defined
5 5
6.include "../../lang/ruby/rubyversion.mk" 6.include "../../lang/ruby/rubyversion.mk"
7 7
8# 8#
9# Default package name would prefixed by RUBY_PKGPREFIX. 9# Default package name would prefixed by RUBY_PKGPREFIX.
10# 10#
11PKGNAME?= ${RUBY_PKGPREFIX}-${DISTNAME} 11PKGNAME?= ${RUBY_PKGPREFIX}-${DISTNAME}
12 12
13.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo]) 13.if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
14DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base 14DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}-base
15.else 15.else
16.include "../../lang/ruby/buildlink3.mk" 16.include "../../lang/ruby/buildlink3.mk"
17.endif 17.endif
18 18
 19#
 20# rdoc version
 21#
 22.include "../../lang/ruby/rdoc.mk"
 23
19CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q} 24CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q}
20 25
21# 26#
22# extconf.rb support 27# extconf.rb support
23# 28#
24# USE_RUBY_EXTCONF Use extconf script. 29# USE_RUBY_EXTCONF Use extconf script.
25# 30#
26# RUBY_EXTCONF specify extconf script name (default: extconf.rb). 31# RUBY_EXTCONF specify extconf script name (default: extconf.rb).
27# RUBY_EXTCONF_CHECK make sure to check existence of Makefile after 32# RUBY_EXTCONF_CHECK make sure to check existence of Makefile after
28# executing extconf script (default: yes). 33# executing extconf script (default: yes).
29# RUBY_EXTCONF_MAKEFILE name of Makefile checked by RUBY_EXTCONF_CHECK 34# RUBY_EXTCONF_MAKEFILE name of Makefile checked by RUBY_EXTCONF_CHECK
30# (default: Makefile) 35# (default: Makefile)
31# 36#