[pkgsrc/trunk]: pkgsrc/lang/ruby Some clean up along with introducing ruby16-...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0dbbc2e99215
branches:  trunk
changeset: 490252:0dbbc2e99215
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Mar 06 16:42:30 2005 +0000

description:
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.

diffstat:

 lang/ruby/Makefile.common |  44 ++------------------------------------------
 lang/ruby/rubyversion.mk  |  45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 45 deletions(-)

diffs (159 lines):

diff -r 3071ef1ce513 -r 0dbbc2e99215 lang/ruby/Makefile.common
--- a/lang/ruby/Makefile.common Sun Mar 06 16:36:56 2005 +0000
+++ b/lang/ruby/Makefile.common Sun Mar 06 16:42:30 2005 +0000
@@ -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 @@
 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 @@
 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 @@
 .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"
diff -r 3071ef1ce513 -r 0dbbc2e99215 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Sun Mar 06 16:36:56 2005 +0000
+++ b/lang/ruby/rubyversion.mk  Sun Mar 06 16:42:30 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.9 2005/01/28 13:51:24 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.10 2005/03/06 16:42:30 taca Exp $
 #
 
 .ifndef _RUBYVERSION_MK
@@ -91,6 +91,10 @@
 #
 RUBY_NAME?=            ruby${RUBY_SUFFIX}
 
+# RUBY_BASE is base of ruby package's name
+#
+RUBY_BASE=             ruby${RUBY_VER}-base
+
 # RUBY_PKGPREFIX is prefix part for ruby based packages.
 #
 RUBY_PKGPREFIX?=       ${RUBY_NAME}
@@ -128,6 +132,33 @@
 .endif
 
 #
+# 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
+
+#
 # RUBY_DLEXT is suffix of extention library.
 #
 .if ${OPSYS} == "Darwin"
@@ -137,6 +168,11 @@
 .endif
 
 #
+# source directory
+#
+RUBY_SRCDIR?=  ${_PKGSRC_TOPDIR}/lang/${RUBY_BASE}
+
+#
 # common PATH
 #
 RUBY_LIBDIR?=          ${LOCALBASE}/lib/ruby/${RUBY_VER_DIR}
@@ -154,8 +190,9 @@
 #
 # MAKE_ENV
 #
-MAKEFLAGS+=            RUBY_VER=${RUBY_VER}
-
+MAKEFLAGS+=            RUBY_VER="${RUBY_VER}" \
+                       RUBY_VERSION="${RUBY_VERSION}" \
+                       X11BASE="${X11BASE}"
 #
 # PLIST
 #
@@ -168,8 +205,10 @@
                        RUBY_DLEXT="${RUBY_DLEXT}"
 
 PLIST_SUBST+=          RUBY_VER="${RUBY_VER}" \
+                       RUBY_VERSION="${RUBY_VERSION}" \
                        ${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
 MESSAGE_SUBST+=                RUBY_VER="${RUBY_VER}" \
+                       RUBY_VERSION="${RUBY_VERSION}" \
                        ${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
 
 .endif # _RUBY_MK