From a1da5db895ed93d18445fff093d957f341d849a4 Mon Sep 17 00:00:00 2001
From: ghen <ghen@pkgsrc.org>
Date: Mon, 10 Dec 2007 17:08:10 +0000
Subject: Pullup ticket 2244 - requested by minskim security update for
 ruby-actionpack

- pkgsrc/databases/ruby-activerecord/Makefile		1.10
- pkgsrc/databases/ruby-activerecord/distinfo		1.10
- pkgsrc/devel/ruby-activesupport/Makefile		1.12
- pkgsrc/devel/ruby-activesupport/distinfo		1.10
- pkgsrc/mail/ruby-actionmailer/Makefile		1.9
- pkgsrc/mail/ruby-actionmailer/distinfo		1.10
- pkgsrc/www/rails/Makefile				1.6
- pkgsrc/www/rails/PLIST				1.3
- pkgsrc/www/rails/distinfo				1.5
- pkgsrc/www/rails/patches/patch-ab			1.4
- pkgsrc/www/ruby-actionpack/Makefile			1.9, 1.10
- pkgsrc/www/ruby-actionpack/PLIST			1.10
- pkgsrc/www/ruby-actionpack/distinfo			1.10, 1.11
- pkgsrc/www/ruby-actionwebservice/Makefile		1.8
- pkgsrc/www/ruby-actionwebservice/distinfo		1.9

   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Oct 16 02:56:02 UTC 2007

   Modified Files:
	   pkgsrc/devel/ruby-activesupport: Makefile distinfo

   Log Message:
   Update ruby-activesupport to 1.4.4.

   Changes:
   * Backport: allow array and hash query parameters. Array route
     parameters are converted/to/a/path as before.
   * Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read
     files or stdin.
   * Document Object#blank?.
   * Update Dependencies to ignore constants inherited from ancestors.
   * Improved multibyte performance by relying less on exception raising
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Oct 16 03:17:32 UTC 2007

   Modified Files:
	   pkgsrc/www/ruby-actionpack: Makefile PLIST distinfo

   Log Message:
   Update ruby-actionpack to 1.13.5.

   Changes:
   * Backport: allow array and hash query parameters. Array route
     parameters are converted/to/a/path as before. #6765, #7047, #7462 [bgipsy,
     Jeremy  McAnally, Dan Kubb, brendan, Diego Algorta Casamayou]
   * Fix in place editor's setter action with non-string fields.  #7418
     [Andreas]
   * Only accept session ids from cookies, prevents session fixation
     attacks.
   * Change the resource seperator from ; to / change the generated
     routes to use the new-style named routes. e.g. new_group_user_path(@group)
     instead of group_new_user_path(@group). [pixeltrix]
   * Integration tests: introduce methods for other HTTP methods. #6353
     [caboose]
   * Improve performance of action caching. Closes #8231 [skaes]
   * Fix errors with around_filters which do not yield, restore 1.1
     behaviour with after filters. Closes #8891 [skaes]
   * Allow you to delete cookies with options. Closes #3685
   * Deprecate pagination. Install the classic_pagination plugin for
     forward compatibility, or move to the superior will_paginate plugin. #8157
   * Fix filtered parameter logging with nil parameter values.  #8422
     [choonkeat]
   * Integration tests: alias xhr to xml_http_request and add a
     request_method argument instead of always using POST. #7124
   * Document caches_action.  #5419 [Jarkko Laine]
   * observe_form always sends the serialized form. #5271
   * Update UrlWriter to accept :anchor parameter. Closes #6771.
     [octopod]
   * Replace the current block/continuation filter chain handling by an
     implementation based on a simple loop. Closes #8226 [Stefan Kaes]
   * Return the string representation from an Xml Builder when
     rendering a partial. #5044 [tpope]
   * Cleaned up, corrected, and mildly expanded ActionPack
     documentation. Closes #7190 [jeremymcanally]
   * Small collection of ActionController documentation cleanups.
     Closes #7319
   * Performance: patch cgi/session/pstore to require digest/md5 once
     rather than per #initialize. #7583 [Stefan Kaes]
   * Deprecation: verification with :redirect_to => :named_route
     shouldn't be deprecated. #7525 [Justin French]
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Oct 16 03:05:39 UTC 2007

   Modified Files:
	   pkgsrc/databases/ruby-activerecord: Makefile distinfo

   Log Message:
   Update ruby-activerecord to 1.15.5.

   Changes:
   * Depend on Action Pack 1.4.4
   * Fix #count on a has_many :through association so that it
     recognizes the :uniq option. Closes #8801 [lifofifo]
   * Don't clobber includes passed to has_many.count [danger]
   * Make sure has_many uses :include when counting [danger]
   * Save associated records only if the association is already
     loaded.  #8713
   * Changing the :default Date format doesn't break date quoting.  #6312
   * Allow nil serialized attributes with a set class constraint. #7293
   * belongs_to assignment creates a new proxy rather than modifying
     its target in-place.  #8412 [mmangino@elevatedrails.com]
   * Fix column type detection while loading fixtures.  Closes #7987
     [roderickvd]
   * Document deep eager includes.  #6267 [Josh Susser, Dan Manges]
   * Oracle: extract column length for CHAR also.  #7866 [ymendel]
   * Small additions and fixes for ActiveRecord documentation.  Closes
     #7342
   * SQLite: binary escaping works with $KCODE='u'.  #7862 [tsuka]
   * Improved cloning performance by relying less on exception raising
     #8159
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Oct 16 03:26:23 UTC 2007

   Modified Files:
	   pkgsrc/mail/ruby-actionmailer: Makefile distinfo

   Log Message:
   Update ruby-actionmailer to 1.3.5.

   Changes:
   * Depend on Action Pack 1.13.5
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Oct 16 03:31:02 UTC 2007

   Modified Files:
	   pkgsrc/www/ruby-actionwebservice: Makefile distinfo

   Log Message:
   Update ruby-actionwebservice to 1.2.5.

   Changes:
   * Depend on Action Pack 1.13.5
   * Depend on Active Record 1.15.5
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Oct 16 04:03:43 UTC 2007

   Modified Files:
	   pkgsrc/www/rails: Makefile PLIST distinfo
	   pkgsrc/www/rails/patches: patch-ab

   Log Message:
   Update rails to 1.2.5.

   Changes:

   * Correct RAILS_GEM_VERSION regexp. Use =version gem requirement
     instead of ~>version so you don't get surprised by a beta gem in
     production.  This change means upgrading to 1.2.5 will require a boot.rb
     upgrade.
   * Move custom inflections example so available before route
     generation.
   * Add a new rake task to aid debugging of named routes.
   * use Gem.find_name instead of search when freezing gems. Prevent
     false positives for other gems with rails in the name. Closes #8729
     [wselman]
   * Fix syntax error in dispatcher than wrecked failsafe responses.
   * Add Active Resource to rails:freeze:edge and drop Action Web
     Service.
   * Give generate scaffold a more descriptive database message.
     Closes #7316
   * Canonicalize RAILS_ROOT by using File.expand_path on Windows,
     which doesn't have to worry about symlinks, and Pathname#realpath
     elsewhere, which respects symlinks in relative paths but is incompatible
     with Windows. #6755 [Jeremy Kemper, trevor]
