CVS commit: pkgsrc

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue May 30 15:46:22 UTC 2017

Modified Files:
        pkgsrc/databases/ruby-gdbm: Makefile
        pkgsrc/devel/ruby-mode: Makefile
        pkgsrc/devel/ruby-readline: Makefile
        pkgsrc/lang/ruby: Makefile.common
        pkgsrc/lang/ruby21: Makefile
        pkgsrc/lang/ruby21-base: Makefile
        pkgsrc/lang/ruby22: Makefile
        pkgsrc/lang/ruby22-base: Makefile
        pkgsrc/lang/ruby23: Makefile
        pkgsrc/lang/ruby23-base: Makefile

Log Message:
Replace RUBY_VERSION_FULL with RUBY_VERSION since there is no
RUBY_VERSION_FULL contains Ruby's patchlevel.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/ruby-gdbm/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/devel/ruby-mode/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/ruby-readline/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/ruby/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby21/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/ruby21-base/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ruby22/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/ruby22-base/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby23/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby23-base/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/ruby-gdbm/Makefile
diff -u pkgsrc/databases/ruby-gdbm/Makefile:1.32 pkgsrc/databases/ruby-gdbm/Makefile:1.33
--- pkgsrc/databases/ruby-gdbm/Makefile:1.32    Tue May 30 14:22:40 2017
+++ pkgsrc/databases/ruby-gdbm/Makefile Tue May 30 15:46:21 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2017/05/30 14:22:40 taca Exp $
+# $NetBSD: Makefile,v 1.33 2017/05/30 15:46:21 taca Exp $
 #
 
 DISTNAME=              ${RUBY_DISTNAME}
-PKGNAME=               ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
+PKGNAME=               ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION}
 RUBY_EXTNAME=          gdbm
 CATEGORIES=            databases ruby
 MASTER_SITES=          ${MASTER_SITE_RUBY}

Index: pkgsrc/devel/ruby-mode/Makefile
diff -u pkgsrc/devel/ruby-mode/Makefile:1.34 pkgsrc/devel/ruby-mode/Makefile:1.35
--- pkgsrc/devel/ruby-mode/Makefile:1.34        Thu Sep  8 15:19:17 2016
+++ pkgsrc/devel/ruby-mode/Makefile     Tue May 30 15:46:21 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2016/09/08 15:19:17 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2017/05/30 15:46:21 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
-PKGNAME=       ${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-mode-${RUBY_VERSION_FULL}
+PKGNAME=       ${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-mode-${RUBY_VERSION}
 CATEGORIES=    devel ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/devel/ruby-readline/Makefile
diff -u pkgsrc/devel/ruby-readline/Makefile:1.45 pkgsrc/devel/ruby-readline/Makefile:1.46
--- pkgsrc/devel/ruby-readline/Makefile:1.45    Tue May 30 14:19:51 2017
+++ pkgsrc/devel/ruby-readline/Makefile Tue May 30 15:46:21 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2017/05/30 14:19:51 taca Exp $
+# $NetBSD: Makefile,v 1.46 2017/05/30 15:46:21 taca Exp $
 #
 
 DISTNAME=              ${RUBY_DISTNAME}
-PKGNAME=               ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
+PKGNAME=               ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION}
 PKGREVISION=           1
 RUBY_EXTNAME=          readline
 CATEGORIES=            devel ruby

Index: pkgsrc/lang/ruby/Makefile.common
diff -u pkgsrc/lang/ruby/Makefile.common:1.33 pkgsrc/lang/ruby/Makefile.common:1.34
--- pkgsrc/lang/ruby/Makefile.common:1.33       Sun Apr 23 14:10:24 2017
+++ pkgsrc/lang/ruby/Makefile.common    Tue May 30 15:46:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2017/04/23 14:10:24 taca Exp $
+# $NetBSD: Makefile.common,v 1.34 2017/05/30 15:46:21 taca Exp $
 #
 # Ruby base distribution common definition
 # used by databases/ruby-gdbm/Makefile
@@ -55,7 +55,7 @@ PLIST_SUBST+=         RUBY_SHLIBVER=${RUBY_SHLI
 
 .if !empty(RUBY_EXTNAME)
 
-PKGNAME?=              ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
+PKGNAME?=              ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION}
 DISTINFO_FILE=         ${.CURDIR}/${RUBY_SRCDIR}/distinfo
 PATCHDIR=              ${.CURDIR}/${RUBY_SRCDIR}/patches
 do-patch:

Index: pkgsrc/lang/ruby21/Makefile
diff -u pkgsrc/lang/ruby21/Makefile:1.4 pkgsrc/lang/ruby21/Makefile:1.5
--- pkgsrc/lang/ruby21/Makefile:1.4     Thu Sep  8 15:19:18 2016
+++ pkgsrc/lang/ruby21/Makefile Tue May 30 15:46:21 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/09/08 15:19:18 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2017/05/30 15:46:21 taca Exp $
 #
 
 DISTNAME=      # empty
-PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION_FULL}
+PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Index: pkgsrc/lang/ruby21-base/Makefile
diff -u pkgsrc/lang/ruby21-base/Makefile:1.25 pkgsrc/lang/ruby21-base/Makefile:1.26
--- pkgsrc/lang/ruby21-base/Makefile:1.25       Sun Nov 13 15:14:20 2016
+++ pkgsrc/lang/ruby21-base/Makefile    Tue May 30 15:46:21 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2016/11/13 15:14:20 taca Exp $
+# $NetBSD: Makefile,v 1.26 2017/05/30 15:46:21 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
-PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby22/Makefile
diff -u pkgsrc/lang/ruby22/Makefile:1.4 pkgsrc/lang/ruby22/Makefile:1.5
--- pkgsrc/lang/ruby22/Makefile:1.4     Thu Sep  8 15:19:18 2016
+++ pkgsrc/lang/ruby22/Makefile Tue May 30 15:46:21 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/09/08 15:19:18 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2017/05/30 15:46:21 taca Exp $
 #
 
 DISTNAME=      # empty
-PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION_FULL}
+PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Index: pkgsrc/lang/ruby22-base/Makefile
diff -u pkgsrc/lang/ruby22-base/Makefile:1.16 pkgsrc/lang/ruby22-base/Makefile:1.17
--- pkgsrc/lang/ruby22-base/Makefile:1.16       Sun Nov 13 15:14:20 2016
+++ pkgsrc/lang/ruby22-base/Makefile    Tue May 30 15:46:21 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/11/13 15:14:20 taca Exp $
+# $NetBSD: Makefile,v 1.17 2017/05/30 15:46:21 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
-PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby23/Makefile
diff -u pkgsrc/lang/ruby23/Makefile:1.2 pkgsrc/lang/ruby23/Makefile:1.3
--- pkgsrc/lang/ruby23/Makefile:1.2     Thu Sep  8 15:19:18 2016
+++ pkgsrc/lang/ruby23/Makefile Tue May 30 15:46:22 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2016/09/08 15:19:18 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2017/05/30 15:46:22 taca Exp $
 #
 
 DISTNAME=      # empty
-PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION_FULL}
+PKGNAME=       ${RUBY_PKGPREFIX}-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Index: pkgsrc/lang/ruby23-base/Makefile
diff -u pkgsrc/lang/ruby23-base/Makefile:1.8 pkgsrc/lang/ruby23-base/Makefile:1.9
--- pkgsrc/lang/ruby23-base/Makefile:1.8        Sun Nov 13 15:14:20 2016
+++ pkgsrc/lang/ruby23-base/Makefile    Tue May 30 15:46:22 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2016/11/13 15:14:20 taca Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/30 15:46:22 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
-PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}