diff options
author | minskim <minskim@pkgsrc.org> | 2008-02-09 06:20:25 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2008-02-09 06:20:25 +0000 |
commit | 30c22a107a1c84ec033faa6c9235c9b66182725c (patch) | |
tree | f1222ee2a9f8371aab1ecb0def38b4b9be7e8e79 /databases/ruby-activerecord | |
parent | f3c83c6461104aea8350166ad2f65d11da14ef30 (diff) | |
download | pkgsrc-30c22a107a1c84ec033faa6c9235c9b66182725c.tar.gz |
Update ruby-activerecord 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/activerecord/CHANGELOG
Diffstat (limited to 'databases/ruby-activerecord')
-rw-r--r-- | databases/ruby-activerecord/Makefile | 11 | ||||
-rw-r--r-- | databases/ruby-activerecord/PLIST | 29 | ||||
-rw-r--r-- | databases/ruby-activerecord/distinfo | 10 | ||||
-rw-r--r-- | databases/ruby-activerecord/patches/patch-aa | 21 | ||||
-rw-r--r-- | databases/ruby-activerecord/patches/patch-ab | 20 |
5 files changed, 59 insertions, 32 deletions
diff --git a/databases/ruby-activerecord/Makefile b/databases/ruby-activerecord/Makefile index 58decace53d..323e7bda009 100644 --- a/databases/ruby-activerecord/Makefile +++ b/databases/ruby-activerecord/Makefile @@ -1,22 +1,21 @@ -# $NetBSD: Makefile,v 1.10 2007/10/16 03:05:38 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2008/02/09 06:20:25 minskim Exp $ -DISTNAME= activerecord-1.15.5 +DISTNAME= activerecord-2.0.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= databases ruby -MASTER_SITES= http://rubyforge.org/frs/download.php/26551/ +MASTER_SITES= http://rubyforge.org/frs/download.php/29348/ EXTRACT_SUFX= .tgz MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://rubyforge.org/projects/activerecord/ COMMENT= Object-relation mapping put on rails -DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport +DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=2.0.2:../../devel/ruby-activesupport NO_BUILD= yes NO_CONFIGURE= yes USE_RUBY_INSTALL= yes -EXAMPLES= associations.png associations.rb shared_setup.rb \ - validation.rb +EXAMPLES= associations.png .include "../../lang/ruby/modules.mk" diff --git a/databases/ruby-activerecord/PLIST b/databases/ruby-activerecord/PLIST index 6e91a7915f7..b747bf4f645 100644 --- a/databases/ruby-activerecord/PLIST +++ b/databases/ruby-activerecord/PLIST @@ -1,8 +1,5 @@ -@comment $NetBSD: PLIST,v 1.9 2007/03/17 11:05:15 minskim Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/02/09 06:20:25 minskim Exp $ ${RUBY_SITELIBDIR}/active_record.rb -${RUBY_SITELIBDIR}/active_record/acts/list.rb -${RUBY_SITELIBDIR}/active_record/acts/nested_set.rb -${RUBY_SITELIBDIR}/active_record/acts/tree.rb ${RUBY_SITELIBDIR}/active_record/aggregations.rb ${RUBY_SITELIBDIR}/active_record/associations.rb ${RUBY_SITELIBDIR}/active_record/associations/association_collection.rb @@ -19,22 +16,15 @@ ${RUBY_SITELIBDIR}/active_record/calculations.rb ${RUBY_SITELIBDIR}/active_record/callbacks.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/connection_specification.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/database_statements.rb +${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/query_cache.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/quoting.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/schema_definitions.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract/schema_statements.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/db2_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/firebird_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/frontbase_adapter.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/mysql_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/openbase_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/oracle_adapter.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/postgresql_adapter.rb +${RUBY_SITELIBDIR}/active_record/connection_adapters/sqlite3_adapter.rb ${RUBY_SITELIBDIR}/active_record/connection_adapters/sqlite_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/sqlserver_adapter.rb -${RUBY_SITELIBDIR}/active_record/connection_adapters/sybase_adapter.rb -${RUBY_SITELIBDIR}/active_record/deprecated_associations.rb -${RUBY_SITELIBDIR}/active_record/deprecated_finders.rb ${RUBY_SITELIBDIR}/active_record/fixtures.rb ${RUBY_SITELIBDIR}/active_record/locking/optimistic.rb ${RUBY_SITELIBDIR}/active_record/locking/pessimistic.rb @@ -44,29 +34,24 @@ ${RUBY_SITELIBDIR}/active_record/query_cache.rb ${RUBY_SITELIBDIR}/active_record/reflection.rb ${RUBY_SITELIBDIR}/active_record/schema.rb ${RUBY_SITELIBDIR}/active_record/schema_dumper.rb +${RUBY_SITELIBDIR}/active_record/serialization.rb +${RUBY_SITELIBDIR}/active_record/serializers/json_serializer.rb +${RUBY_SITELIBDIR}/active_record/serializers/xml_serializer.rb ${RUBY_SITELIBDIR}/active_record/timestamp.rb ${RUBY_SITELIBDIR}/active_record/transactions.rb ${RUBY_SITELIBDIR}/active_record/validations.rb ${RUBY_SITELIBDIR}/active_record/vendor/db2.rb ${RUBY_SITELIBDIR}/active_record/vendor/mysql.rb -${RUBY_SITELIBDIR}/active_record/vendor/simple.rb ${RUBY_SITELIBDIR}/active_record/version.rb -${RUBY_SITELIBDIR}/active_record/wrappers/yaml_wrapper.rb -${RUBY_SITELIBDIR}/active_record/wrappings.rb -${RUBY_SITELIBDIR}/active_record/xml_serialization.rb ${RUBY_DOCDIR}/active_record/CHANGELOG ${RUBY_DOCDIR}/active_record/README ${RUBY_EXAMPLESDIR}/active_record/associations.png -${RUBY_EXAMPLESDIR}/active_record/associations.rb -${RUBY_EXAMPLESDIR}/active_record/shared_setup.rb -${RUBY_EXAMPLESDIR}/active_record/validation.rb @dirrm ${RUBY_EXAMPLESDIR}/active_record @dirrm ${RUBY_DOCDIR}/active_record -@dirrm ${RUBY_SITELIBDIR}/active_record/wrappers @dirrm ${RUBY_SITELIBDIR}/active_record/vendor +@dirrm ${RUBY_SITELIBDIR}/active_record/serializers @dirrm ${RUBY_SITELIBDIR}/active_record/locking @dirrm ${RUBY_SITELIBDIR}/active_record/connection_adapters/abstract @dirrm ${RUBY_SITELIBDIR}/active_record/connection_adapters @dirrm ${RUBY_SITELIBDIR}/active_record/associations -@dirrm ${RUBY_SITELIBDIR}/active_record/acts @dirrm ${RUBY_SITELIBDIR}/active_record diff --git a/databases/ruby-activerecord/distinfo b/databases/ruby-activerecord/distinfo index 1857cdec39c..8a79292e633 100644 --- a/databases/ruby-activerecord/distinfo +++ b/databases/ruby-activerecord/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.10 2007/10/16 03:05:39 minskim Exp $ +$NetBSD: distinfo,v 1.11 2008/02/09 06:20:25 minskim Exp $ -SHA1 (activerecord-1.15.5.tgz) = ca59be0a54b83795f3e05253f06fe802ff9f2036 -RMD160 (activerecord-1.15.5.tgz) = b807365e653767c35c89a4b027d2e6db8660c5b7 -Size (activerecord-1.15.5.tgz) = 430076 bytes +SHA1 (activerecord-2.0.2.tgz) = f16bc4332814c2dbb1f58b736aecd2950acaeb4b +RMD160 (activerecord-2.0.2.tgz) = 80d6678e773d0c0cfcf4ca5529152e8a441a1fe1 +Size (activerecord-2.0.2.tgz) = 422583 bytes +SHA1 (patch-aa) = 72ffb3910a719ed02daf90c9b80c24d9ebee6696 +SHA1 (patch-ab) = 1c195d73f21452ffe5d7ed51e09707332e78d06e diff --git a/databases/ruby-activerecord/patches/patch-aa b/databases/ruby-activerecord/patches/patch-aa new file mode 100644 index 00000000000..11f2cd25034 --- /dev/null +++ b/databases/ruby-activerecord/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.3 2008/02/09 06:20:25 minskim Exp $ + +--- lib/active_record.rb.orig 2008-02-08 21:45:03.000000000 -0800 ++++ lib/active_record.rb +@@ -25,15 +25,7 @@ $:.unshift(File.dirname(__FILE__)) unles + $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) + + unless defined? ActiveSupport +- active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib" +- if File.exist?(active_support_path) +- $:.unshift active_support_path +- require 'active_support' +- else +- require 'rubygems' +- gem 'activesupport' +- require 'active_support' +- end ++ require 'active_support' + end + + require 'active_record/base' diff --git a/databases/ruby-activerecord/patches/patch-ab b/databases/ruby-activerecord/patches/patch-ab new file mode 100644 index 00000000000..6d4813d5894 --- /dev/null +++ b/databases/ruby-activerecord/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.1 2008/02/09 06:20:25 minskim Exp $ + +--- lib/active_record/connection_adapters/abstract/connection_specification.rb.orig 2008-02-08 21:48:27.000000000 -0800 ++++ lib/active_record/connection_adapters/abstract/connection_specification.rb +@@ -221,15 +221,7 @@ module ActiveRecord + unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end + + begin +- require 'rubygems' +- gem "activerecord-#{spec[:adapter]}-adapter" + require "active_record/connection_adapters/#{spec[:adapter]}_adapter" +- rescue LoadError +- begin +- require "active_record/connection_adapters/#{spec[:adapter]}_adapter" +- rescue LoadError +- raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})" +- end + end + + adapter_method = "#{spec[:adapter]}_connection" |