---
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Mon Dec 10 05:47:03 UTC 2007

   Modified Files:
	   pkgsrc/www/ruby-actionpack: Makefile distinfo

   Log Message:
   Update ruby-actionpack to 1.13.6.

   Changes:
   * Correct Broken Fix for session_fixation attacks
   * Ensure that cookies handle array values correctly.  Closes #9937
     [queso]
---
 databases/ruby-activerecord/Makefile |  8 ++++----
 databases/ruby-activerecord/distinfo |  8 ++++----
 devel/ruby-activesupport/Makefile    |  6 +++---
 devel/ruby-activesupport/distinfo    |  8 ++++----
 mail/ruby-actionmailer/Makefile      |  8 ++++----
 mail/ruby-actionmailer/distinfo      |  8 ++++----
 www/rails/Makefile                   | 19 ++++++++++---------
 www/rails/PLIST                      |  3 ++-
 www/rails/distinfo                   | 10 +++++-----
 www/rails/patches/patch-ab           | 25 ++++++++++++++-----------
 www/ruby-actionpack/Makefile         |  8 ++++----
 www/ruby-actionpack/PLIST            |  3 ++-
 www/ruby-actionpack/distinfo         |  8 ++++----
 www/ruby-actionwebservice/Makefile   | 10 +++++-----
 www/ruby-actionwebservice/distinfo   |  8 ++++----
 15 files changed, 73 insertions(+), 67 deletions(-)

