21234701 graphviz should no longer deliver Ruby 1.9 bindings
authorApril Chin <april.chin@oracle.com>
Wed, 09 Dec 2015 15:27:40 -0800
changeset 5177 eb02f7b13b81
parent 5176 6ed69e0ee716
child 5178 39289ddbd44e
21234701 graphviz should no longer deliver Ruby 1.9 bindings
components/graphviz/Makefile
components/graphviz/graphviz-ruby.p5m
components/graphviz/graphviz.p5m
make-rules/shared-macros.mk
--- a/components/graphviz/Makefile	Sat Dec 05 08:44:07 2015 -0800
+++ b/components/graphviz/Makefile	Wed Dec 09 15:27:40 2015 -0800
@@ -70,7 +70,7 @@
 $(CONFIGURE_32): CONFIGURE_OPTIONS +=	--enable-ruby=no
 $(CONFIGURE_32): CONFIGURE_OPTIONS +=	--enable-php=no
 $(CONFIGURE_64): CONFIGURE_ENV +=	PERL=$(PERL)
-$(CONFIGURE_64): CONFIGURE_ENV +=	RUBY=$(RUBY.1.9)
+$(CONFIGURE_64): CONFIGURE_ENV +=	RUBY=$(RUBY.2.1)
 $(INSTALL_64): COMPONENT_INSTALL_ARGS += PHP_INSTALL_DIR=$(shell PATH=$(PATH) php-config --extension-dir)
 # tcl ships both 32 and 64 bit, but even though /usr/bin/tclsh is 64-bit, there
 # is no place to stick 64-bit modules, so skip it.  On the other hand, make
@@ -125,7 +125,7 @@
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += runtime/ocaml
 REQUIRED_PACKAGES += runtime/perl-520
-REQUIRED_PACKAGES += runtime/ruby-19
+REQUIRED_PACKAGES += runtime/ruby-21
 REQUIRED_PACKAGES += runtime/tk-8
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
--- a/components/graphviz/graphviz-ruby.p5m	Sat Dec 05 08:44:07 2015 -0800
+++ b/components/graphviz/graphviz-ruby.p5m	Wed Dec 09 15:27:40 2015 -0800
@@ -36,7 +36,7 @@
 link path=usr/lib/$(MACH64)/graphviz/ruby/gv.so target=libgv_ruby.so
 file path=usr/lib/$(MACH64)/graphviz/ruby/libgv_ruby.so
 link \
-    path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/$(MACH64)-solaris$(SOLARIS_VERSION)/gv.so \
+    path=usr/ruby/2.1/lib/ruby/vendor_ruby/2.1.0/$(MACH64)-solaris$(SOLARIS_VERSION)/gv.so \
     target=../../../../../../../lib/$(MACH64)/graphviz/ruby/libgv_ruby.so
 file path=usr/share/graphviz/demo/modgraph.rb
 file usr/share/man/man3/gv.3ruby path=usr/share/man/man3/gv-ruby.3
--- a/components/graphviz/graphviz.p5m	Sat Dec 05 08:44:07 2015 -0800
+++ b/components/graphviz/graphviz.p5m	Wed Dec 09 15:27:40 2015 -0800
@@ -533,7 +533,7 @@
     predicate=runtime/python-27
 depend type=conditional \
     fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
-    predicate=runtime/ruby-19
+    predicate=runtime/ruby-21
 depend type=conditional \
     fmri=image/graphviz/[email protected]$(IPS_COMPONENT_VERSION) \
     predicate=runtime/tcl-8
--- a/make-rules/shared-macros.mk	Sat Dec 05 08:44:07 2015 -0800
+++ b/make-rules/shared-macros.mk	Wed Dec 09 15:27:40 2015 -0800
@@ -491,8 +491,8 @@
 
 RUBY_VERSION =	1.9
 RUBY_LIB_VERSION =	1.9.1
-RUBY.1.8 =	/usr/ruby/1.8/bin/ruby
 RUBY.1.9 =	/usr/ruby/1.9/bin/ruby
+RUBY.2.1 =	/usr/ruby/2.1/bin/ruby
 RUBY =		$(RUBY.$(RUBY_VERSION))
 # Use the ruby lib versions to represent the RUBY_VERSIONS that
 # need to get built.  This is done because during package transformations