Install as a gem using the pkgsrc rubygem.mk framework instead of

directly into site_ruby.

5 files changed, 190 insertions, 254 deletions

diff --git a/devel/ruby-activesupport/Makefile b/devel/ruby-activesupport/Makefile
index 2f780a684c7..45328bf900a 100644
--- a/devel/ruby-activesupport/Makefile
+++ b/devel/ruby-activesupport/Makefile
@@ -1,37 +1,15 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 17:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/04 15:30:00 jlam Exp $
 
 DISTNAME=	activesupport-2.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/29345/
-EXTRACT_SUFX=	.tgz
+PKGREVISION=	1
+CATEGORIES=	devel
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/activesupport/
 COMMENT=	Collection of classes and extensions for Rails
 
-PKG_DESTDIR_SUPPORT=	destdir
-
-NO_BUILD=	yes
-NO_CONFIGURE=	yes
-
-.include "../../lang/ruby/modules.mk"
-
-pre-install:
-	${FIND} ${WRKSRC} -name \*.orig -exec ${RM} -f {} \;
-
-do-install:
-	${INSTALL_LIB_DIR} ${DESTDIR}${RUBY_SITELIBDIR}
-	${CP} -R ${WRKSRC}/lib/* ${DESTDIR}${RUBY_SITELIBDIR}
-	${CHOWN} -R ${LIBOWN}:${LIBGRP} ${DESTDIR}${RUBY_SITELIBDIR}/active_support*
-	${FIND} ${DESTDIR}${RUBY_SITELIBDIR}/active_support -type d		\
-		-exec ${CHMOD} ${PKGDIRMODE} {} \;
-	${FIND} ${DESTDIR}${RUBY_SITELIBDIR}/active_support* -type f		\
-		-exec ${CHMOD} ${LIBMODE} {} \;
-	${INSTALL_DATA_DIR} ${DESTDIR}${RUBY_DOCDIR}/active_support
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG \
-		${DESTDIR}${RUBY_DOCDIR}/active_support
-	${INSTALL_DATA} ${WRKSRC}/README \
-		${DESTDIR}${RUBY_DOCDIR}/active_support
+GEM_BUILD=	gemspec
 
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-activesupport/PLIST b/devel/ruby-activesupport/PLIST
index d30b4316056..31d27d5f332 100644
--- a/devel/ruby-activesupport/PLIST
+++ b/devel/ruby-activesupport/PLIST
@@ -1,178 +1,181 @@
-@comment $NetBSD: PLIST,v 1.9 2008/02/09 06:18:27 minskim Exp $
-${RUBY_SITELIBDIR}/active_support.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/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
-${RUBY_SITELIBDIR}/active_support/core_ext/module/inclusion.rb
-${RUBY_SITELIBDIR}/active_support/core_ext/module/introspection.rb
-${RUBY_SITELIBDIR}/active_support/core_ext/module/loading.rb
-${RUBY_SITELIBDIR}/active_support/core_ext/name_error.rb
-${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
-${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/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
-${RUBY_SITELIBDIR}/active_support/multibyte/handlers/passthru_handler.rb
-${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/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.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/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
-@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/object
-@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/numeric
-@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/module
-@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
-@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/bigdecimal
-@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext/array
-@dirrm ${RUBY_SITELIBDIR}/active_support/core_ext
-@dirrm ${RUBY_SITELIBDIR}/active_support
+@comment $NetBSD: PLIST,v 1.10 2008/04/04 15:30:00 jlam Exp $
+${GEM_HOME}/cache/activesupport-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/lib/active_support.rb
+${GEM_LIBDIR}/lib/active_support/basic_object.rb
+${GEM_LIBDIR}/lib/active_support/buffered_logger.rb
+${GEM_LIBDIR}/lib/active_support/clean_logger.rb
+${GEM_LIBDIR}/lib/active_support/core_ext.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/array.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/array/access.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/array/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/array/extract_options.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/array/grouping.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/array/random_access.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/bigdecimal.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/bigdecimal/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/blank.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/cgi.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/class.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/class/attribute_accessors.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/class/delegating_attributes.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/class/inheritable_attributes.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/class/removal.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date/behavior.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date/calculations.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date_time.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date_time/calculations.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/date_time/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/duplicable.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/enumerable.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/exception.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/file.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/float.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/float/rounding.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/diff.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/except.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/indifferent_access.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/keys.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/reverse_merge.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/hash/slice.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/integer.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/integer/even_odd.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/integer/inflections.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/kernel.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/kernel/agnostics.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/kernel/daemonizing.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/kernel/debugger.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/kernel/reporting.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/kernel/requires.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/load_error.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/logger.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/aliasing.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/attr_accessor_with_default.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/attr_internal.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/attribute_accessors.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/delegation.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/inclusion.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/introspection.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/module/loading.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/name_error.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/numeric.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/numeric/bytes.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/numeric/time.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/object.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/object/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/object/extending.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/object/instance_variables.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/object/misc.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/pathname.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/pathname/clean_within.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/proc.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/range.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/range/blockless_step.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/range/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/range/include_range.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/range/overlaps.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/access.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/conversions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/inflections.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/iterators.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/starts_ends_with.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/unicode.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/string/xchar.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/symbol.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/test.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/test/unit/assertions.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/time.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/time/behavior.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/time/calculations.rb
+${GEM_LIBDIR}/lib/active_support/core_ext/time/conversions.rb
+${GEM_LIBDIR}/lib/active_support/dependencies.rb
+${GEM_LIBDIR}/lib/active_support/deprecation.rb
+${GEM_LIBDIR}/lib/active_support/duration.rb
+${GEM_LIBDIR}/lib/active_support/inflections.rb
+${GEM_LIBDIR}/lib/active_support/inflector.rb
+${GEM_LIBDIR}/lib/active_support/json.rb
+${GEM_LIBDIR}/lib/active_support/json/decoding.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/date.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/date_time.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/enumerable.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/false_class.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/hash.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/nil_class.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/numeric.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/object.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/regexp.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/string.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/symbol.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/time.rb
+${GEM_LIBDIR}/lib/active_support/json/encoders/true_class.rb
+${GEM_LIBDIR}/lib/active_support/json/encoding.rb
+${GEM_LIBDIR}/lib/active_support/json/variable.rb
+${GEM_LIBDIR}/lib/active_support/multibyte.rb
+${GEM_LIBDIR}/lib/active_support/multibyte/chars.rb
+${GEM_LIBDIR}/lib/active_support/multibyte/generators/generate_tables.rb
+${GEM_LIBDIR}/lib/active_support/multibyte/handlers/passthru_handler.rb
+${GEM_LIBDIR}/lib/active_support/multibyte/handlers/utf8_handler.rb
+${GEM_LIBDIR}/lib/active_support/multibyte/handlers/utf8_handler_proc.rb
+${GEM_LIBDIR}/lib/active_support/option_merger.rb
+${GEM_LIBDIR}/lib/active_support/ordered_options.rb
+${GEM_LIBDIR}/lib/active_support/test_case.rb
+${GEM_LIBDIR}/lib/active_support/testing.rb
+${GEM_LIBDIR}/lib/active_support/testing/default.rb
+${GEM_LIBDIR}/lib/active_support/values/time_zone.rb
+${GEM_LIBDIR}/lib/active_support/values/unicode_tables.dat
+${GEM_LIBDIR}/lib/active_support/vendor.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/blankslate.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder/blankslate.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder/css.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder/xchar.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder/xmlbase.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb
+${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb
+${GEM_LIBDIR}/lib/active_support/vendor/xml-simple-1.0.11/xmlsimple.rb
+${GEM_LIBDIR}/lib/active_support/version.rb
+${GEM_LIBDIR}/lib/active_support/whiny_nil.rb
+${GEM_LIBDIR}/lib/activesupport.rb
+${GEM_HOME}/specifications/activesupport-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/lib/active_support/vendor/xml-simple-1.0.11
+@dirrm ${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2/builder
+@dirrm ${GEM_LIBDIR}/lib/active_support/vendor/builder-2.1.2
+@dirrm ${GEM_LIBDIR}/lib/active_support/vendor
+@dirrm ${GEM_LIBDIR}/lib/active_support/values
+@dirrm ${GEM_LIBDIR}/lib/active_support/testing
+@dirrm ${GEM_LIBDIR}/lib/active_support/multibyte/handlers
+@dirrm ${GEM_LIBDIR}/lib/active_support/multibyte/generators
+@dirrm ${GEM_LIBDIR}/lib/active_support/multibyte
+@dirrm ${GEM_LIBDIR}/lib/active_support/json/encoders
+@dirrm ${GEM_LIBDIR}/lib/active_support/json
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/time
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/test/unit
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/test
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/string
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/range
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/pathname
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/object
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/numeric
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/module
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/kernel
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/integer
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/hash
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/float
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/date_time
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/date
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/class
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/cgi
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/bigdecimal
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext/array
+@dirrm ${GEM_LIBDIR}/lib/active_support/core_ext
+@dirrm ${GEM_LIBDIR}/lib/active_support
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}
diff --git a/devel/ruby-activesupport/distinfo b/devel/ruby-activesupport/distinfo
index 194c63e44ce..720d422cd85 100644
--- a/devel/ruby-activesupport/distinfo
+++ b/devel/ruby-activesupport/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/02/09 06:18:27 minskim Exp $
+$NetBSD: distinfo,v 1.12 2008/04/04 15:30:00 jlam Exp $
 
-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
+SHA1 (activesupport-2.0.2.gem) = e5699d9441f6a9f2b3ea70f2b132146033ff3451
+RMD160 (activesupport-2.0.2.gem) = 2b1d7c62364c33ddbafa0ba865978d3ffdaf9d41
+Size (activesupport-2.0.2.gem) = 234496 bytes
diff --git a/devel/ruby-activesupport/patches/patch-aa b/devel/ruby-activesupport/patches/patch-aa
deleted file mode 100644
index 99ad0d0e890..00000000000
--- a/devel/ruby-activesupport/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644
index 92e5892a97d..00000000000
--- a/devel/ruby-activesupport/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$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