diff --git a/databases/ruby-activerecord/Makefile b/databases/ruby-activerecord/Makefile
index 56394a8cbb9..7cb41e0a2bc 100644
--- a/databases/ruby-activerecord/Makefile
+++ b/databases/ruby-activerecord/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2007/03/17 11:05:15 minskim Exp $
+# $NetBSD: Makefile,v 1.9.6.1 2007/12/10 17:08:11 ghen Exp $
 
-DISTNAME=	activerecord-1.15.3
+DISTNAME=	activerecord-1.15.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18406/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/26551/
 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.2:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport
 
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
diff --git a/databases/ruby-activerecord/distinfo b/databases/ruby-activerecord/distinfo
index 050619ea7f1..136fdfa45c5 100644
--- a/databases/ruby-activerecord/distinfo
+++ b/databases/ruby-activerecord/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 11:05:15 minskim Exp $
+$NetBSD: distinfo,v 1.9.6.1 2007/12/10 17:08:11 ghen Exp $
 
-SHA1 (activerecord-1.15.3.tgz) = 0cd2500019d0a5a9cd7a55357289f739cc43b2df
-RMD160 (activerecord-1.15.3.tgz) = 5b183ed26f678ba7d516c95556e2ac3a24a0b4c1
-Size (activerecord-1.15.3.tgz) = 407840 bytes
+SHA1 (activerecord-1.15.5.tgz) = ca59be0a54b83795f3e05253f06fe802ff9f2036
+RMD160 (activerecord-1.15.5.tgz) = b807365e653767c35c89a4b027d2e6db8660c5b7
+Size (activerecord-1.15.5.tgz) = 430076 bytes
diff --git a/devel/ruby-activesupport/Makefile b/devel/ruby-activesupport/Makefile
index f6ac23ba482..70e53e89dd4 100644
--- a/devel/ruby-activesupport/Makefile
+++ b/devel/ruby-activesupport/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/03/17 10:59:26 minskim Exp $
+# $NetBSD: Makefile,v 1.11.6.1 2007/12/10 17:08:10 ghen Exp $
 
-DISTNAME=	activesupport-1.4.2
+DISTNAME=	activesupport-1.4.4
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18399/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/26548/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/devel/ruby-activesupport/distinfo b/devel/ruby-activesupport/distinfo
index 5db4a2e3911..8035bac7b70 100644
--- a/devel/ruby-activesupport/distinfo
+++ b/devel/ruby-activesupport/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 10:59:26 minskim Exp $
+$NetBSD: distinfo,v 1.9.6.1 2007/12/10 17:08:10 ghen Exp $
 
-SHA1 (activesupport-1.4.2.tgz) = ec1b98727e0ca2eb55304f2cb814c50075e7d998
-RMD160 (activesupport-1.4.2.tgz) = 5a0cc3dc0710cdd4930189d3812a8d43c7936477
-Size (activesupport-1.4.2.tgz) = 214206 bytes
+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
diff --git a/mail/ruby-actionmailer/Makefile b/mail/ruby-actionmailer/Makefile
index cf3a82d6630..f09e36ac403 100644
--- a/mail/ruby-actionmailer/Makefile
+++ b/mail/ruby-actionmailer/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2007/03/17 11:14:29 minskim Exp $
+# $NetBSD: Makefile,v 1.8.6.1 2007/12/10 17:08:11 ghen Exp $
 
