[pkgsrc/trunk]: pkgsrc/lang/ruby Don't set to DIST_SUBDIR to ruby here.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cba36e6016b7
branches:  trunk
changeset: 501069:cba36e6016b7
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Oct 16 15:09:01 2005 +0000

description:
Don't set to DIST_SUBDIR to ruby here.

o Change DIST_SUBDIR handling; introduce USE_RUBY_DIST_SUBDIR and set
  DIST_SUBDIR if USE_RUBY_DIST_SUBDIR is defined to /[yY][eE][sS]/.
o Add more macros to replace in FILES_SUBST, MESSAGE_SUBST and PLIST_SUBST.

diffstat:

 lang/ruby/rubyversion.mk |  26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diffs (51 lines):

diff -r 4ea9d497e845 -r cba36e6016b7 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Sun Oct 16 15:05:45 2005 +0000
+++ b/lang/ruby/rubyversion.mk  Sun Oct 16 15:09:01 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.13 2005/09/11 15:54:22 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.14 2005/10/16 15:09:01 taca Exp $
 #
 
 .ifndef _RUBYVERSION_MK
@@ -183,15 +183,11 @@
 RUBY_EXAMPLESDIR?=     ${LOCALBASE}/share/examples/${RUBY_NAME}
 
 #
-# make ruby based packages' distfiles to one place.
-#
-RUBY_DIST_SUBDIR?=     ruby
-
+# set ruby reletaed package to common DIST_SUBDIR
 #
-# make ruby reletaed package to common DIST_SUBDIR
-#
-.if !empty(RUBY_DIST_SUBDIR)
-DIST_SUBDIR?=  ${RUBY_DIST_SUBDIR}
+_RUBY_DIST_SUBDIR?=    ruby
+.if defined(USE_RUBY_DIST_SUBDIR) && !empty(USE_RUBY_DIST_SUBDIR:M[yY][eE][sS])
+DIST_SUBDIR?=          ${_RUBY_DIST_SUBDIR}
 .endif
 
 #
@@ -211,12 +207,18 @@
                        RUBY_EXAMPLESDIR="${RUBY_EXAMPLESDIR}" \
                        RUBY_DLEXT="${RUBY_DLEXT}"
 
+#
+# substitutions
+#
+FILES_SUBST+=          RUBY_NAME="${RUBY_NAME}" RUBY_VER="${RUBY_VER}"
+
+MESSAGE_SUBST+=                RUBY_VER="${RUBY_VER}" \
+                       RUBY_VERSION="${RUBY_VERSION}" \
+                       ${PLIST_RUBY_DIRS:S,DIR="${LOCALBASE}/,DIR=",}
+
 PLIST_SUBST+=          RUBY_VER="${RUBY_VER}" \
                        RUBY_VERSION="${RUBY_VERSION}" \
                        RUBY_VER_DIR="${RUBY_VER_DIR}" \
                        ${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