Index: head/x11/sxhkd/Makefile
===================================================================
--- head/x11/sxhkd/Makefile
+++ head/x11/sxhkd/Makefile
@@ -1,8 +1,8 @@
-# Created by: Anton Törnqvist <antont@inbox.lv>
+# Created by: Anton Tornqvist <antont@inbox.lv>
 # $FreeBSD$
 
 PORTNAME=	sxhkd
-PORTVERSION=	0.5.7
+PORTVERSION=	0.5.8
 CATEGORIES=	x11
 
 MAINTAINER=	gor@clogic.com.ua
@@ -13,10 +13,12 @@
 
 LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 
+USES=		gmake pkgconfig
+
+USE_XORG=	xcb
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	baskerville
-
-USES=		gmake pkgconfig
 
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/sxhkd \
Index: head/x11/sxhkd/distinfo
===================================================================
--- head/x11/sxhkd/distinfo
+++ head/x11/sxhkd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477912763
-SHA256 (baskerville-sxhkd-0.5.7_GH0.tar.gz) = 21b8bfea2a83f019062dfea53051e2bc61896595fc788c6c7b5e3fd9354b279f
-SIZE (baskerville-sxhkd-0.5.7_GH0.tar.gz) = 34472
+TIMESTAMP = 1500267066
+SHA256 (baskerville-sxhkd-0.5.8_GH0.tar.gz) = d7df48d7d301d1cf06f45172bcfe712510e98dcdbdb896af662cf979f9666855
+SIZE (baskerville-sxhkd-0.5.8_GH0.tar.gz) = 34566
Index: head/x11/sxhkd/files/patch-Makefile
===================================================================
--- head/x11/sxhkd/files/patch-Makefile
+++ head/x11/sxhkd/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2016-10-30 12:28:09 UTC
+--- Makefile.orig	2017-07-14 18:57:47 UTC
 +++ Makefile
-@@ -2,14 +2,14 @@ NAME     = sxhkd
+@@ -2,14 +2,15 @@ OUT      = sxhkd
  VERCMD  ?= git describe 2> /dev/null
  VERSION := $(shell $(VERCMD) || cat VERSION)
  
@@ -13,30 +13,31 @@
  PREFIX    ?= /usr/local
 -BINPREFIX ?= $(PREFIX)/bin
 -MANPREFIX ?= $(PREFIX)/share/man
--DOCPREFIX ?= $(PREFIX)/share/doc/$(NAME)
+-DOCPREFIX ?= $(PREFIX)/share/doc/$(OUT)
 +BINPREFIX  = $(PREFIX)/bin
 +MANPREFIX  = $(PREFIX)/man
-+EXPREFIX   = $(PREFIX)/share/examples/$(NAME)
++DOCPREFIX  = $(PREFIX)/share/doc/$(OUT)
++EXPREFIX   = $(PREFIX)/share/examples/$(OUT)
  
- SRC := $(wildcard *.c)
- OBJ := $(SRC:.c=.o)
-@@ -28,11 +28,15 @@ $(NAME): $(OBJ)
+ all: $(OUT)
  
+@@ -28,11 +29,15 @@ $(OUT): $(OBJ)
+ 
  install:
  	mkdir -p "$(DESTDIR)$(BINPREFIX)"
--	cp -pf $(NAME) "$(DESTDIR)$(BINPREFIX)"
-+	${BSD_INSTALL_PROGRAM} $(NAME) "$(DESTDIR)$(BINPREFIX)"
+-	cp -pf $(OUT) "$(DESTDIR)$(BINPREFIX)"
++	${BSD_INSTALL_PROGRAM} $(OUT) "$(DESTDIR)$(BINPREFIX)"
  	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
--	cp -p doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
+-	cp -p doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1
 -	mkdir -p "$(DESTDIR)$(DOCPREFIX)"
 -	cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
-+	${BSD_INSTALL_MAN} doc/$(NAME).1 "$(DESTDIR)$(MANPREFIX)"/man1
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)/background_shell"
++	${BSD_INSTALL_MAN} doc/$(OUT).1 "$(DESTDIR)$(MANPREFIX)"/man1
++	mkdir -p "$(DESTDIR)$(EXPREFIX)"/background_shell
 +	${BSD_INSTALL_DATA} examples/background_shell/* \
-+		"$(DESTDIR)$(EXPREFIX)/background_shell"
-+	mkdir -p "$(DESTDIR)$(EXPREFIX)/notification"
++		"$(DESTDIR)$(EXPREFIX)"/background_shell
++	mkdir -p "$(DESTDIR)$(EXPREFIX)"/notification
 +	${BSD_INSTALL_DATA} examples/notification/* \
-+		"$(DESTDIR)$(EXPREFIX)/notification"
++		"$(DESTDIR)$(EXPREFIX)"/notification
  
  uninstall:
- 	rm -f "$(DESTDIR)$(BINPREFIX)"/$(NAME)
+ 	rm -f "$(DESTDIR)$(BINPREFIX)"/$(OUT)