This updates capybara-webkit to 1.11.1 (the latest version), and capybara to 2.7.1 (the latest version supported by capybara-webkit).
This also adds USE_WXNEEDED to capybara-webkit, which is necessary as it runs W|X code in a separate executable. I'm not use if USE_WXNEEDED by itself is sufficient, so this adds LDFLAGS, as well as a patch to the qmake file to make sure LDFLAGS is respected. Note that in order for capybara-webkit to work with Xvfb, you need the qt5 patch I just sent. Tested on amd64. I'll be committing in a few days unless I hear objections. Thanks, Jeremy Index: ruby-capybara/Makefile =================================================================== RCS file: /cvs/ports/www/ruby-capybara/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- ruby-capybara/Makefile 1 Apr 2015 20:53:19 -0000 1.4 +++ ruby-capybara/Makefile 21 Sep 2016 18:32:37 -0000 @@ -2,7 +2,7 @@ COMMENT = integration testing tool for rack based web applications -DISTNAME = capybara-2.4.4 +DISTNAME = capybara-2.7.1 CATEGORIES = www HOMEPAGE= https://github.com/jnicklas/capybara @@ -16,6 +16,7 @@ CONFIGURE_STYLE = ruby gem BUILD_DEPENDS = ${RUN_DEPENDS} RUN_DEPENDS = mail/ruby-mime-types,${MODRUBY_FLAVOR}>=1.16 \ textproc/ruby-nokogiri,${MODRUBY_FLAVOR}>=1.3.3 \ + www/ruby-addressable,${MODRUBY_FLAVOR} \ www/ruby-rack,${MODRUBY_FLAVOR}>=1.0.0 \ www/ruby-rack-test,${MODRUBY_FLAVOR}>=0.5.4 \ www/ruby-xpath,${MODRUBY_FLAVOR}>=2.0,<3 Index: ruby-capybara/distinfo =================================================================== RCS file: /cvs/ports/www/ruby-capybara/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- ruby-capybara/distinfo 1 Apr 2015 20:53:19 -0000 1.2 +++ ruby-capybara/distinfo 21 Sep 2016 18:32:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (capybara-2.4.4.gem) = jig1f729jffYxW09cvqKXvOlpxuKv76cHHc5S2Ink4Q= -SIZE (capybara-2.4.4.gem) = 232448 +SHA256 (capybara-2.7.1.gem) = LAEM77NucBvFdiI8h37Rc7MW0G5dUFEuskLN5Ie+1RM= +SIZE (capybara-2.7.1.gem) = 227328 Index: ruby-capybara/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/ruby-capybara/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- ruby-capybara/pkg/PLIST 1 Apr 2015 20:53:19 -0000 1.2 +++ ruby-capybara/pkg/PLIST 21 Sep 2016 18:32:37 -0000 @@ -24,6 +24,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/node/simple.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/base_query.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/current_path_query.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/match_query.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/selector_query.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/text_query.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/queries/title_query.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/query.rb @@ -39,12 +42,16 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/rspec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/rspec/features.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/rspec/matchers.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selector/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selector.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selector/filter.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selenium/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selenium/driver.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/selenium/node.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/server.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/session/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/session.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/session/matchers.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/fixtures/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/fixtures/another_test_file.txt @@ -59,6 +66,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/accept_confirm_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/accept_prompt_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/all_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_current_path.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_selector.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_text.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/assert_title.rb @@ -73,6 +81,11 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/current_url_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/dismiss_confirm_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/dismiss_prompt_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/element/ +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/element/assert_match_selector.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/element/match_css_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/element/match_xpath_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/element/matches_selector_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/evaluate_script_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/execute_script_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/fill_in_spec.rb @@ -86,6 +99,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/go_forward_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/has_button_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/has_css_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/has_current_path_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/has_field_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/has_link_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/has_select_spec.rb @@ -99,10 +113,13 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/node_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/reset_session_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/response_code.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/save_and_open_page_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/save_and_open_screenshot_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/save_page_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/save_screenshot_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/screenshot_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/select_spec.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/selectors_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/source_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/text_spec.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/session/title_spec.rb @@ -132,6 +149,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/frame_two.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/header_links.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/host_links.erb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/path.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/popup_one.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/popup_two.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/postback.erb @@ -144,7 +162,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_js.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_scope.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_simple_html.erb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_slow_unload.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_title.erb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_unload_alert.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/with_windows.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/spec/views/within_frames.erb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/version.rb @@ -161,7 +181,10 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/result_ ${GEM_LIB}/gems/${DISTNAME}/spec/rspec/ ${GEM_LIB}/gems/${DISTNAME}/spec/rspec/features_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/rspec/matchers_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/rspec/scenarios_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/rspec/views_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/rspec_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/selector_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/selenium_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/selenium_spec_chrome.rb ${GEM_LIB}/gems/${DISTNAME}/spec/server_spec.rb Index: ruby-capybara-webkit/Makefile =================================================================== RCS file: /cvs/ports/www/ruby-capybara-webkit/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- ruby-capybara-webkit/Makefile 26 Jul 2015 03:20:01 -0000 1.11 +++ ruby-capybara-webkit/Makefile 21 Sep 2016 18:32:37 -0000 @@ -2,7 +2,7 @@ COMMENT = capybara driver that uses WebKit -DISTNAME = capybara-webkit-1.6.0 +DISTNAME = capybara-webkit-1.11.1 CATEGORIES = www HOMEPAGE= https://github.com/thoughtbot/capybara-webkit @@ -13,12 +13,13 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/ruby CONFIGURE_STYLE = ruby gem ext -MAKE_ENV = QMAKE=qmake-qt5 -WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets -WANTLIB += Qt5Widgets stdc++ +USE_WXNEEDED = Yes +MAKE_ENV = QMAKE=qmake-qt5 LDFLAGS="-Wl,-z,wxneeded" +WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets +WANTLIB += Qt5Widgets stdc++ BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<2.5.0 \ +RUN_DEPENDS = www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<2.8.0 \ x11/qt5 .include <bsd.port.mk> Index: ruby-capybara-webkit/distinfo =================================================================== RCS file: /cvs/ports/www/ruby-capybara-webkit/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- ruby-capybara-webkit/distinfo 26 Jul 2015 03:20:01 -0000 1.3 +++ ruby-capybara-webkit/distinfo 21 Sep 2016 18:32:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (capybara-webkit-1.6.0.gem) = 8Gh/WUsQtFxkxl2Ptug1S+pg/P665n6O6aGJ9k0TPOo= -SIZE (capybara-webkit-1.6.0.gem) = 90624 +SHA256 (capybara-webkit-1.11.1.gem) = 8m7w3Jv7aceB/ESQ3cAPkQshv0SyIuFJ2Kh/bopzf7Q= +SIZE (capybara-webkit-1.11.1.gem) = 91648 Index: ruby-capybara-webkit/patches/patch-src_webkit_server_pro =================================================================== RCS file: ruby-capybara-webkit/patches/patch-src_webkit_server_pro diff -N ruby-capybara-webkit/patches/patch-src_webkit_server_pro --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ruby-capybara-webkit/patches/patch-src_webkit_server_pro 21 Sep 2016 18:32:37 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- src/webkit_server.pro.orig Wed May 4 06:52:17 2016 ++++ src/webkit_server.pro Tue Sep 20 15:03:47 2016 +@@ -1,6 +1,9 @@ + TEMPLATE = app + TARGET = webkit_server + DESTDIR = . ++QMAKE_CXXFLAGS += $$(CXXFLAGS) ++QMAKE_CFLAGS += $$(CFLAGS) ++QMAKE_LFLAGS += $$(LDFLAGS) + PROJECT_DIR = $$_PRO_FILE_PWD_ + BUILD_DIR = $${PROJECT_DIR}/build + PRECOMPILED_DIR = $${BUILD_DIR} Index: ruby-capybara-webkit/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/ruby-capybara-webkit/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- ruby-capybara-webkit/pkg/PLIST 26 Jul 2015 03:20:01 -0000 1.4 +++ ruby-capybara-webkit/pkg/PLIST 21 Sep 2016 18:32:37 -0000 @@ -6,7 +6,6 @@ ${GEM_LIB}/gems/${DISTNAME}/.rspec ${GEM_LIB}/gems/${DISTNAME}/.travis.yml ${GEM_LIB}/gems/${DISTNAME}/Appraisals ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md -${GEM_LIB}/gems/${DISTNAME}/GOALS ${GEM_LIB}/gems/${DISTNAME}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/Gemfile.lock ${GEM_LIB}/gems/${DISTNAME}/LICENSE @@ -21,10 +20,9 @@ ${GEM_LIB}/gems/${DISTNAME}/bin/Info.pli ${GEM_LIB}/gems/${DISTNAME}/capybara-webkit.gemspec ${GEM_LIB}/gems/${DISTNAME}/extconf.rb ${GEM_LIB}/gems/${DISTNAME}/gemfiles/ -${GEM_LIB}/gems/${DISTNAME}/gemfiles/2.3.gemfile -${GEM_LIB}/gems/${DISTNAME}/gemfiles/2.3.gemfile.lock -${GEM_LIB}/gems/${DISTNAME}/gemfiles/2.4.gemfile -${GEM_LIB}/gems/${DISTNAME}/gemfiles/2.4.gemfile.lock +${GEM_LIB}/gems/${DISTNAME}/gemfiles/2.6.gemfile +${GEM_LIB}/gems/${DISTNAME}/gemfiles/2.7.gemfile +${GEM_LIB}/gems/${DISTNAME}/gemfiles/master.gemfile ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara-webkit.rb @@ -38,6 +36,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/capybara ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/webkit/errors.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/webkit/matchers.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/webkit/node.rb +${GEM_LIB}/gems/${DISTNAME}/lib/capybara/webkit/server.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara/webkit/version.rb ${GEM_LIB}/gems/${DISTNAME}/lib/capybara_webkit_builder.rb ${GEM_LIB}/gems/${DISTNAME}/spec/ @@ -54,9 +53,13 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/integra ${GEM_LIB}/gems/${DISTNAME}/spec/integration/session_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/selenium_compatibility_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/self_signed_ssl_cert.rb +${GEM_LIB}/gems/${DISTNAME}/spec/server_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/spec_helper.rb ${GEM_LIB}/gems/${DISTNAME}/spec/support/ ${GEM_LIB}/gems/${DISTNAME}/spec/support/app_runner.rb +${GEM_LIB}/gems/${DISTNAME}/spec/support/matchers/ +${GEM_LIB}/gems/${DISTNAME}/spec/support/matchers/include_response.rb +${GEM_LIB}/gems/${DISTNAME}/spec/support/output_writer.rb ${GEM_LIB}/gems/${DISTNAME}/templates/ ${GEM_LIB}/gems/${DISTNAME}/templates/Command.cpp ${GEM_LIB}/gems/${DISTNAME}/templates/Command.h
