From 922992b32786e7c9484ea0d79e398bb73642f7f2 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sun, 28 Jan 2007 15:15:57 +0000
Subject: Fix ruby-build-ri-db option related problem.

- Include options.mk before rubyversion.mk, so PLIST for ri database
  should be created suitably.

- make RUBY_RIDIR and its friends relative path to ${PREFIX}.

- Fix and improve handling of ${RUBY_RIDIR} handling and should
  be fixed remaining ${RUBY_RIDIR} after pkg_delete ruby18-base.
  (Noted by private mail from wiz@.)

Bump PKGREVISION of ruby18-base package.
---
 lang/ruby/rubyversion.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lang/ruby')

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index bb1d52e66a8..11b9c66413f 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.30 2006/12/06 16:19:49 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.31 2007/01/28 15:15:57 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -190,7 +190,11 @@ RUBY_SITELIBDIR?=	${PREFIX}/lib/ruby/site_ruby/${RUBY_VER_DIR}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
 RUBY_DOCDIR?=		${PREFIX}/share/doc/${RUBY_NAME}
 RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/${RUBY_NAME}
-RUBY_RIDIR?=		${PREFIX}/share/ri
+
+#
+# ri database relative path
+#
+RUBY_RIDIR?=		share/ri
 RUBY_BASERIDIR?=	${RUBY_RIDIR}/${RUBY_VER_DIR}
 RUBY_SYSRIDIR?=		${RUBY_BASERIDIR}/system
 RUBY_SITERIDIR?=	${RUBY_BASERIDIR}/site
-- 
cgit v1.2.3