Some clean up along with introducing ruby16-base/ruby18-base and make

ruby16/ruby18 package to meta pacakge.

- Define RUBY_BASE to refer ruby16-base or ruby18-base name.
- Define RUBY_SRCDIR to refer ruby16-base/ruby18-base src directory.
- Move some definition from Makefile.comon to rubyversion.mk.
- Add X11BASE to CONFIGURE_ENV.
- Add RUBY_VERSION to MESSAGE_SUBST and PLIST_SUBST.

1 files changed, 2 insertions, 42 deletions

diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common
index b4dbcb49061..326e27c25c2 100644
--- a/lang/ruby/Makefile.common
+++ b/lang/ruby/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/02/21 15:25:36 taca Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/03/06 16:42:30 taca Exp $
 #
 # Ruby base distribution common definition
 
@@ -22,7 +22,7 @@ MASTER_SITE_RUBY?= \
 RUBY_SITE_SUBDIR?=	${RUBY_VER_DIR}
 
 # Ruby distribution
-RUBY_DISTINFO_FILE=	${.CURDIR}/../../lang/ruby${RUBY_VER}/distinfo
+RUBY_DISTINFO_FILE=	${RUBY_SRCDIR}/distinfo
 
 RUBY_HOMEPAGE=		http://www.ruby-lang.org/en/
 
@@ -34,33 +34,6 @@ STRIP?=			strip
 DIST_SUBDIR?=		${RUBY_DIST_SUBDIR}
 
 #
-# Ruby shared library version handling.
-#
-RUBY_SHLIBMAJOR?=	${_RUBY_VER_MAJOR}
-RUBY_SHLIBVER?=		${RUBY_VERSION}
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
-RUBY_SHLIBMAJOR=	${RUBY_VER}
-RUBY_SHLIBVER=		${RUBY_VER}.${_RUBY_VERS_TEENY}
-.elif ${OPSYS} == "FreeBSD"
-RUBY_SHLIBMAJOR=	# unused
-RUBY_SHLIBVER=		${_RUBY_VERS_TEENY}
-.elif ${OPSYS} == "OpenBSD"
-RUBY_SHLIBMAJOR=	# unused
-RUBY_SHLIBVER=		${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VERS_TEENY}
-.elif ${OPSYS} == "IRIX"
-RUBY_SHLIBMAJOR=	# unused
-.elif ${OPSYS} == "Linux"
-RUBY_SHLIBMAJOR=	${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}
-.endif
-
-.if empty(RUBY_SHLIBMAJOR)
-RUBY_NOSHLIBMAJOR=	"@comment "
-.else
-RUBY_NOSHLIBMAJOR=
-.endif
-
-#
 # PLIST substitution
 #
 PLIST_SUBST+=		RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
@@ -81,17 +54,4 @@ CONFIGURE_ARGS+=	--enable-pthread
 .endif
 .endif
 
-.if ${OPSYS} == "IRIX"
-# X11BASE, *not* X11PREFIX:  X11PREFIX == PREFIX, but we need to point
-# to the ABI-specific libraries
-CONFIGURE_ENV+=	X11BASE="${X11BASE}"
-.endif
-
-# XXX:	Ruby extconf shuld select native ndbm(3) or Berkley DB's
-#	ndbm(3) compatible support.
-#
-.if ${OPSYS} != "SunOS"
-BDB_ACCEPTED?=		db1
-.endif
-
 .include "replace.mk"