--- a/components/ruby/ruby-19/Makefile Tue Jan 28 11:28:22 2014 -0800
+++ b/components/ruby/ruby-19/Makefile Wed Jan 29 13:42:59 2014 -0800
@@ -20,20 +20,20 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= ruby
COMPONENT_VERSION= 1.9.3
-COMPONENT_PATCH_VERSION= 448
+COMPONENT_PATCH_VERSION= 484
COMPONENT_PROJECT_URL= http://www.ruby-lang.org/
COMPONENT_SRC= \
$(COMPONENT_NAME)-$(COMPONENT_VERSION)-p$(COMPONENT_PATCH_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:2f35e186543a03bec5e603296d6d8828b94ca58bab049b67b1ceb61d381bc8a7
+ sha256:d684bc3a5ba72cda9ef30039f783c0f8cdc325bae5c8738c7bf05577cbe8f31d
COMPONENT_ARCHIVE_URL= \
http://ftp.ruby-lang.org/pub/ruby/1.9/$(COMPONENT_ARCHIVE)
IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
--- a/components/ruby/ruby-19/ruby-19-tk.p5m Tue Jan 28 11:28:22 2014 -0800
+++ b/components/ruby/ruby-19/ruby-19-tk.p5m Wed Jan 29 13:42:59 2014 -0800
@@ -18,21 +18,21 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
value=pkg:/runtime/ruby-19/ruby-tk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Ruby Tk libraries"
set name=com.oracle.info.description value="the Ruby 1.9 Tk libraries"
-set name=com.oracle.info.tpno value=12694
+set name=com.oracle.info.tpno value=15969
set name=info.classification \
value=org.opensolaris.category.2008:Development/Ruby
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/269
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+#
file \
path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/ruby/$(RUBY_LIB_VER)/$(MACH)-solaris$(SOLARIS_VERSION)/tcltklib.so
file \
@@ -688,6 +688,6 @@
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d9/dee/tkutil_8c_source.html
file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d19/structtcltkip.html
-
+#
license ruby-19.license \
license="Ruby License, GPLv2, LGPLv2.1, Artistic, BSD, PD, BSD-like, MIT, Unicode, MPL1.1"
--- a/components/ruby/ruby-19/ruby-19.p5m Tue Jan 28 11:28:22 2014 -0800
+++ b/components/ruby/ruby-19/ruby-19.p5m Wed Jan 29 13:42:59 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,14 +26,14 @@
value=pkg:/runtime/ruby-19@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Ruby, RubyGems, and Rake"
set name=com.oracle.info.description value="Ruby, including RubyGems and Rake"
-set name=com.oracle.info.tpno value=12694
+set name=com.oracle.info.tpno value=15969
set name=info.classification \
value=org.opensolaris.category.2008:Development/Ruby
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/269
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+#
dir path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/ruby/gems/$(RUBY_LIB_VER)/cache
dir path=usr/ruby/$(RUBY_VER)/lib/$(MACH64)/ruby/gems/$(RUBY_LIB_VER)/doc
dir \
@@ -2980,7 +2980,7 @@
dir path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/df/df8
dir path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/df/dfe
dir path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/df/dff
-
+#
file path=usr/ruby/$(RUBY_VER)/bin/erb
file path=usr/ruby/$(RUBY_VER)/bin/gem
file path=usr/ruby/$(RUBY_VER)/bin/irb
@@ -4609,6 +4609,10 @@
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/ddc/openssl__missing_8h__dep__incl.png
file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/ddd/structst__table.html
+file \
+ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de0/ruby-1_89_83-p484_2transdb_8h.html
+file \
+ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de0/ruby-1_89_83-p484_2transdb_8h_source.html
file path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de1/object_8c.html
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d0/de1/object_8c_source.html
@@ -5758,10 +5762,6 @@
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/df3/constants_8c_source.html
file \
- path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/df4/ruby-1_89_83-p448_2transdb_8h.html
-file \
- path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/df4/ruby-1_89_83-p448_2transdb_8h_source.html
-file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/df4/structolemethoddata.html
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d4/dfa/struct_qtfr_node.html
@@ -6023,10 +6023,6 @@
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d5/dc1/iso__8859__4_8c_source.html
file \
- path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d5/dc5/ruby-1_89_83-p448_2encdb_8h.html
-file \
- path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d5/dc5/ruby-1_89_83-p448_2encdb_8h_source.html
-file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d5/dc5/rubysig_8h__dep__incl.map
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/d5/dc5/rubysig_8h__dep__incl.md5
@@ -7608,6 +7604,10 @@
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3c/ossl__pkey_8h_source.html
file \
+ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3d/ruby-1_89_83-p484_2encdb_8h.html
+file \
+ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3d/ruby-1_89_83-p484_2encdb_8h_source.html
+file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d3f/structnkf__state__t.html
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/db/d41/struct__syck__parser.html
@@ -7899,6 +7899,8 @@
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d57/pathname_2extconf_8h_source.html
file \
+ path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d57/structbufread__arg.html
+file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d5d/emoji__sjis__docomo_8c__incl.map
file \
path=usr/ruby/$(RUBY_VER)/share/doc/ruby/html/dc/d5d/emoji__sjis__docomo_8c__incl.md5
@@ -35234,10 +35236,10 @@
file path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/created.rid
file \
path=usr/ruby/$(RUBY_VER)/share/ri/$(RUBY_LIB_VER)/system/fatal/cdesc-fatal.ri
-
+#
license ruby-19.license \
license="Ruby License, GPLv2, LGPLv2.1, Artistic, BSD, PD, BSD-like, MIT, Unicode, MPL1.1"
-
+#
link path=usr/bin/erb mediator=ruby mediator-version=1.9 target=./erb19
link path=usr/bin/erb19 target=../ruby/$(RUBY_VER)/bin/erb
link path=usr/bin/gem mediator=ruby mediator-version=1.9 target=./gem19