update to i3-4.22, this now has the functionality from i3-gaps

merged in (the separate i3-gaps port is untouched for now)

x11/i3/Makefile

@@ -1,6 +1,6 @@
 COMMENT=	improved dynamic tiling window manager
 
-DISTNAME=	i3-4.21.1
+DISTNAME=	i3-4.22
 
 CATEGORIES=	x11
 

x11/i3/distinfo

@@ -1,2 +1,2 @@
-SHA256 (i3-4.21.1.tar.xz) = 7f14EoXGVKBdxtsnLOAwDEQo5vvYddmZZOV94ltBvB4=
-SIZE (i3-4.21.1.tar.xz) = 1297400
+SHA256 (i3-4.22.tar.xz) = KGOZEeWdlWOfCSZCqYL14d6lkiUMK1zpjtoQCDNRPks=
+SIZE (i3-4.22.tar.xz) = 1349276

x11/i3/patches/patch-i3-dmenu-desktop

@@ -1,7 +1,7 @@
 Index: i3-dmenu-desktop
 --- i3-dmenu-desktop.orig
 +++ i3-dmenu-desktop
-@@ -112,7 +112,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
+@@ -114,7 +114,7 @@ $xdg_data_home = $ENV{HOME} . '/.local/share' if
      ! -d $xdg_data_home;
  
  my $xdg_data_dirs = $ENV{XDG_DATA_DIRS};
@@ -10,7 +10,7 @@ Index: i3-dmenu-desktop
      !defined($xdg_data_dirs) ||
      $xdg_data_dirs eq '';
  
-@@ -226,12 +226,12 @@ for my $file (values %desktops) {
+@@ -228,12 +228,12 @@ for my $file (values %desktops) {
  #     'evince.desktop' => {
  #         'Exec' => 'evince %U',
  #         'Name' => 'Dokumentenbetrachter',
@@ -25,7 +25,7 @@ Index: i3-dmenu-desktop
  #       }
  #   };
  
-@@ -474,7 +474,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
+@@ -481,7 +481,7 @@ if (exists($app->{Terminal}) && $app->{Terminal}) {
      # we need to create a temporary script that contains the full command line
      # as the syntax for starting commands with arguments varies from terminal
      # emulator to terminal emulator.
@@ -34,7 +34,7 @@ Index: i3-dmenu-desktop
      my ($fh, $filename) = tempfile();
      binmode($fh, ':utf8');
      say $fh <<EOT;
-@@ -485,7 +485,7 @@ EOT
+@@ -492,7 +492,7 @@ EOT
      close($fh);
      chmod 0755, $filename;
  
@@ -43,7 +43,7 @@ Index: i3-dmenu-desktop
  } else {
      # i3 executes applications by passing the argument to i3’s “exec” command
      # as-is to $SHELL -c. The i3 parser supports quoted strings: When a string
-@@ -528,7 +528,7 @@ notifications.
+@@ -535,7 +535,7 @@ notifications.
  
  The .desktop files are searched in $XDG_DATA_HOME/applications (by default
  $HOME/.local/share/applications) and in the "applications" subdirectory of each
@@ -52,7 +52,7 @@ Index: i3-dmenu-desktop
  
  Files with the same name in $XDG_DATA_HOME/applications take precedence over
  files in $XDG_DATA_DIRS, so that you can overwrite parts of the system-wide
-@@ -542,7 +542,7 @@ file respectively) by appending it to the name of the 
+@@ -549,7 +549,7 @@ file respectively) by appending it to the name of the 
  want to launch "GNU Emacs 24" with the patch /tmp/foobar.txt, you would type
  "emacs", press TAB, type " /tmp/foobar.txt" and press ENTER.
  

x11/i3/patches/patch-meson_build

@@ -13,7 +13,7 @@ Index: meson.build
  # Instead of generating config.h directly, make vcs_tag generate it so that
  # @VCS_TAG@ is replaced.
  config_h_in = configure_file(
-@@ -608,7 +610,7 @@ install_headers(
+@@ -610,7 +612,7 @@ install_headers(
  # because configure_file strips the backslash in e.g. \@display,
  # resulting in @display, breaking our Perl code:
  # https://github.com/mesonbuild/meson/issues/7165

x11/i3/patches/patch-src_bindings_c

@@ -1,7 +1,7 @@
 Index: src/bindings.c
 --- src/bindings.c.orig
 +++ src/bindings.c
-@@ -851,7 +851,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
+@@ -855,7 +855,7 @@ CommandResult *run_binding(Binding *bind, Con *con) {
  
      if (result->parse_error) {
          char *pageraction;

x11/i3/pkg/PLIST

@@ -34,6 +34,7 @@ share/applications/i3.desktop
 share/doc/i3/
 share/doc/i3/bigpicture.png
 share/doc/i3/debugging.html
+share/doc/i3/gaps1920.png
 share/doc/i3/hacking-howto.html
 share/doc/i3/i3-sync-working.png
 share/doc/i3/i3-sync.png