This updates sinatra to the current version.  There's three years of
changes since the current ports version, see:
https://github.com/sinatra/sinatra/blob/master/CHANGES

Tested on amd64.  I plan to commit this on Friday unless I hear
objections.

Thanks,
Jeremy

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/ruby-sinatra/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile    26 Oct 2013 23:55:38 -0000      1.19
+++ Makefile    4 Jun 2014 19:53:39 -0000
@@ -2,8 +2,7 @@
 
 COMMENT =      DSL for quickly creating web-applications in Ruby
 
-DISTNAME =     sinatra-1.2.1
-REVISION=      2
+DISTNAME =     sinatra-1.4.5
 CATEGORIES =   www
 
 HOMEPAGE =     http://www.sinatrarb.com/
@@ -16,12 +15,17 @@ MODULES =           lang/ruby
 CONFIGURE_STYLE =      ruby gem
 
 BUILD_DEPENDS =                ${RUN_DEPENDS}
-RUN_DEPENDS =          devel/ruby-tilt,${MODRUBY_FLAVOR}>=1.2.2,<2.0 \
-                       www/ruby-rack,${MODRUBY_FLAVOR}>=1.1,<2.0
-
-MODRUBY_TEST = rake
-
-TEST_DEPENDS = textproc/ruby-haml,${MODRUBY_FLAVOR} \
+RUN_DEPENDS =          devel/ruby-tilt,${MODRUBY_FLAVOR}>=1.3.4,<2.0 \
+                       www/ruby-rack,${MODRUBY_FLAVOR}>=1.4,<2.0 \
+                       www/ruby-rack-protection,${MODRUBY_FLAVOR}>=1.4,<2.0
+
+MODRUBY_TEST =         testrb
+MODRUBY_TEST_TARGET =  test/*_test.rb
+MODRUBY_TEST_ENV =     RUBYOPT=-rubygems
+
+TEST_DEPENDS =         ${MODRUBY_ICONV_DEPENDS} \
+                       converters/ruby-json,${MODRUBY_FLAVOR} \
+                       textproc/ruby-haml,${MODRUBY_FLAVOR} \
                        textproc/ruby-builder,${MODRUBY_FLAVOR} \
                        www/ruby-rack-test,${MODRUBY_FLAVOR}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/ruby-sinatra/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo    24 Mar 2011 03:16:46 -0000      1.8
+++ distinfo    4 Jun 2014 19:39:13 -0000
@@ -1,5 +1,2 @@
-MD5 (sinatra-1.2.1.gem) = hIXYWuwWNlk8VyZRqvSKrw==
-RMD160 (sinatra-1.2.1.gem) = VVaIHcE7UZxtntRH8Tt5oYr9uR4=
-SHA1 (sinatra-1.2.1.gem) = jMxhfZWTjWcsZN56YUN197YAJNE=
-SHA256 (sinatra-1.2.1.gem) = gI39xfVTtC3i3k57g9HEgyIxBXAi6n5r7moN7UcfMbY=
-SIZE (sinatra-1.2.1.gem) = 238592
+SHA256 (sinatra-1.4.5.gem) = OoCDMYk4BICQAhSBWBFY7eAeR2WdBtGS+Xpb+vlQ1mM=
+SIZE (sinatra-1.4.5.gem) = 346624
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/ruby-sinatra/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   24 Mar 2011 03:16:46 -0000      1.8
+++ pkg/PLIST   4 Jun 2014 19:39:29 -0000
@@ -1,20 +1,27 @@
 @comment $OpenBSD: PLIST,v 1.8 2011/03/24 03:16:46 jeremy Exp $
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
+${GEM_LIB}/gems/${DISTNAME}/.yardopts
 ${GEM_LIB}/gems/${DISTNAME}/AUTHORS
 ${GEM_LIB}/gems/${DISTNAME}/CHANGES
 ${GEM_LIB}/gems/${DISTNAME}/Gemfile
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE
-${GEM_LIB}/gems/${DISTNAME}/README.de.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.es.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.fr.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.hu.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.jp.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.pt-br.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.ru.rdoc
-${GEM_LIB}/gems/${DISTNAME}/README.zh.rdoc
+${GEM_LIB}/gems/${DISTNAME}/README.de.md
+${GEM_LIB}/gems/${DISTNAME}/README.es.md
+${GEM_LIB}/gems/${DISTNAME}/README.fr.md
+${GEM_LIB}/gems/${DISTNAME}/README.hu.md
+${GEM_LIB}/gems/${DISTNAME}/README.ja.md
+${GEM_LIB}/gems/${DISTNAME}/README.ko.md
+${GEM_LIB}/gems/${DISTNAME}/README.md
+${GEM_LIB}/gems/${DISTNAME}/README.pt-br.md
+${GEM_LIB}/gems/${DISTNAME}/README.pt-pt.md
+${GEM_LIB}/gems/${DISTNAME}/README.ru.md
+${GEM_LIB}/gems/${DISTNAME}/README.zh.md
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
+${GEM_LIB}/gems/${DISTNAME}/examples/
+${GEM_LIB}/gems/${DISTNAME}/examples/chat.rb
+${GEM_LIB}/gems/${DISTNAME}/examples/simple.rb
+${GEM_LIB}/gems/${DISTNAME}/examples/stream.ru
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/
 ${GEM_LIB}/gems/${DISTNAME}/lib/sinatra.rb
@@ -23,33 +30,44 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/
 ${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/images/404.png
 ${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/images/500.png
 ${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/main.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/showexceptions.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/show_exceptions.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/sinatra/version.rb
 ${GEM_LIB}/gems/${DISTNAME}/sinatra.gemspec
 ${GEM_LIB}/gems/${DISTNAME}/test/
+${GEM_LIB}/gems/${DISTNAME}/test/asciidoctor_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/base_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/builder_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/coffee_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/compile_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/contest.rb
+${GEM_LIB}/gems/${DISTNAME}/test/creole_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/delegator_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/encoding_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/erb_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/erubis_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/extensions_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/filter_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/haml_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/hello.mab
 ${GEM_LIB}/gems/${DISTNAME}/test/helper.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/helpers_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/integration/
+${GEM_LIB}/gems/${DISTNAME}/test/integration/app.rb
+${GEM_LIB}/gems/${DISTNAME}/test/integration_helper.rb
+${GEM_LIB}/gems/${DISTNAME}/test/integration_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/less_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/liquid_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/mapped_error_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/markaby_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/markdown_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/mediawiki_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/middleware_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/nokogiri_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/public/
 ${GEM_LIB}/gems/${DISTNAME}/test/public/favicon.ico
+${GEM_LIB}/gems/${DISTNAME}/test/rabl_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/rack_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/radius_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/rdoc_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/readme_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/request_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/response_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/result_test.rb
@@ -62,6 +80,8 @@ ${GEM_LIB}/gems/${DISTNAME}/test/setting
 ${GEM_LIB}/gems/${DISTNAME}/test/sinatra_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/slim_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/static_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/streaming_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/stylus_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/templates_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/textile_test.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/views/
@@ -73,41 +93,49 @@ ${GEM_LIB}/gems/${DISTNAME}/test/views/b
 ${GEM_LIB}/gems/${DISTNAME}/test/views/calc.html.erb
 ${GEM_LIB}/gems/${DISTNAME}/test/views/error.builder
 ${GEM_LIB}/gems/${DISTNAME}/test/views/error.erb
-${GEM_LIB}/gems/${DISTNAME}/test/views/error.erubis
 ${GEM_LIB}/gems/${DISTNAME}/test/views/error.haml
 ${GEM_LIB}/gems/${DISTNAME}/test/views/error.sass
 ${GEM_LIB}/gems/${DISTNAME}/test/views/explicitly_nested.str
 ${GEM_LIB}/gems/${DISTNAME}/test/views/foo/
 ${GEM_LIB}/gems/${DISTNAME}/test/views/foo/hello.test
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.asciidoc
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.builder
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.coffee
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.creole
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.erb
-${GEM_LIB}/gems/${DISTNAME}/test/views/hello.erubis
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.haml
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.less
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.liquid
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.mab
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.md
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.mediawiki
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.nokogiri
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.rabl
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.radius
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.rdoc
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.sass
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.scss
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.slim
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.str
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.styl
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.test
 ${GEM_LIB}/gems/${DISTNAME}/test/views/hello.textile
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.wlang
+${GEM_LIB}/gems/${DISTNAME}/test/views/hello.yajl
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.builder
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.erb
-${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.erubis
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.haml
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.liquid
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.mab
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.nokogiri
+${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.rabl
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.radius
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.slim
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.str
 ${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.test
+${GEM_LIB}/gems/${DISTNAME}/test/views/layout2.wlang
 ${GEM_LIB}/gems/${DISTNAME}/test/views/nested.str
 ${GEM_LIB}/gems/${DISTNAME}/test/views/utf8.erb
+${GEM_LIB}/gems/${DISTNAME}/test/wlang_test.rb
+${GEM_LIB}/gems/${DISTNAME}/test/yajl_test.rb
 ${GEM_LIB}/specifications/${DISTNAME}.gemspec

Reply via email to