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.

6 files changed, 27 insertions, 16 deletions

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
diff --git a/lang/ruby18-base/DEINSTALL b/lang/ruby18-base/DEINSTALL
index d45c3e16487..b02f4ae3e85 100644
--- a/lang/ruby18-base/DEINSTALL
+++ b/lang/ruby18-base/DEINSTALL
@@ -1,6 +1,7 @@
-# $NetBSD: DEINSTALL,v 1.1 2005/11/02 08:56:39 taca Exp $
+# $NetBSD: DEINSTALL,v 1.2 2007/01/28 15:15:58 taca Exp $
 
-RUBY_SITERIDIR="@RUBY_SITERIDIR@"
+PREFIX="@PREFIX@"
+RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
 rid="${RUBY_SITERIDIR}/created.rid"
 
 case ${STAGE} in
diff --git a/lang/ruby18-base/INSTALL b/lang/ruby18-base/INSTALL
index 0a1ec486cfa..c97ca01557b 100644
--- a/lang/ruby18-base/INSTALL
+++ b/lang/ruby18-base/INSTALL
@@ -1,12 +1,16 @@
-# $NetBSD: INSTALL,v 1.1 2005/11/02 08:56:39 taca Exp $
+# $NetBSD: INSTALL,v 1.2 2007/01/28 15:15:58 taca Exp $
 
 DATE="@DATE@"
-RUBY_SITERIDIR="@RUBY_SITERIDIR@"
+PREFIX="@PREFIX@"
+RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@"
+RUBY_SYSRIDIR="${PREFIX}/@RUBY_SYSRIDIR@"
 rid="${RUBY_SITERIDIR}/created.rid"
 
 case ${STAGE} in
 POST-INSTALL)
-	${DATE} > ${rid}
+	if [ -d ${RUBY_SYSRIDIR} ]; then
+		${DATE} > ${rid}
+	fi
 	;;
 esac
 exit
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index 7ba59d5de99..9b166b39ec6 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2006/12/06 16:24:27 taca Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/28 15:15:58 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
-#PKGREVISION=
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -37,6 +37,9 @@ WRKSRC=			${RUBY_WRKSRC}
 CONFIG_STATUS_OVERRIDE=	# empty
 
 MAKE_DIRS+=	${RUBY_SITERIDIR}
+FILES_SUBST+=	DATE=${DATE:Q}
+
+.include "options.mk"
 
 .include "../../lang/ruby/rubyversion.mk"
 
@@ -44,10 +47,6 @@ MAKE_DIRS+=	${RUBY_SITERIDIR}
 CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
 .endif
 
-.include "options.mk"
-
-FILES_SUBST+=	DATE=${DATE:Q}
-
 #
 # IRIX work around which should be fixed.
 #
diff --git a/lang/ruby18-base/PLIST.common_end b/lang/ruby18-base/PLIST.common_end
index 531372e845b..bc676d7f6ce 100644
--- a/lang/ruby18-base/PLIST.common_end
+++ b/lang/ruby18-base/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2006/12/06 16:24:27 taca Exp $
+@comment $NetBSD: PLIST.common_end,v 1.3 2007/01/28 15:15:58 taca Exp $
 @dirrm ${RUBY_LIBDIR}/bigdecimal
 @dirrm ${RUBY_LIBDIR}/cgi/session
 @dirrm ${RUBY_LIBDIR}/cgi
@@ -92,3 +92,6 @@ ${HAS_IO}@dirrm ${RUBY_LIBDIR}/io
 @dirrm ${RUBY_EXAMPLESDIR}/testunit
 @dirrm ${RUBY_EXAMPLESDIR}/webrick
 @dirrm ${RUBY_EXAMPLESDIR}
+@dirrm ${RUBY_SITERIDIR}
+@dirrm ${RUBY_BASERIDIR}
+@dirrm ${RUBY_RIDIR}
diff --git a/lang/ruby18-base/options.mk b/lang/ruby18-base/options.mk
index e0b12744586..f2f8ea4bec0 100644
--- a/lang/ruby18-base/options.mk
+++ b/lang/ruby18-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/12/06 16:24:27 taca Exp $
+# $NetBSD: options.mk,v 1.2 2007/01/28 15:15:58 taca Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.ruby
 PKG_SUPPORTED_OPTIONS=		ruby-build-ri-db
@@ -7,5 +7,5 @@ PKG_SUPPORTED_OPTIONS=		ruby-build-ri-db
 
 .if !empty(PKG_OPTIONS:Mruby-build-ri-db)
 CONFIGURE_ARGS+=	--enable-install-doc
-RUBY_DYNAMIC_DIRS+=	${RUBY_RIDIR:S,${PREFIX}/,,}
+RUBY_DYNAMIC_DIRS+=	${RUBY_SYSRIDIR}
 .endif