Update ruby-sinatra to 1.4.3.

= 1.4.3 / 2013-06-07

 * Running a Sinatra file directly or via `run!` it will now ignore an
   empty $PORT env variable. (noxqsgit)

 * Improve documentation. (burningTyger, Patricio Mac Adden,
   Konstantin Haase, Diogo Scudelletti, Dominic Imhof)

 * Expose matched pattern as env["sinatra.route"]. (Aman Gupta)

 * Fix warning on Ruby 2.0. (Craig Little)

 * Improve running subset of tests in isolation. (Viliam Pucik)

 * Reorder private/public methods. (Patricio Mac Adden)

 * Loosen version dependency for rack, so it runs with Rails 3.2.
   (Konstantin Haase)

 * Request#accept? now returns true instead of a truthy value. (Alan Harris)

= 1.4.2 / 2013-03-21

 * Fix parsing error for case where both the pattern and the captured part
   contain a dot. (Florian Hanke, Konstantin Haase)

 * Missing Accept header is treated like */*. (Greg Denton)

 * Improve documentation. (Patricio Mac Adden, Joe Bottigliero)

= 1.4.1 / 2013-03-15

 * Make delegated methods available in config.ru (Konstantin Haase)

= 1.4.0 / 2013-03-15

 * Add support for LINK and UNLINK requests. (Konstantin Haase)

 * Add support for Yajl templates. (Jamie Hodge)

 * Add support for Rabl templates. (Jesse Cooke)

 * Add support for Wlang templates. (Bernard Lambeau)

 * Add support for Stylus templates. (Juan David Pastas, Konstantin Haase)

 * You can now pass a block to ERb, Haml, Slim, Liquid and Wlang templates,
   which will be used when calling `yield` in the template. (Alexey Muranov)

 * When running in classic mode, no longer include Sinatra::Delegator in Object,
   instead extend the main object only. (Konstantin Haase)

 * Improved route parsing: "/:name.?:format?" with "/foo.png" now matches to
   {name: "foo", format: "png"} instead of {name: "foo.png"}. (Florian Hanke)

 * Add :status option support to send_file. (Konstantin Haase)

 * The `provides` condition now respects an earlier set content type.
   (Konstantin Haase)

 * Exception#code is only used when :use_code is enabled. Moreover, it will
   be ignored if the value is not between 400 and 599. You should use
   Exception#http_status instead. (Konstantin Haase)

 * Status, headers and body will be set correctly in an after filter when using
   halt in a before filter or route. (Konstantin Haase)

 * Sinatra::Base.new now returns a Sinatra::Wrapper instance, exposing
   #settings and #helpers, yet going through the middleware stack on #call.
   It also implements a nice #inspect, so it plays nice with Rails' `rake
   routes`. (Konstantin Haase)

 * In addition to WebRick, Thin and Mongrel, Sinatra will now automatically pick
   up Puma, Trinidad, ControlTower or Net::HTTP::Server when installed. The
   logic for picking the server has been improved and now depends on the Ruby
   implementation used. (Mark Rada, Konstantin Haase, Patricio Mac Adden)

 * "Sinatra doesn't know this ditty" pages now show the app class when running
   a modular application. This helps detecting where the response came from when
   combining multiple modular apps. (Konstantin Haase)

 * When port is not set explicitly, use $PORT env variable if set and only
   default to 4567 if not. Plays nice with foreman. (Konstantin Haase)

 * Allow setting layout on a per engine basis. (Zachary Scott, Konstantin Haase)

 * You can now use `register` directly in a classic app. (Konstantin Haase)

 * `redirect` now accepts URI or Addressable::URI instances. (Nicolas
   Sanguinetti)

 * Have Content-Disposition header also include file name for `inline`, not
   just for `attachment`. (Konstantin Haase)

 * Better compatibility to Rack 1.5. (James Tucker, Konstantin Haase)

 * Make route parsing regex more robust. (Zoltan Dezso, Konstantin Haase)

 * Improve Accept header parsing, expose parameters. (Pieter van de Bruggen,
   Konstantin Haase)

 * Add `layout_options` render option. Allows you, amongst other things, to
   render a layout from a different folder. (Konstantin Haase)

 * Explicitly setting `layout` to `nil` is treated like setting it to `false`.
   (richo)

 * Properly escape attributes in Content-Type header. (Pieter van de Bruggen)

 * Default to only serving localhost in development mode. (Postmodern)

 * Setting status code to 404 in error handler no longer triggers not_found
   handler. (Konstantin Haase)

 * The `protection` option now takes a `session` key for force
   disabling/enabling session based protections. (Konstantin Haase)

 * Add `x_cascade` option to disable `X-Cascade` header on missing route.
   (Konstantin Haase)

 * Improve documentation. (Kashyap, Stanislav Chistenko, Zachary Scott,
   Anthony Accomazzo, Peter Suschlik, Rachel Mehl, ymmtmsys, Anurag Priyam,
   burningTyger, Tony Miller, akicho8, Vasily Polovnyov, Markus Prinz,
   Alexey Muranov, Erik Johnson, Vipul A M, Konstantin Haase)

 * Convert documentation to Markdown. (Kashyap, Robin Dupret, burningTyger,
   Vasily Polovnyov, Iain Barnett, Giuseppe Capizzi, Neil West)

 * Don't set not_found content type to HTML in development mode with custom
   not_found handler. (Konstantin Haase)

 * Fix mixed indentation for private methods. (Robin Dupret)

 * Recalculate Content-Length even if hard coded if body is reset. Relevant
   mostly for error handlers. (Nathan Esquenazi, Konstantin Haase)

 * Plus sign is once again kept as such when used for URL matches. (Konstantin
   Haase)

 * Take views option into account for template caching. (Konstantin Haase)

 * Consistent use of `headers` instead of `header` internally. (Patricio Mac Adden)

 * Fix compatibility to RDoc 4. (Bohuslav Kabrda)

 * Make chat example work with latest jQuery. (loveky, Tony Miller)

 * Make tests run without warnings. (Patricio Mac Adden)

 * Make sure value returned by `mime_type` is a String or nil, even when a
   different object is passed in, like an AcceptEntry. (Konstantin Haase)

 * Exceptions in `after` filter are now handled like any other exception.
   (Nathan Esquenazi)

3 files changed, 31 insertions, 20 deletions

diff --git a/www/ruby-sinatra/Makefile b/www/ruby-sinatra/Makefile
index 211a24f305a..b32a248a2f8 100644
--- a/www/ruby-sinatra/Makefile
+++ b/www/ruby-sinatra/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/03/16 12:39:22 obache Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/16 09:12:18 obache Exp $
 
-DISTNAME=	sinatra-1.3.6
+DISTNAME=	sinatra-1.4.3
 CATEGORIES=	www
 
 MAINTAINER=	obache@NetBSD.org
@@ -9,8 +9,8 @@ COMMENT=	Classy web-development dressed in a DSL
 LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-rack>=1.4<2:../../www/ruby-rack
-DEPENDS+=	${RUBY_PKGPREFIX}-rack-protection>=1.3<2:../../www/ruby-rack-protection
-DEPENDS+=	${RUBY_PKGPREFIX}-tilt>=1.3.3<2:../../textproc/ruby-tilt
+DEPENDS+=	${RUBY_PKGPREFIX}-rack-protection>=1.4<2:../../www/ruby-rack-protection
+DEPENDS+=	${RUBY_PKGPREFIX}-tilt>=1.3.4<2:../../textproc/ruby-tilt
 
 RUBY_RDOC_REQD=	3.0
 
diff --git a/www/ruby-sinatra/PLIST b/www/ruby-sinatra/PLIST
index 4fc6d837b8e..4c86004c304 100644
--- a/www/ruby-sinatra/PLIST
+++ b/www/ruby-sinatra/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.5 2012/09/16 13:39:33 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/06/16 09:12:18 obache Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.yardopts
 ${GEM_LIBDIR}/AUTHORS
 ${GEM_LIBDIR}/CHANGES
 ${GEM_LIBDIR}/Gemfile
 ${GEM_LIBDIR}/LICENSE
-${GEM_LIBDIR}/README.de.rdoc
-${GEM_LIBDIR}/README.es.rdoc
-${GEM_LIBDIR}/README.fr.rdoc
-${GEM_LIBDIR}/README.hu.rdoc
-${GEM_LIBDIR}/README.jp.rdoc
-${GEM_LIBDIR}/README.ko.rdoc
-${GEM_LIBDIR}/README.pt-br.rdoc
-${GEM_LIBDIR}/README.pt-pt.rdoc
-${GEM_LIBDIR}/README.rdoc
-${GEM_LIBDIR}/README.ru.rdoc
-${GEM_LIBDIR}/README.zh.rdoc
+${GEM_LIBDIR}/README.de.md
+${GEM_LIBDIR}/README.es.md
+${GEM_LIBDIR}/README.fr.md
+${GEM_LIBDIR}/README.hu.md
+${GEM_LIBDIR}/README.jp.md
+${GEM_LIBDIR}/README.ko.md
+${GEM_LIBDIR}/README.md
+${GEM_LIBDIR}/README.pt-br.md
+${GEM_LIBDIR}/README.pt-pt.md
+${GEM_LIBDIR}/README.ru.md
+${GEM_LIBDIR}/README.zh.md
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/examples/chat.rb
 ${GEM_LIBDIR}/examples/simple.rb
@@ -31,6 +31,7 @@ ${GEM_LIBDIR}/sinatra.gemspec
 ${GEM_LIBDIR}/test/base_test.rb
 ${GEM_LIBDIR}/test/builder_test.rb
 ${GEM_LIBDIR}/test/coffee_test.rb
+${GEM_LIBDIR}/test/compile_test.rb
 ${GEM_LIBDIR}/test/contest.rb
 ${GEM_LIBDIR}/test/creole_test.rb
 ${GEM_LIBDIR}/test/delegator_test.rb
@@ -52,6 +53,7 @@ ${GEM_LIBDIR}/test/markdown_test.rb
 ${GEM_LIBDIR}/test/middleware_test.rb
 ${GEM_LIBDIR}/test/nokogiri_test.rb
 ${GEM_LIBDIR}/test/public/favicon.ico
+${GEM_LIBDIR}/test/rabl_test.rb
 ${GEM_LIBDIR}/test/rack_test.rb
 ${GEM_LIBDIR}/test/radius_test.rb
 ${GEM_LIBDIR}/test/rdoc_test.rb
@@ -69,6 +71,7 @@ ${GEM_LIBDIR}/test/sinatra_test.rb
 ${GEM_LIBDIR}/test/slim_test.rb
 ${GEM_LIBDIR}/test/static_test.rb
 ${GEM_LIBDIR}/test/streaming_test.rb
+${GEM_LIBDIR}/test/stylus_test.rb
 ${GEM_LIBDIR}/test/templates_test.rb
 ${GEM_LIBDIR}/test/textile_test.rb
 ${GEM_LIBDIR}/test/views/a/in_a.str
@@ -91,24 +94,32 @@ ${GEM_LIBDIR}/test/views/hello.liquid
 ${GEM_LIBDIR}/test/views/hello.mab
 ${GEM_LIBDIR}/test/views/hello.md
 ${GEM_LIBDIR}/test/views/hello.nokogiri
+${GEM_LIBDIR}/test/views/hello.rabl
 ${GEM_LIBDIR}/test/views/hello.radius
 ${GEM_LIBDIR}/test/views/hello.rdoc
 ${GEM_LIBDIR}/test/views/hello.sass
 ${GEM_LIBDIR}/test/views/hello.scss
 ${GEM_LIBDIR}/test/views/hello.slim
 ${GEM_LIBDIR}/test/views/hello.str
+${GEM_LIBDIR}/test/views/hello.styl
 ${GEM_LIBDIR}/test/views/hello.test
 ${GEM_LIBDIR}/test/views/hello.textile
+${GEM_LIBDIR}/test/views/hello.wlang
+${GEM_LIBDIR}/test/views/hello.yajl
 ${GEM_LIBDIR}/test/views/layout2.builder
 ${GEM_LIBDIR}/test/views/layout2.erb
 ${GEM_LIBDIR}/test/views/layout2.haml
 ${GEM_LIBDIR}/test/views/layout2.liquid
 ${GEM_LIBDIR}/test/views/layout2.mab
 ${GEM_LIBDIR}/test/views/layout2.nokogiri
+${GEM_LIBDIR}/test/views/layout2.rabl
 ${GEM_LIBDIR}/test/views/layout2.radius
 ${GEM_LIBDIR}/test/views/layout2.slim
 ${GEM_LIBDIR}/test/views/layout2.str
 ${GEM_LIBDIR}/test/views/layout2.test
+${GEM_LIBDIR}/test/views/layout2.wlang
 ${GEM_LIBDIR}/test/views/nested.str
 ${GEM_LIBDIR}/test/views/utf8.erb
+${GEM_LIBDIR}/test/wlang_test.rb
+${GEM_LIBDIR}/test/yajl_test.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/www/ruby-sinatra/distinfo b/www/ruby-sinatra/distinfo
index 5c8d9f5e212..98d88beaadf 100644
--- a/www/ruby-sinatra/distinfo
+++ b/www/ruby-sinatra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2013/03/16 12:39:22 obache Exp $
+$NetBSD: distinfo,v 1.9 2013/06/16 09:12:18 obache Exp $
 
-SHA1 (sinatra-1.3.6.gem) = a1be5a671e8ad47f541ec37167ead8b7a00c826c
-RMD160 (sinatra-1.3.6.gem) = 06c1a298263429114720b44813a667ea89742e5d
-Size (sinatra-1.3.6.gem) = 307712 bytes
+SHA1 (sinatra-1.4.3.gem) = 7797b774826fdc433d7fd49cf3efa5a1eb3d288c
+RMD160 (sinatra-1.4.3.gem) = fe14fd76d34e94fd59a302f097e82381383f48f0
+Size (sinatra-1.4.3.gem) = 333312 bytes