Update ruby-actionpack31 to 3.1.4.

Tweak COMMENT.

## Rails 3.1.4 (unreleased) ##

*   Skip assets group in Gemfile and all assets configurations options
    when the application is generated with --skip-sprockets option.

    *Guillermo Iguaran*

*   Use ProcessedAsset#pathname in Sprockets helpers when debugging is on.
    Closes #3333 #3348 #3361.

    *Guillermo Iguaran*

*   Allow to use asset_path on named_routes aliasing RailsHelper's
    asset_path to path_to_asset *Adrian Pike*

*   Assets should use the request protocol by default or default to relative
    if no request is available *Jonathan del Strother*

4 files changed, 7 insertions, 25 deletions

diff --git a/www/ruby-actionpack31/Makefile b/www/ruby-actionpack31/Makefile
index 6fdcc264f87..aa4a0a60c67 100644
--- a/www/ruby-actionpack31/Makefile
+++ b/www/ruby-actionpack31/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2012/03/17 16:40:48 taca Exp $
+# $NetBSD: Makefile,v 1.4 2012/03/18 05:38:57 taca Exp $
 
 DISTNAME=	actionpack-${RUBY_RAILS_VERSION}
-PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rubyonrails.org/
-COMMENT=	Toolkit for building modeling frameworks (part of Rails)
+COMMENT=	Toolkit for building modeling frameworks (part of Rails 3.1)
 LICENSE=	mit
 
 # Comment out dependency in gemspec but already depends indirectly one.
diff --git a/www/ruby-actionpack31/PLIST b/www/ruby-actionpack31/PLIST
index 8bddd00119f..8c8aa7fa86c 100644
--- a/www/ruby-actionpack31/PLIST
+++ b/www/ruby-actionpack31/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/12/16 12:26:30 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/18 05:38:57 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG.md
 ${GEM_LIBDIR}/MIT-LICENSE
@@ -131,7 +131,6 @@ ${GEM_LIBDIR}/lib/action_view/asset_paths.rb
 ${GEM_LIBDIR}/lib/action_view/base.rb
 ${GEM_LIBDIR}/lib/action_view/buffers.rb
 ${GEM_LIBDIR}/lib/action_view/context.rb
-${GEM_LIBDIR}/lib/action_view/data/encoding_conversions.txt
 ${GEM_LIBDIR}/lib/action_view/flows.rb
 ${GEM_LIBDIR}/lib/action_view/helpers.rb
 ${GEM_LIBDIR}/lib/action_view/helpers/active_model_helper.rb
diff --git a/www/ruby-actionpack31/distinfo b/www/ruby-actionpack31/distinfo
index 6b2a0748bec..65fcac070fb 100644
--- a/www/ruby-actionpack31/distinfo
+++ b/www/ruby-actionpack31/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/03/03 04:47:14 taca Exp $
+$NetBSD: distinfo,v 1.3 2012/03/18 05:38:57 taca Exp $
 
-SHA1 (actionpack-3.1.3.gem) = 3869fcc993a4b4cdbed14bb0b03d12d2beeb6802
-RMD160 (actionpack-3.1.3.gem) = b9d474a97e3f64535c094d133bd337329d888acd
-Size (actionpack-3.1.3.gem) = 369664 bytes
-SHA1 (patch-lib_action__view_helpers_capture__helper.rb) = b1cbedccc782ac4c669c9360e003a1e38fc0baf2
+SHA1 (actionpack-3.1.4.gem) = cf6ce37c07f835d48a43e4f8c8282c2184c7950e
+RMD160 (actionpack-3.1.4.gem) = 4e7a578d72fb720b47a6b9f26a637d6476549d0f
+Size (actionpack-3.1.4.gem) = 366592 bytes
diff --git a/www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb b/www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb
deleted file mode 100644
index 7c8c07b36b5..00000000000
--- a/www/ruby-actionpack31/patches/patch-lib_action__view_helpers_capture__helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_action__view_helpers_capture__helper.rb,v 1.1 2012/03/03 04:47:14 taca Exp $
-
-Fix for CVE-2012-1099.
-
---- lib/action_view/helpers/capture_helper.rb.orig	2012-03-03 04:18:29.000000000 +0000
-+++ lib/action_view/helpers/capture_helper.rb
-@@ -194,7 +194,7 @@ module ActionView
-       def flush_output_buffer #:nodoc:
-         if output_buffer && !output_buffer.empty?
-           response.body_parts << output_buffer
--          self.output_buffer = output_buffer[0,0]
-+          self.output_buffer = output_buffer.respond_to?(:clone_empty) ? output_buffer.clone_empty : output_buffer[0, 0]
-           nil
-         end
-       end