Tue May 30 15:47:52 2017 UTC ()
* Replace RUBY_VERSION_FULL with RUBY_VERSION since there is no
  RUBY_VERSION_FULL contains Ruby's patchlevel.
* Remove ruby18 specific code.


(taca)
diff -r1.62 -r1.63 pkgsrc/lang/ruby/Makefile
cvs diff -r1.62 -r1.63 pkgsrc/lang/ruby/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ruby/Makefile 2017/05/30 14:22:40 1.62
+++ pkgsrc/lang/ruby/Makefile 2017/05/30 15:47:51 1.63
@@ -1,40 +1,35 @@ @@ -1,40 +1,35 @@
1# $NetBSD: Makefile,v 1.62 2017/05/30 14:22:40 taca Exp $ 1# $NetBSD: Makefile,v 1.63 2017/05/30 15:47:51 taca Exp $
2 2
3DISTNAME= # empty 3DISTNAME= # empty
4PKGNAME= ruby-${RUBY_VERSION_FULL} 4PKGNAME= ruby-${RUBY_VERSION}
5CATEGORIES= lang ruby 5CATEGORIES= lang ruby
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= taca@NetBSD.org 9MAINTAINER= taca@NetBSD.org
10HOMEPAGE= http://www.ruby-lang.org/en/ 10HOMEPAGE= http://www.ruby-lang.org/en/
11COMMENT= Wrapper package for Ruby programming language 11COMMENT= Wrapper package for Ruby programming language
12 12
13CONFLICTS= pkg_alternatives-[0-9]* 13CONFLICTS= pkg_alternatives-[0-9]*
14 14
15NO_CONFIGURE= yes 15NO_CONFIGURE= yes
16NO_BUILD= yes 16NO_BUILD= yes
17 17
18.include "../../lang/ruby/rubyversion.mk" 18.include "../../lang/ruby/rubyversion.mk"
19 19
20DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} 20DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
21 21
22RUBY_COMMANDS= erb irb ruby testrb 22RUBY_COMMANDS= erb gem irb rake ruby testrb
23.if ${RUBY_VER} == "18" 
24RUBY_COMMANDS+= h2rb 
25.else 
26RUBY_COMMANDS+= gem rake 
27.endif 
28 23
29INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
30CHECK_INTERPRETER_SKIP= bin/* ${PKGMANDIR}/man1/ruby.1 25CHECK_INTERPRETER_SKIP= bin/* ${PKGMANDIR}/man1/ruby.1
31 26
32.if ${RUBY_NAME} == "ruby" 27.if ${RUBY_NAME} == "ruby"
33GENERATE_PLIST+= ${ECHO} "@comment This plist intentionally left empty"; 28GENERATE_PLIST+= ${ECHO} "@comment This plist intentionally left empty";
34.else 29.else
35. for f in ${RUBY_COMMANDS} 30. for f in ${RUBY_COMMANDS}
36GENERATE_PLIST+= ${ECHO} bin/${f}; 31GENERATE_PLIST+= ${ECHO} bin/${f};
37. endfor 32. endfor
38GENERATE_PLIST+= ${ECHO} man/man1/ruby.1; 33GENERATE_PLIST+= ${ECHO} man/man1/ruby.1;
39.endif 34.endif
40 35