-DISTNAME=	actionmailer-1.3.3
+DISTNAME=	actionmailer-1.3.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	mail ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18409/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/26557/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionmailer/
 COMMENT=	Ruby framework for designing email-service layers
 
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.3:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.5:../../www/ruby-actionpack
 DEPENDS+=	${RUBY_PKGPREFIX}-tmail>=0.10.8:../../mail/ruby-tmail
 
 NO_BUILD=		yes
diff --git a/mail/ruby-actionmailer/distinfo b/mail/ruby-actionmailer/distinfo
index 8e38172ac28..216ad5b699e 100644
--- a/mail/ruby-actionmailer/distinfo
+++ b/mail/ruby-actionmailer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 11:14:29 minskim Exp $
+$NetBSD: distinfo,v 1.9.6.1 2007/12/10 17:08:12 ghen Exp $
 
-SHA1 (actionmailer-1.3.3.tgz) = d03479074aa570b1ec23291e0ac13fec3e26736c
-RMD160 (actionmailer-1.3.3.tgz) = 7f4595eb7da82fcd1e82a330624d137bd0271abd
-Size (actionmailer-1.3.3.tgz) = 80773 bytes
+SHA1 (actionmailer-1.3.5.tgz) = 2803796787b6752401cf85c12dc3a810c731ff4a
+RMD160 (actionmailer-1.3.5.tgz) = 1c1b417af80b3d429fdb84a4492ee123449bf530
+Size (actionmailer-1.3.5.tgz) = 80800 bytes
diff --git a/www/rails/Makefile b/www/rails/Makefile
index d164d57c3f4..63909a43437 100644
--- a/www/rails/Makefile
+++ b/www/rails/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2007/04/30 21:26:03 minskim Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2007/12/10 17:08:13 ghen Exp $
 
-DISTNAME=	rails-1.2.3
+DISTNAME=	rails-1.2.5
 CATEGORIES=	www
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18404/
-EXTRACT_SUFX=	.gem
+MASTER_SITES=	http://rubyforge.org/frs/download.php/26563/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.rubyonrails.org/
 COMMENT=	Framework for developing database-backed web applications
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.2:../../devel/ruby-activesupport
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.3:../../databases/ruby-activerecord
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.3:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=1.3.3:../../mail/ruby-actionmailer
-DEPENDS+=	${RUBY_PKGPREFIX}-actionwebservice>=1.2.3:../../www/ruby-actionwebservice
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.5:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.5:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-actionmailer>=1.3.5:../../mail/ruby-actionmailer
+DEPENDS+=	${RUBY_PKGPREFIX}-actionwebservice>=1.2.5:../../www/ruby-actionwebservice
 
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/rails/vendor/rails/railties
 
 REPLACE_RUBY_DIRS=	${WRKSRC}/bin ${WRKSRC}/dispatches	\
 			${WRKSRC}/lib/commands/ncgi
diff --git a/www/rails/PLIST b/www/rails/PLIST
index 0394ab732ed..ccbc082e371 100644
--- a/www/rails/PLIST
+++ b/www/rails/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/28 05:45:09 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2.6.1 2007/12/10 17:08:13 ghen Exp $
 bin/rails
 ${RUBY_SITELIBDIR}/binding_of_caller.rb
 ${RUBY_SITELIBDIR}/breakpoint.rb
@@ -143,6 +143,7 @@ ${RUBY_SITELIBDIR}/tasks/log.rake
 ${RUBY_SITELIBDIR}/tasks/misc.rake
 ${RUBY_SITELIBDIR}/tasks/pre_namespace_aliases.rake
 ${RUBY_SITELIBDIR}/tasks/rails.rb
+${RUBY_SITELIBDIR}/tasks/routes.rake
 ${RUBY_SITELIBDIR}/tasks/statistics.rake
 ${RUBY_SITELIBDIR}/tasks/testing.rake
 ${RUBY_SITELIBDIR}/tasks/tmp.rake
diff --git a/www/rails/distinfo b/www/rails/distinfo
index f294f2f1ccd..a2abfae2166 100644
--- a/www/rails/distinfo
+++ b/www/rails/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/04/30 21:26:21 minskim Exp $
+$NetBSD: distinfo,v 1.4.4.1 2007/12/10 17:08:14 ghen Exp $
 
