CVS commit: pkgsrc/lang/ruby

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue May 30 15:47:52 UTC 2017

Modified Files:
        pkgsrc/lang/ruby: Makefile

Log Message:
* Replace RUBY_VERSION_FULL with RUBY_VERSION since there is no
  RUBY_VERSION_FULL contains Ruby's patchlevel.
* Remove ruby18 specific code.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/lang/ruby/Makefile

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

Modified files:

Index: pkgsrc/lang/ruby/Makefile
diff -u pkgsrc/lang/ruby/Makefile:1.62 pkgsrc/lang/ruby/Makefile:1.63
--- pkgsrc/lang/ruby/Makefile:1.62      Tue May 30 14:22:40 2017
+++ pkgsrc/lang/ruby/Makefile   Tue May 30 15:47:51 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2017/05/30 14:22:40 taca Exp $
+# $NetBSD: Makefile,v 1.63 2017/05/30 15:47:51 taca Exp $
 
 DISTNAME=      # empty
-PKGNAME=       ruby-${RUBY_VERSION_FULL}
+PKGNAME=       ruby-${RUBY_VERSION}
 CATEGORIES=    lang ruby
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -19,12 +19,7 @@ NO_BUILD=    yes
 
 DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
-RUBY_COMMANDS= erb irb ruby testrb
-.if ${RUBY_VER} == "18"
-RUBY_COMMANDS+=        h2rb
-.else
-RUBY_COMMANDS+=        gem rake
-.endif
+RUBY_COMMANDS= erb gem irb rake ruby testrb
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 CHECK_INTERPRETER_SKIP=        bin/* ${PKGMANDIR}/man1/ruby.1