[pkgsrc/trunk]: pkgsrc/lang/ruby - Handle patchlevel which has introduced to ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/54a00c8f6b5c
branches:  trunk
changeset: 522265:54a00c8f6b5c
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Dec 06 16:17:17 2006 +0000

description:
- Handle patchlevel which has introduced to Ruby.
- Introduce RUBY_PATCH_DATE and RUBY_VERSION_SUFFIX.
- Change _RUBY_VERS_TEENY to _RUBY_VER_TEENY as other version variable
  like RUBY_VER_MAJOR.

diffstat:

 lang/ruby/rubyversion.mk |  29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r edbfd1f7265d -r 54a00c8f6b5c lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Wed Dec 06 15:42:30 2006 +0000
+++ b/lang/ruby/rubyversion.mk  Wed Dec 06 16:17:17 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.28 2006/10/06 05:05:13 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.29 2006/12/06 16:17:17 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -7,9 +7,9 @@
 .include "../../mk/bsd.prefs.mk"
 
 # current supported Ruby's version
-RUBY18_VERSION?=       1.8.5
+RUBY18_VERSION=                1.8.5
 
-#
+# patch date
 RUBY18_PATCH_DATE=     20060906
 
 # RUBY_VERSION_DEFAULT defines default version for Ruby related
@@ -23,11 +23,12 @@
 #
 #      Default value is set to ${RUBY_VERSION_DEFAULT}
 #
-.if !defined(RUBY_VERSION)
 .if ${RUBY_VERSION_DEFAULT} == "1.8"
 RUBY_VERSION?=         ${RUBY18_VERSION}
+RUBY_PATCH_DATE?=      ${RUBY18_PATCH_DATE}
 .endif
-.endif
+
+RUBY_VERSION_SUFFIX=   ${RUBY_VERSION}.${RUBY_PATCH_DATE}
 
 # RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is
 #      supported by the package.  It should be defined by the packages
@@ -50,13 +51,15 @@
 #
 RUBY_NOVERSION?=       No
 
-# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VERS_TEENY is defined from
-#      version of Ruby.  It could be used in packages' Makefile but
-#      it isn't recommended.
+# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL
+# is defined from version of Ruby.  It should not be used in packages'
+# Makefile.
 #
-_RUBY_VER_MAJOR=       ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
-_RUBY_VER_MINOR=       ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
-_RUBY_VERS_TEENY=      ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RUBY_VER=             ${RUBY_VERSION:C/(-.*)//}
+_RUBY_VER_MAJOR=       ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
+_RUBY_VER_MINOR=       ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
+_RUBY_VER_TEENY=       ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RUBY_PATCHLEVEL=      ${RUBY_VERSION:C/(.*-)//}
 
 # RUBY_VER defines Ruby base release.
 #
@@ -128,13 +131,13 @@
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
 RUBY_SHLIBMAJOR=       ${RUBY_VER}
-RUBY_SHLIBVER=         ${RUBY_VER}.${_RUBY_VERS_TEENY}
+RUBY_SHLIBVER=         ${RUBY_VER}.${_RUBY_VER_TEENY}
 .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 RUBY_SHLIBMAJOR=       # unused
 RUBY_SHLIBVER=         ${RUBY_VER}
 .elif ${OPSYS} == "OpenBSD"
 RUBY_SHLIBMAJOR=       # unused
-RUBY_SHLIBVER=         ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VERS_TEENY}
+RUBY_SHLIBVER=         ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
 .elif ${OPSYS} == "IRIX"
 RUBY_SHLIBMAJOR=       # unused
 .elif ${OPSYS} == "Linux"