Merge branch 'master' into gnome-3.22

16 files changed, 181 insertions, 67 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 8b2577d07905..396b237c93a1 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -106,6 +106,7 @@
     SUBDIR += selectwm
     SUBDIR += simple-ccsm
     SUBDIR += spectrwm
+    SUBDIR += subtle
     SUBDIR += swm
     SUBDIR += tinywm
     SUBDIR += transset
diff --git a/x11-wm/awesome-vicious/Makefile b/x11-wm/awesome-vicious/Makefile
index ca6a7cc50c54..8a0dfbf7c291 100644
--- a/x11-wm/awesome-vicious/Makefile
+++ b/x11-wm/awesome-vicious/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	awesome:x11-wm/awesome
 
 USES=		tar:xz
 NO_BUILD=	yes
-NO_INSTALL=	yes
 PORTDOCS=	README TODO CHANGES LICENSE
 
 OPTIONS_DEFINE=	DOCS
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 2ddf946732e6..e4fd39042396 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmonad-contrib
-PORTVERSION=	0.11.4
+PORTVERSION=	0.12
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,18 +11,11 @@ COMMENT=	Third-party extensions for xmonad
 LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	extensible-exceptions mtl>=1 old-time random utf8-string \
-		X11>=1.6.1 xmonad>=0.11
+		X11>=1.6.1 X11-xft>=0.2 xmonad==0.12
 USE_XORG=	x11
 
 RUN_DEPENDS+=	bash:shells/bash
 
-FLAGS_DEFINE=		XFT
-FLAGS_DEFAULT=		XFT
-
-XFT_DESC=		Use Xft to render text
-XFT_FLAG_ENABLE=	use_xft
-XFT_FLAG_CABAL=		X11-xft>=0.2
-
 FLAGS_DISABLE=	testing
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index 7ccfe7a18ef4..182afb3ef95e 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xmonad-contrib-0.11.4.tar.gz) = a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc
-SIZE (cabal/xmonad-contrib-0.11.4.tar.gz) = 401743
+TIMESTAMP = 1475870490
+SHA256 (cabal/xmonad-contrib-0.12.tar.gz) = 131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311
+SIZE (cabal/xmonad-contrib-0.12.tar.gz) = 464978
diff --git a/x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs b/x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
deleted file mode 100644
index 5a4e24560dba..000000000000
--- a/x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./XMonad/Prompt/Directory.hs.orig	2011-08-21 14:07:27.601179305 +0300
-+++ ./XMonad/Prompt/Directory.hs	2011-08-21 14:08:20.213520774 +0300
-@@ -35,7 +35,7 @@
- 
- getDirCompl :: String -> IO [String]
- getDirCompl s = (filter notboring . lines) `fmap`
--                runProcessWithInput "/bin/bash" [] ("compgen -A directory " ++ s ++ "\n")
-+                runProcessWithInput "bash" [] ("compgen -A directory " ++ s ++ "\n")
- 
- notboring :: String -> Bool
- notboring ('.':'.':_) = True
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index ce204d73d907..5e312e72aa69 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmonad
-PORTVERSION=	0.11.1
+PORTVERSION=	0.12
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Tiling window manager
 
 LICENSE=	BSD3CLAUSE
 
-USE_CABAL=	extensible-exceptions mtl utf8-string>=0.3 X11>=1.5
+USE_CABAL=	extensible-exceptions mtl setlocale utf8-string>=0.3 X11>=1.5
 USE_XORG=	x11
 
 MAN1PAGES=	xmonad.1
@@ -18,17 +18,8 @@ MAN1SRC=	man
 
 EXECUTABLE=	xmonad
 
-OPTIONS_DEFINE+=	XFORK_FIX
-OPTIONS_DEFAULT+=	XFORK_FIX
-
 FLAGS_DISABLE=	testing
 
