diff options
author | minskim <minskim@pkgsrc.org> | 2008-02-09 06:18:27 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2008-02-09 06:18:27 +0000 |
commit | f3c83c6461104aea8350166ad2f65d11da14ef30 (patch) | |
tree | 9673abf80ee661c00599518a445ab1bff1a399b0 /devel | |
parent | d439d52988c68eaf44fa4c8176bc04f976ac11ef (diff) | |
download | pkgsrc-f3c83c6461104aea8350166ad2f65d11da14ef30.tar.gz |
Update ruby18-activesupport to 2.0.2.
There have been too many changes. Please see CHANGELOG for the complete list:
http://dev.rubyonrails.org/browser/tags/rel_2-0-2/activesupport/CHANGELOG?rev=8664
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ruby-activesupport/Makefile | 8 | ||||
-rw-r--r-- | devel/ruby-activesupport/PLIST | 85 | ||||
-rw-r--r-- | devel/ruby-activesupport/distinfo | 12 | ||||
-rw-r--r-- | devel/ruby-activesupport/patches/patch-aa | 19 | ||||
-rw-r--r-- | devel/ruby-activesupport/patches/patch-ab | 24 |
5 files changed, 122 insertions, 26 deletions
diff --git a/devel/ruby-activesupport/Makefile b/devel/ruby-activesupport/Makefile index 9d300652082..06fe30d0d1f 100644 --- a/devel/ruby-activesupport/Makefile +++ b/devel/ruby-activesupport/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2007/10/16 02:56:02 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2008/02/09 06:18:27 minskim Exp $ -DISTNAME= activesupport-1.4.4 +DISTNAME= activesupport-2.0.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= devel ruby -MASTER_SITES= http://rubyforge.org/frs/download.php/26548/ +MASTER_SITES= http://rubyforge.org/frs/download.php/29345/ EXTRACT_SUFX= .tgz MAINTAINER= minskim@NetBSD.org @@ -16,7 +16,7 @@ NO_CONFIGURE= yes .include "../../lang/ruby/modules.mk" pre-install: - ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f + ${FIND} ${WRKSRC} -name \*.orig -exec ${RM} -f {} \; do-install: ${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR} diff --git a/devel/ruby-activesupport/PLIST b/devel/ruby-activesupport/PLIST index 078126db4d4..d30b4316056 100644 --- a/devel/ruby-activesupport/PLIST +++ b/devel/ruby-activesupport/PLIST @@ -1,44 +1,60 @@ -@comment $NetBSD: PLIST,v 1.8 2007/03/17 10:59:26 minskim Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/02/09 06:18:27 minskim Exp $ ${RUBY_SITELIBDIR}/active_support.rb -${RUBY_SITELIBDIR}/active_support/binding_of_caller.rb -${RUBY_SITELIBDIR}/active_support/breakpoint.rb -${RUBY_SITELIBDIR}/active_support/caching_tools.rb +${RUBY_SITELIBDIR}/active_support/basic_object.rb +${RUBY_SITELIBDIR}/active_support/buffered_logger.rb ${RUBY_SITELIBDIR}/active_support/clean_logger.rb ${RUBY_SITELIBDIR}/active_support/core_ext.rb ${RUBY_SITELIBDIR}/active_support/core_ext/array.rb +${RUBY_SITELIBDIR}/active_support/core_ext/array/access.rb ${RUBY_SITELIBDIR}/active_support/core_ext/array/conversions.rb +${RUBY_SITELIBDIR}/active_support/core_ext/array/extract_options.rb ${RUBY_SITELIBDIR}/active_support/core_ext/array/grouping.rb +${RUBY_SITELIBDIR}/active_support/core_ext/array/random_access.rb ${RUBY_SITELIBDIR}/active_support/core_ext/bigdecimal.rb -${RUBY_SITELIBDIR}/active_support/core_ext/bigdecimal/formatting.rb +${RUBY_SITELIBDIR}/active_support/core_ext/bigdecimal/conversions.rb ${RUBY_SITELIBDIR}/active_support/core_ext/blank.rb ${RUBY_SITELIBDIR}/active_support/core_ext/cgi.rb ${RUBY_SITELIBDIR}/active_support/core_ext/cgi/escape_skipping_slashes.rb ${RUBY_SITELIBDIR}/active_support/core_ext/class.rb ${RUBY_SITELIBDIR}/active_support/core_ext/class/attribute_accessors.rb +${RUBY_SITELIBDIR}/active_support/core_ext/class/delegating_attributes.rb ${RUBY_SITELIBDIR}/active_support/core_ext/class/inheritable_attributes.rb ${RUBY_SITELIBDIR}/active_support/core_ext/class/removal.rb ${RUBY_SITELIBDIR}/active_support/core_ext/date.rb +${RUBY_SITELIBDIR}/active_support/core_ext/date/behavior.rb +${RUBY_SITELIBDIR}/active_support/core_ext/date/calculations.rb ${RUBY_SITELIBDIR}/active_support/core_ext/date/conversions.rb +${RUBY_SITELIBDIR}/active_support/core_ext/date_time.rb +${RUBY_SITELIBDIR}/active_support/core_ext/date_time/calculations.rb +${RUBY_SITELIBDIR}/active_support/core_ext/date_time/conversions.rb +${RUBY_SITELIBDIR}/active_support/core_ext/duplicable.rb ${RUBY_SITELIBDIR}/active_support/core_ext/enumerable.rb ${RUBY_SITELIBDIR}/active_support/core_ext/exception.rb +${RUBY_SITELIBDIR}/active_support/core_ext/file.rb +${RUBY_SITELIBDIR}/active_support/core_ext/float.rb +${RUBY_SITELIBDIR}/active_support/core_ext/float/rounding.rb ${RUBY_SITELIBDIR}/active_support/core_ext/hash.rb ${RUBY_SITELIBDIR}/active_support/core_ext/hash/conversions.rb ${RUBY_SITELIBDIR}/active_support/core_ext/hash/diff.rb +${RUBY_SITELIBDIR}/active_support/core_ext/hash/except.rb ${RUBY_SITELIBDIR}/active_support/core_ext/hash/indifferent_access.rb ${RUBY_SITELIBDIR}/active_support/core_ext/hash/keys.rb ${RUBY_SITELIBDIR}/active_support/core_ext/hash/reverse_merge.rb +${RUBY_SITELIBDIR}/active_support/core_ext/hash/slice.rb ${RUBY_SITELIBDIR}/active_support/core_ext/integer.rb ${RUBY_SITELIBDIR}/active_support/core_ext/integer/even_odd.rb ${RUBY_SITELIBDIR}/active_support/core_ext/integer/inflections.rb ${RUBY_SITELIBDIR}/active_support/core_ext/kernel.rb ${RUBY_SITELIBDIR}/active_support/core_ext/kernel/agnostics.rb ${RUBY_SITELIBDIR}/active_support/core_ext/kernel/daemonizing.rb +${RUBY_SITELIBDIR}/active_support/core_ext/kernel/debugger.rb ${RUBY_SITELIBDIR}/active_support/core_ext/kernel/reporting.rb ${RUBY_SITELIBDIR}/active_support/core_ext/kernel/requires.rb ${RUBY_SITELIBDIR}/active_support/core_ext/load_error.rb ${RUBY_SITELIBDIR}/active_support/core_ext/logger.rb ${RUBY_SITELIBDIR}/active_support/core_ext/module.rb ${RUBY_SITELIBDIR}/active_support/core_ext/module/aliasing.rb +${RUBY_SITELIBDIR}/active_support/core_ext/module/attr_accessor_with_default.rb ${RUBY_SITELIBDIR}/active_support/core_ext/module/attr_internal.rb ${RUBY_SITELIBDIR}/active_support/core_ext/module/attribute_accessors.rb ${RUBY_SITELIBDIR}/active_support/core_ext/module/delegation.rb @@ -50,13 +66,18 @@ ${RUBY_SITELIBDIR}/active_support/core_ext/numeric.rb ${RUBY_SITELIBDIR}/active_support/core_ext/numeric/bytes.rb ${RUBY_SITELIBDIR}/active_support/core_ext/numeric/time.rb ${RUBY_SITELIBDIR}/active_support/core_ext/object.rb +${RUBY_SITELIBDIR}/active_support/core_ext/object/conversions.rb ${RUBY_SITELIBDIR}/active_support/core_ext/object/extending.rb +${RUBY_SITELIBDIR}/active_support/core_ext/object/instance_variables.rb ${RUBY_SITELIBDIR}/active_support/core_ext/object/misc.rb ${RUBY_SITELIBDIR}/active_support/core_ext/pathname.rb ${RUBY_SITELIBDIR}/active_support/core_ext/pathname/clean_within.rb ${RUBY_SITELIBDIR}/active_support/core_ext/proc.rb ${RUBY_SITELIBDIR}/active_support/core_ext/range.rb +${RUBY_SITELIBDIR}/active_support/core_ext/range/blockless_step.rb ${RUBY_SITELIBDIR}/active_support/core_ext/range/conversions.rb +${RUBY_SITELIBDIR}/active_support/core_ext/range/include_range.rb +${RUBY_SITELIBDIR}/active_support/core_ext/range/overlaps.rb ${RUBY_SITELIBDIR}/active_support/core_ext/string.rb ${RUBY_SITELIBDIR}/active_support/core_ext/string/access.rb ${RUBY_SITELIBDIR}/active_support/core_ext/string/conversions.rb @@ -64,17 +85,36 @@ ${RUBY_SITELIBDIR}/active_support/core_ext/string/inflections.rb ${RUBY_SITELIBDIR}/active_support/core_ext/string/iterators.rb ${RUBY_SITELIBDIR}/active_support/core_ext/string/starts_ends_with.rb ${RUBY_SITELIBDIR}/active_support/core_ext/string/unicode.rb +${RUBY_SITELIBDIR}/active_support/core_ext/string/xchar.rb ${RUBY_SITELIBDIR}/active_support/core_ext/symbol.rb +${RUBY_SITELIBDIR}/active_support/core_ext/test.rb +${RUBY_SITELIBDIR}/active_support/core_ext/test/unit/assertions.rb ${RUBY_SITELIBDIR}/active_support/core_ext/time.rb +${RUBY_SITELIBDIR}/active_support/core_ext/time/behavior.rb ${RUBY_SITELIBDIR}/active_support/core_ext/time/calculations.rb ${RUBY_SITELIBDIR}/active_support/core_ext/time/conversions.rb ${RUBY_SITELIBDIR}/active_support/dependencies.rb ${RUBY_SITELIBDIR}/active_support/deprecation.rb +${RUBY_SITELIBDIR}/active_support/duration.rb ${RUBY_SITELIBDIR}/active_support/inflections.rb ${RUBY_SITELIBDIR}/active_support/inflector.rb ${RUBY_SITELIBDIR}/active_support/json.rb -${RUBY_SITELIBDIR}/active_support/json/encoders.rb -${RUBY_SITELIBDIR}/active_support/json/encoders/core.rb +${RUBY_SITELIBDIR}/active_support/json/decoding.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/date.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/date_time.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/enumerable.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/false_class.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/hash.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/nil_class.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/numeric.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/object.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/regexp.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/string.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/symbol.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/time.rb +${RUBY_SITELIBDIR}/active_support/json/encoders/true_class.rb +${RUBY_SITELIBDIR}/active_support/json/encoding.rb +${RUBY_SITELIBDIR}/active_support/json/variable.rb ${RUBY_SITELIBDIR}/active_support/multibyte.rb ${RUBY_SITELIBDIR}/active_support/multibyte/chars.rb ${RUBY_SITELIBDIR}/active_support/multibyte/generators/generate_tables.rb @@ -83,30 +123,41 @@ ${RUBY_SITELIBDIR}/active_support/multibyte/handlers/utf8_handler.rb ${RUBY_SITELIBDIR}/active_support/multibyte/handlers/utf8_handler_proc.rb ${RUBY_SITELIBDIR}/active_support/option_merger.rb ${RUBY_SITELIBDIR}/active_support/ordered_options.rb -${RUBY_SITELIBDIR}/active_support/reloadable.rb +${RUBY_SITELIBDIR}/active_support/test_case.rb +${RUBY_SITELIBDIR}/active_support/testing.rb +${RUBY_SITELIBDIR}/active_support/testing/default.rb ${RUBY_SITELIBDIR}/active_support/values/time_zone.rb ${RUBY_SITELIBDIR}/active_support/values/unicode_tables.dat -${RUBY_SITELIBDIR}/active_support/vendor/builder.rb -${RUBY_SITELIBDIR}/active_support/vendor/builder/blankslate.rb -${RUBY_SITELIBDIR}/active_support/vendor/builder/xchar.rb -${RUBY_SITELIBDIR}/active_support/vendor/builder/xmlbase.rb -${RUBY_SITELIBDIR}/active_support/vendor/builder/xmlevents.rb -${RUBY_SITELIBDIR}/active_support/vendor/builder/xmlmarkup.rb -${RUBY_SITELIBDIR}/active_support/vendor/xml_simple.rb +${RUBY_SITELIBDIR}/active_support/vendor.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/blankslate.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder/blankslate.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder/css.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder/xchar.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder/xmlbase.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder/xmlevents.rb +${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb +${RUBY_SITELIBDIR}/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb ${RUBY_SITELIBDIR}/active_support/version.rb ${RUBY_SITELIBDIR}/active_support/whiny_nil.rb +${RUBY_SITELIBDIR}/activesupport.rb ${RUBY_DOCDIR}/active_support/CHANGELOG ${RUBY_DOCDIR}/active_support/README @dirrm ${RUBY_DOCDIR}/active_support -@dirrm ${RUBY_SITELIBDIR}/active_support/vendor/builder +@dirrm ${RUBY_SITELIBDIR}/active_support/vendor/xml-simple-1.0.11 +@dirrm ${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2/builder +@dirrm ${RUBY_SITELIBDIR}/active_support/vendor/builder-2.1.2 @dirrm ${RUBY_SITELIBDIR}/active_support/vendor @dirrm ${RUBY_SITELIBDIR}/active_support/values +@dirrm ${RUBY_SITELIBDIR}/active_support/testing @dirrm ${RUBY_SITELIBDIR}/active_support/multibyte/handlers @dirrm ${RUBY_SITELIBDIR}/active_support/multibyte/generators @dirrm ${RUBY_SITELIBDIR}/active_support/multibyte @dirrm ${RUBY_SITELIBDIR}/active_support/json/encoders @dirrm ${RUBY_SITELIBDIR}/active_support/json @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/time +@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/test/unit +@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/test @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/string @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/range @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/pathname @@ -116,6 +167,8 @@ ${RUBY_DOCDIR}/active_support/README @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/kernel @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/integer @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/hash +@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/float +@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/date_time @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/date @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/class @dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/cgi diff --git a/devel/ruby-activesupport/distinfo b/devel/ruby-activesupport/distinfo index 85b7a7a8523..194c63e44ce 100644 --- a/devel/ruby-activesupport/distinfo +++ b/devel/ruby-activesupport/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2007/10/16 02:56:02 minskim Exp $ +$NetBSD: distinfo,v 1.11 2008/02/09 06:18:27 minskim Exp $ -SHA1 (activesupport-1.4.4.tgz) = d5676bc270329478d31baecc95f3a506a510b43f -RMD160 (activesupport-1.4.4.tgz) = 697258b8c491937c1b1d157723bbbd8d1717b8a2 -Size (activesupport-1.4.4.tgz) = 214299 bytes -SHA1 (patch-aa) = d49d9f6c9a1f1ef23cfdb6df0f35a9391cc6934d -SHA1 (patch-ab) = 25d4bf00f57e2708ac5af41383c1d13ff74a0c1d +SHA1 (activesupport-2.0.2.tgz) = 0314c7573b986c2e16a75a44987df3ae99891857 +RMD160 (activesupport-2.0.2.tgz) = 6eaa2684589a8d60825b4b6908fb3a12859663cc +Size (activesupport-2.0.2.tgz) = 233039 bytes +SHA1 (patch-aa) = e556174fdab57267f17852720216788715e78ccc +SHA1 (patch-ab) = e6cd938ae8095a7ecc839c6145829e62792fa7be diff --git a/devel/ruby-activesupport/patches/patch-aa b/devel/ruby-activesupport/patches/patch-aa new file mode 100644 index 00000000000..99ad0d0e890 --- /dev/null +++ b/devel/ruby-activesupport/patches/patch-aa @@ -0,0 +1,19 @@ +$NetBSD: patch-aa,v 1.3 2008/02/09 06:18:27 minskim Exp $ + +--- lib/active_support/vendor.rb.orig 2008-02-08 21:27:15.000000000 -0800 ++++ lib/active_support/vendor.rb +@@ -1,14 +1,7 @@ +-# Prefer gems to the bundled libs. +-require 'rubygems' +- + begin +- gem 'builder', '~> 2.1.2' +-rescue Gem::LoadError + $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" + end + + begin +- gem 'xml-simple', '~> 1.0.11' +-rescue Gem::LoadError + $:.unshift "#{File.dirname(__FILE__)}/vendor/xml-simple-1.0.11" + end diff --git a/devel/ruby-activesupport/patches/patch-ab b/devel/ruby-activesupport/patches/patch-ab new file mode 100644 index 00000000000..92e5892a97d --- /dev/null +++ b/devel/ruby-activesupport/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.3 2008/02/09 06:18:27 minskim Exp $ + +--- lib/active_support/core_ext/kernel/requires.rb.orig 2008-02-08 21:38:42.000000000 -0800 ++++ lib/active_support/core_ext/kernel/requires.rb +@@ -5,19 +5,6 @@ module Kernel + silence_warnings do + begin + require library_name +- rescue LoadError => cannot_require +- # 1. Requiring the module is unsuccessful, maybe it's a gem and nobody required rubygems yet. Try. +- begin +- require 'rubygems' +- rescue LoadError => rubygems_not_installed +- raise cannot_require +- end +- # 2. Rubygems is installed and loaded. Try to load the library again +- begin +- require library_name +- rescue LoadError => gem_not_installed +- raise cannot_require +- end + end + end + end |