-SHA1 (rails-1.2.3.gem) = 53302796daa82d5635d4044cb30f50d9cf4b3ad9
-RMD160 (rails-1.2.3.gem) = 7dcddf8dcad20a9c0cbda6a3924ccaf893ba6ce2
-Size (rails-1.2.3.gem) = 168448 bytes
+SHA1 (rails-1.2.5.tgz) = 0bec27d4017682a394bd1677d5cc24405d618d64
+RMD160 (rails-1.2.5.tgz) = 0462e044c92e2c2ba95ba84e67aed54002a3a700
+Size (rails-1.2.5.tgz) = 8319184 bytes
 SHA1 (patch-aa) = 7a3d4f4b435c0de22f00f665092ccff046387170
-SHA1 (patch-ab) = 5b1e59728bd652dfa3a2fa537379186581f2dbc4
+SHA1 (patch-ab) = 46e835f687d88436ee011d5a0134637ae05f3180
diff --git a/www/rails/patches/patch-ab b/www/rails/patches/patch-ab
index 3d8102e9f11..2c5d2fbdcf6 100644
--- a/www/rails/patches/patch-ab
+++ b/www/rails/patches/patch-ab
@@ -1,27 +1,30 @@
-$NetBSD: patch-ab,v 1.3 2007/02/18 23:49:14 minskim Exp $
+$NetBSD: patch-ab,v 1.3.6.1 2007/12/10 17:08:15 ghen Exp $
 
---- environments/boot.rb.orig	2007-02-05 21:29:54.000000000 -0800
+--- environments/boot.rb.orig	2007-10-12 09:35:07.000000000 -0700
 +++ environments/boot.rb
-@@ -15,30 +15,7 @@ unless defined?(Rails::Initializer)
+@@ -6,33 +6,7 @@ unless defined?(Rails::Initializer)
    if File.directory?("#{RAILS_ROOT}/vendor/rails")
      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
    else
 -    require 'rubygems'
 -