-XFORK_FIX_DESC=		Apply workaround for losing hotkeys (XMonad \#576)
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 
-.if ${PORT_OPTIONS:MXFORK_FIX}
-EXTRA_PATCHES+=	${PATCHDIR}/nopatch-XMonad_Core.hs
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index c48469c9bf12..1f355c048615 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/xmonad-0.11.1.tar.gz) = 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd
-SIZE (cabal/xmonad-0.11.1.tar.gz) = 59307
+TIMESTAMP = 1475869373
+SHA256 (cabal/xmonad-0.12.tar.gz) = e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7
+SIZE (cabal/xmonad-0.12.tar.gz) = 61436
diff --git a/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs b/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
deleted file mode 100644
index f913dacd3cde..000000000000
--- a/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- XMonad/Core.hs.orig	2013-01-01 01:31:47 UTC
-+++ XMonad/Core.hs
-@@ -400,10 +400,13 @@ spawnPID x = xfork $ executeFile "/bin/s
- 
- -- | A replacement for 'forkProcess' which resets default signal handlers.
- xfork :: MonadIO m => IO () -> m ProcessID
--xfork x = io . forkProcess . finally nullStdin $ do
--                uninstallSignalHandlers
--                createSession
--                x
-+xfork x = do 
-+    pid <- liftIO $ forkProcess $ finally nullStdin $ do
-+        forkProcess $ do
-+            uninstallSignalHandlers
-+            createSession
-+            x
-+    return pid
-  where
-     nullStdin = do
-         fd <- openFd "/dev/null" ReadOnly Nothing defaultFileFlags
diff --git a/x11-wm/hs-xmonad/files/patch-xmonad.cabal b/x11-wm/hs-xmonad/files/patch-xmonad.cabal
deleted file mode 100644
index 31e082540956..000000000000
--- a/x11-wm/hs-xmonad/files/patch-xmonad.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmonad.cabal.orig	2015-03-27 17:59:21 UTC
-+++ xmonad.cabal
-@@ -58,7 +58,7 @@ library
-     else
-         build-depends: base < 3
-     build-depends: X11>=1.5 && < 1.7, mtl, unix,
--                   utf8-string >= 0.3 && < 0.4
-+                   utf8-string >= 0.3
- 
-     if true
-         ghc-options:        -funbox-strict-fields -Wall
diff --git a/x11-wm/subtle/Makefile b/x11-wm/subtle/Makefile
new file mode 100644
index 000000000000..43b0d4d1dfea
--- /dev/null
+++ b/x11-wm/subtle/Makefile
@@ -0,0 +1,32 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	subtle
+PORTVERSION=	0.11.3224
+CATEGORIES=	x11-wm ruby
+MASTER_SITES=	http://subtle.subforge.org/attachments/download/81/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-xi
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Grid-based manual tiling window manager
+
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	rake:devel/rubygem-rake
+
+USES=		pkgconfig shebangfix tar:tbz2
+USE_RUBY=	yes
+USE_XORG=	x11 xft xinerama xpm xrandr xtst
+
+MAKE_CMD=	rake -v
+MAKEFILE=	Rakefile
+ALL_TARGET=	build
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,/etc/xdg,${LOCALBASE}&,' \
+		${WRKSRC}/src/subtle/ruby.c
+
+do-configure:
+	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} config
+
+.include <bsd.port.mk>
diff --git a/x11-wm/subtle/distinfo b/x11-wm/subtle/distinfo
new file mode 100644
index 000000000000..cb68699833d1
--- /dev/null
+++ b/x11-wm/subtle/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1482831730
+SHA256 (subtle-0.11.3224-xi.tbz2) = a22ee94a70c1105a018e1c0a754597b4e3a87d1b915301a0b22888920fa0f8a2
+SIZE (subtle-0.11.3224-xi.tbz2) = 144607
diff --git a/x11-wm/subtle/files/patch-Rakefile b/x11-wm/subtle/files/patch-Rakefile
new file mode 100644
index 000000000000..abf104a83383
--- /dev/null
+++ b/x11-wm/subtle/files/patch-Rakefile
@@ -0,0 +1,81 @@
+--- Rakefile.orig	2012-06-20 11:29:55 UTC
++++ Rakefile
+@@ -45,14 +45,14 @@ end
+ @options = {
+   "cc"         => ENV["CC"] || "gcc",
+   "destdir"    => ENV["DESTDIR"] || "",
+-  "prefix"     => "/usr",
+-  "manprefix"  => "$(prefix)/share/man",
+-  "bindir"     => "$(destdir)/$(prefix)/bin",
+-  "sysconfdir" => "$(destdir)/etc",
++  "prefix"     => ENV["PREFIX"] || "/usr",
++  "manprefix"  => "%s/man" % (ENV["MANPREFIX"] || "$(prefix)/share"),
++  "bindir"     => "$(destdir)$(prefix)/bin",
++  "sysconfdir" => "$(destdir)$(prefix)/etc",
+   "configdir"  => "$(sysconfdir)/xdg/$(PKG_NAME)",
+-  "datadir"    => "$(destdir)/$(prefix)/share/$(PKG_NAME)",
+-  "extdir"     => "$(destdir)/$(sitelibdir)/$(PKG_NAME)",
+-  "mandir"     => "$(destdir)/$(manprefix)/man1",
++  "datadir"    => "$(destdir)$(prefix)/share/$(PKG_NAME)",
++  "extdir"     => "$(destdir)$(sitelibdir)/$(PKG_NAME)",
++  "mandir"     => "$(destdir)$(manprefix)/man1",
+   "debug"      => "no",
+   "xpm"        => "yes",
+   "xft"        => "yes",
+@@ -63,7 +63,7 @@ end
+   "hdrdir"     => "",
+   "archdir"    => "",
+   "revision"   => "3224", #< Latest stable
+-  "cflags"     => "-Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
++  "cflags"     => "-Wall -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99",
+   "cpppath"    => "-I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir)",
+   "ldflags"    => "-L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+   "extflags"   => "$(LDFLAGS) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)",
+@@ -258,8 +258,8 @@ task(:config) do
+     make_config unless checksums
+   else
+     # Check version
+-    if 1 != RbConfig::CONFIG["MAJOR"].to_i or 9 != RbConfig::CONFIG["MINOR"].to_i
+-      fail("Ruby 1.9.0 or higher required")
++    if 2 > RbConfig::CONFIG["MAJOR"].to_i
++      fail("Ruby 2.0.0 (1.9.0 really) or higher required")
+     end
+ 
+     checksums
+@@ -396,7 +396,10 @@ task(:config) do
+       checking_for("X11/Xft/Xft.h") do
+         ret = false
+ 
++        # Work around pkg_config()'s stupidity: obtain real (full) cflags
++        cutoff = $INCFLAGS.length
+         cflags, ldflags, libs = pkg_config("xft")
++        cflags << $INCFLAGS[cutoff..-1]
+         unless libs.nil?
+           # Update flags
+           @options["cpppath"] << " %s" % [ cflags ]
+@@ -495,6 +498,7 @@ task(:config) do
+ -----------------
+ Binaries............: #{@options["bindir"]}
+ Configuration.......: #{@options["configdir"]}
++Manual pages........: #{@options["mandir"]}
+ Extension...........: #{@options["extdir"]}
+ 
+ Xpm support.........: #{@options["xpm"]}
+@@ -503,6 +507,8 @@ Xinerama support....: #{@options["xinera
+ XRandR support......: #{@options["xrandr"]}
+ XTest support.......: #{@options["xtest"]}
+ Debugging messages..: #{@options["debug"]}
++Compiler............: #{@options["cc"]} (#{
++`#{@options["cc"]} -v 2>&1`[/\w+ version [\d.]+/]})
+ 
+ EOF
+   end
+@@ -613,7 +619,7 @@ task(:install => [:config, :build]) do
+     )
+ 
+     # Update interpreter name
+-    `#{sed} -i -e 's#/usr/bin/ruby.*##{interpreter}#' \
++    `#{sed} -i '' -e 's#/usr/bin/ruby.*##{interpreter}#' \
+       #{File.join(@options["bindir"], File.basename(f))}`
+   end
+ 
diff --git a/x11-wm/subtle/files/patch-src_shared_shared.h b/x11-wm/subtle/files/patch-src_shared_shared.h
new file mode 100644
index 000000000000..aea1bdbcbc5f
--- /dev/null
+++ b/x11-wm/subtle/files/patch-src_shared_shared.h
@@ -0,0 +1,10 @@
+--- src/shared/shared.h.orig	2012-06-20 11:29:55 UTC
++++ src/shared/shared.h
+@@ -28,6 +28,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xmd.h>
+ #include <X11/cursorfont.h>
++#include <ruby.h>
+ #include <ruby/oniguruma.h>
+ 
+ #include "config.h"
diff --git a/x11-wm/subtle/files/patch-src_subtle_ruby.c b/x11-wm/subtle/files/patch-src_subtle_ruby.c
new file mode 100644
index 000000000000..9e846ce877e9
--- /dev/null
+++ b/x11-wm/subtle/files/patch-src_subtle_ruby.c
@@ -0,0 +1,12 @@
+--- src/subtle/ruby.c.orig	2012-06-20 11:29:55 UTC
++++ src/subtle/ruby.c
+@@ -2612,8 +2612,7 @@ RubyConfigLoadConfig(VALUE self,
+ 
+       if((dirs = getenv("XDG_CONFIG_DIRS")))
+         len += snprintf(tokens + len, sizeof(tokens), ":%s", dirs);
+-      else len += snprintf(tokens + len, sizeof(tokens), ":%s/%s",
+-        "/etc/xdg", PKG_NAME);
++      else len += snprintf(tokens + len, sizeof(tokens), ":%s", "/etc/xdg");
+ 
+       if((home = getenv("XDG_DATA_HOME")))
+         {
diff --git a/x11-wm/subtle/pkg-descr b/x11-wm/subtle/pkg-descr
new file mode 100644
index 000000000000..bab067b49510
--- /dev/null
+++ b/x11-wm/subtle/pkg-descr
@@ -0,0 +1,14 @@
+subtle is a manual tiling window manager with a rather uncommon approach
+of tiling: instead of relying on predefined layouts, subtle divides the
+screen into a grid with customizeable slots (called gravities).  For better
+understanding, the default config uses a 3x3 grid and maps each gravity to
+one key of the numpad.  With those keys, windows can be moved directly to
+the desired gravity -- the same can be done with tagging rules in the
+config.
+
+Another unique concept is the strict tagging: Unlike other tiling window
+managers, subtle does not allow weak tagging and always maps windows to
+virtual desktops (called views) with matching tags, regardless of the
+current active view.
+
+WWW: http://subtle.subforge.org/
diff --git a/x11-wm/subtle/pkg-plist b/x11-wm/subtle/pkg-plist
new file mode 100644
index 000000000000..ab7e88c74a83
--- /dev/null
+++ b/x11-wm/subtle/pkg-plist
@@ -0,0 +1,18 @@
+bin/subtle
+bin/subtler
+bin/sur
+bin/surserver
+etc/xdg/subtle/subtle.rb
+%%RUBY_SITELIBDIR%%/subtle/subtler/runner.rb
+%%RUBY_SITELIBDIR%%/subtle/subtlext.so
+%%RUBY_SITELIBDIR%%/subtle/sur/client.rb
+%%RUBY_SITELIBDIR%%/subtle/sur/runner.rb
+%%RUBY_SITELIBDIR%%/subtle/sur/server.rb
+%%RUBY_SITELIBDIR%%/subtle/sur/specification.rb
+%%RUBY_SITELIBDIR%%/subtle/sur/test.rb
+%%RUBY_SITELIBDIR%%/subtle/sur/version.rb
+man/man1/subtle.1.gz
+man/man1/subtler.1.gz
+man/man1/subtlext.1.gz
+man/man1/sur.1.gz
+man/man1/surserver.1.gz