- Update to RUBY18_VERSION to 1.8.3.

- Replace LOCALBASE with PREFIX.
- Add RUBY_RIDIR, RUBY_BASERIDIR, RUBY_SYSRIDIR and RUBY_SITERIDIR
  for document data directories of RI.
- Add RUBY_VERSION and RUBY_VERSION_DEFAULT to MAKEFLAGS.
- More Ruby related variables to substitution variables.
- Don't set RUBY_VERSION_DEFAULT if it is already defined.

1 files changed, 32 insertions, 20 deletions

diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index a82113a7879..cfc30e7063d 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.14 2005/10/16 15:09:01 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.15 2005/11/02 08:56:17 taca Exp $
 #
 
 .ifndef _RUBYVERSION_MK
@@ -8,10 +8,7 @@ _RUBYVERSION_MK=	# defined
 
 # current supported Ruby's version
 RUBY16_VERSION?=	1.6.8
-RUBY18_VERSION?=	1.8.2
-
-# default Ruby packages
-RUBY_VER_DEFAULT=	18
+RUBY18_VERSION?=	1.8.3
 
 # RUBY_VERSION_DEFAULT defines default version for Ruby related
 #	packages and user can define in mk.conf.  (1.6 or 1.8)
@@ -119,8 +116,8 @@ RUBY_NAME=		ruby
 
 # RUBY related command's full pathname.
 #
-RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
-RDOC?=			${LOCALBASE}/bin/rdoc${RUBY_VER}
+RUBY?=			${PREFIX}/bin/${RUBY_NAME}
+RDOC?=			${PREFIX}/bin/rdoc${RUBY_VER}
 
 #
 # RUBY_ARCH is used architecture depended direcotry name.
@@ -175,12 +172,16 @@ RUBY_SRCDIR?=	${_PKGSRC_TOPDIR}/lang/${RUBY_BASE}
 #
 # common PATH
 #
-RUBY_LIBDIR?=		${LOCALBASE}/lib/ruby/${RUBY_VER_DIR}
+RUBY_LIBDIR?=		${PREFIX}/lib/ruby/${RUBY_VER_DIR}
 RUBY_ARCHLIBDIR?=	${RUBY_LIBDIR}/${RUBY_ARCH}
-RUBY_SITELIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER_DIR}
+RUBY_SITELIBDIR?=	${PREFIX}/lib/ruby/site_ruby/${RUBY_VER_DIR}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
-RUBY_DOCDIR?=		${LOCALBASE}/share/doc/${RUBY_NAME}
-RUBY_EXAMPLESDIR?=	${LOCALBASE}/share/examples/${RUBY_NAME}
+RUBY_DOCDIR?=		${PREFIX}/share/doc/${RUBY_NAME}
+RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/${RUBY_NAME}
+RUBY_RIDIR?=		${PREFIX}/share/ri
+RUBY_BASERIDIR?=	${RUBY_RIDIR}/${RUBY_VER_DIR}
+RUBY_SYSRIDIR?=		${RUBY_BASERIDIR}/system
+RUBY_SITERIDIR?=	${RUBY_BASERIDIR}/site
 
 #
 # set ruby reletaed package to common DIST_SUBDIR
@@ -193,10 +194,13 @@ DIST_SUBDIR?=		${_RUBY_DIST_SUBDIR}
 #
 # MAKE_ENV
 #
-MAKEFLAGS+=		RUBY_VER="${RUBY_VER}" \
+MAKE_ENV+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
 			RUBY_VERSION="${RUBY_VERSION}" \
-			X11BASE="${X11BASE}"
-#
+			RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}"
+
+MAKEFLAGS+=		RUBY_VERSION="${RUBY_VERSION}" \
+			RUBY_VERSION_DEFAULT="${RUBY_VERSION_DEFAULT}"
+
 # PLIST
 #
 PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
@@ -205,20 +209,28 @@ PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
 			RUBY_SITEARCHLIBDIR="${RUBY_SITEARCHLIBDIR}" \
 			RUBY_DOCDIR="${RUBY_DOCDIR}" \
 			RUBY_EXAMPLESDIR="${RUBY_EXAMPLESDIR}" \
-			RUBY_DLEXT="${RUBY_DLEXT}"
+			RUBY_RIDIR="${RUBY_RIDIR}" \
+			RUBY_BASERIDIR="${RUBY_BASERIDIR}" \
+			RUBY_SYSRIDIR="${RUBY_SYSRIDIR}" \
+			RUBY_SITERIDIR="${RUBY_SITERIDIR}"
 
 #
 # substitutions
 #
-FILES_SUBST+=		RUBY_NAME="${RUBY_NAME}" RUBY_VER="${RUBY_VER}"
+FILES_SUBST+=		RUBY="${RUBY}" RUBY_NAME="${RUBY_NAME}" \
+			RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
+			RUBY_VER="${RUBY_VER}" \
+			${PLIST_RUBY_DIRS}
 
-MESSAGE_SUBST+=		RUBY_VER="${RUBY_VER}" \
+MESSAGE_SUBST+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
 			RUBY_VERSION="${RUBY_VERSION}" \
-			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
+			RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
+			${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
 
-PLIST_SUBST+=		RUBY_VER="${RUBY_VER}" \
+PLIST_SUBST+=		RUBY="${RUBY}" RUBY_VER="${RUBY_VER}" \
 			RUBY_VERSION="${RUBY_VERSION}" \
 			RUBY_VER_DIR="${RUBY_VER_DIR}" \
-			${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
+			RUBY_DLEXT="${RUBY_DLEXT}" \
+			${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
 
 .endif # _RUBY_MK