--    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
--    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
--    rails_gem_version = $1
+-    rails_gem_version =
+-      if defined? RAILS_GEM_VERSION
+-        RAILS_GEM_VERSION
+-      else
+-        File.read("#{File.dirname(__FILE__)}/environment.rb") =~ /^[^#]*RAILS_GEM_VERSION\s+=\s+'([\d.]+)'/
+-        $1
+-      end
 -
--    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
--      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
--      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
+-    if rails_gem_version
+-      rails_gem = Gem.cache.search('rails', "=#{rails_gem_version}.0").sort_by { |g| g.version.version }.last
 -
 -      if rails_gem
 -        gem "rails", "=#{rails_gem.version.version}"
 -        require rails_gem.full_gem_path + '/lib/initializer'
 -      else
--        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
--    Install the missing gem with 'gem install -v=#{version} rails', or
+-        STDERR.puts %(Cannot find gem for Rails =#{rails_gem_version}.0:
+-    Install the missing gem with 'gem install -v=#{rails_gem_version} rails', or
 -    change environment.rb to define RAILS_GEM_VERSION with your desired version.
 -  )
 -        exit 1
diff --git a/www/ruby-actionpack/Makefile b/www/ruby-actionpack/Makefile
index b7d0980b320..aa7f8d59090 100644
--- a/www/ruby-actionpack/Makefile
+++ b/www/ruby-actionpack/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2007/03/17 11:10:16 minskim Exp $
+# $NetBSD: Makefile,v 1.8.6.1 2007/12/10 17:08:10 ghen Exp $
 
-DISTNAME=	actionpack-1.13.3
+DISTNAME=	actionpack-1.13.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	www ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18402/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/28329/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionpack/
 COMMENT=	Two-step approach to web response generation
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.2:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=1.4.4:../../devel/ruby-activesupport
 
 NO_BUILD=		yes
 USE_RUBY_INSTALL=	yes
diff --git a/www/ruby-actionpack/PLIST b/www/ruby-actionpack/PLIST
index fd828484feb..dfdf7a12ded 100644
--- a/www/ruby-actionpack/PLIST
+++ b/www/ruby-actionpack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/03/17 11:10:16 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9.6.1 2007/12/10 17:08:10 ghen Exp $
 ${RUBY_SITELIBDIR}/action_controller.rb
 ${RUBY_SITELIBDIR}/action_controller/assertions.rb
 ${RUBY_SITELIBDIR}/action_controller/assertions/deprecated_assertions.rb
@@ -14,6 +14,7 @@ ${RUBY_SITELIBDIR}/action_controller/caching.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_ext/cgi_ext.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_ext/cgi_methods.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_ext/cookie_performance_fix.rb
+${RUBY_SITELIBDIR}/action_controller/cgi_ext/pstore_performance_fix.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_ext/raw_post_data_fix.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_ext/session_performance_fix.rb
 ${RUBY_SITELIBDIR}/action_controller/cgi_process.rb
diff --git a/www/ruby-actionpack/distinfo b/www/ruby-actionpack/distinfo
index 46b162126db..282c14692a3 100644
--- a/www/ruby-actionpack/distinfo
+++ b/www/ruby-actionpack/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2007/03/17 11:10:16 minskim Exp $
+$NetBSD: distinfo,v 1.9.6.1 2007/12/10 17:08:11 ghen Exp $
 
-SHA1 (actionpack-1.13.3.tgz) = d5b607190b26430df886a73fd114e8147b11ee19
-RMD160 (actionpack-1.13.3.tgz) = 5361a000554b3a39ec67598993f0393c86ed8bfc
-Size (actionpack-1.13.3.tgz) = 606870 bytes
+SHA1 (actionpack-1.13.6.tgz) = 1ef33772dd6a560fdccec70972cad3d30189e4e2
+RMD160 (actionpack-1.13.6.tgz) = 855386e7a843c9245e42dcf3eeae81ce2986340e
+Size (actionpack-1.13.6.tgz) = 614571 bytes
 SHA1 (patch-ab) = bfba841b0af9d503a71745cc8d992e9d09d94191
diff --git a/www/ruby-actionwebservice/Makefile b/www/ruby-actionwebservice/Makefile
index d70fadd9827..a719011b001 100644
--- a/www/ruby-actionwebservice/Makefile
+++ b/www/ruby-actionwebservice/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2007/03/17 11:17:57 minskim Exp $
+# $NetBSD: Makefile,v 1.7.6.1 2007/12/10 17:08:12 ghen Exp $
 
-DISTNAME=	actionwebservice-1.2.3
+DISTNAME=	actionwebservice-1.2.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	www ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/18412/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/26560/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/aws/
 COMMENT=	Simple support for publishing web service APIs for Rails
 
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.3:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.3:../../databases/ruby-activerecord
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.5:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=1.15.5:../../databases/ruby-activerecord
 
 USE_RUBY_SETUP=	yes
 
diff --git a/www/ruby-actionwebservice/distinfo b/www/ruby-actionwebservice/distinfo
index 2a307e933f2..7b773c4e06f 100644
--- a/www/ruby-actionwebservice/distinfo
+++ b/www/ruby-actionwebservice/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2007/03/17 11:17:57 minskim Exp $
+$NetBSD: distinfo,v 1.8.6.1 2007/12/10 17:08:12 ghen Exp $
 
-SHA1 (actionwebservice-1.2.3.tgz) = 611adf0f75cbb367170d12ec4fe5a7da8a407b64
-RMD160 (actionwebservice-1.2.3.tgz) = a523fe77763604b99b19cd9cf94372ab7d385ad7
-Size (actionwebservice-1.2.3.tgz) = 64095 bytes
+SHA1 (actionwebservice-1.2.5.tgz) = 88e4bd8cc52e536672b135d5a91bc0d461e4caa1
+RMD160 (actionwebservice-1.2.5.tgz) = 2da3bf540c42aec5a1a723e59c98ac918c67030a
+Size (actionwebservice-1.2.5.tgz) = 64094 bytes
-- 
cgit v1.2.3