Index: x11-wm/Makefile
===================================================================
--- x11-wm/Makefile
+++ x11-wm/Makefile
@@ -59,6 +59,7 @@
     SUBDIR += genmenu
     SUBDIR += golem
     SUBDIR += herbstluftwm
+    SUBDIR += hikari
     SUBDIR += hs-xmonad
     SUBDIR += hs-xmonad-contrib
     SUBDIR += i3
Index: x11-wm/hikari/Makefile
===================================================================
--- /dev/null
+++ x11-wm/hikari/Makefile
@@ -0,0 +1,58 @@
+# $FreeBSD$
+
+PORTNAME=	hikari
+DISTVERSION=	0.1.2
+CATEGORIES=	x11-wm
+MASTER_SITES=	https://acmelabs.space/~raichoo/
+
+MAINTAINER=	alex@xanderio.de
+COMMENT=	Stacking window manager with tiling capabilities
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libxcb-ewmh.so:x11/xcb-util-wm
+
+USES=	localbase:ldflags
+USE_XORG=	xcb x11
+
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	bin/hikari \
+		man/man1/hikari.1.gz
+PORTDATA=	config.def.h
+PORTDOCS=	README.md
+
+.if defined(WITH_DEBUG)
+ALL_TARGET=	debug
+.else
+ALL_TARGET=	hikari
+.endif
+
+OPTIONS_DEFINE=	DOCS
+
+pre-everything::
+	@${ECHO_MSG} "You can build hikari with your own config.h using the HIKARI_CONF knob:"
+	@${ECHO_MSG} "make HIKARI_CONF=/path/to/hikari/config.h install clean"
+
+post-patch:
+.if defined(HIKARI_CONF)
+	@${ECHO_MSG} "creating config.h from ${HIKARI_CONF}"
+	@${LN} -sf ${HIKARI_CONF} ${WRKSRC}/config.h
+.else
+	@${LN} -sf ${WRKSRC}/config.def.h ${WRKSRC}/config.h
+.endif
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/hikari.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDATA} ${STAGEDIR}${DATADIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
Index: x11-wm/hikari/distinfo
===================================================================
--- /dev/null
+++ x11-wm/hikari/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1558199278
+SHA256 (hikari-0.1.2.tar.gz) = 388b1d8b7a1499783de3d23358ccacbf5a5820a007142de56832b3c45a8b46d9
+SIZE (hikari-0.1.2.tar.gz) = 58070
Index: x11-wm/hikari/files/patch-Makefile
===================================================================
--- /dev/null
+++ x11-wm/hikari/files/patch-Makefile
@@ -0,0 +1,22 @@
+--- Makefile.orig	2019-05-18 18:00:22 UTC
++++ Makefile
+@@ -35,8 +35,8 @@ OBJS = \
+ 	window.o\
+ 	workspace.o
+ 
+-CFLAGS = -pipe -Wvla -Wall -I./include
+-LDFLAGS = -L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-ewmh
++CFLAGS += -pipe -Wvla -Wall -I./include
++LDFLAGS += -L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-ewmh
+ 
+ .ifdef WITH_XORG
+ CFLAGS += -I${WITH_XORG}
+@@ -47,7 +47,7 @@ CFLAGS += -I/usr/local/include
+ .ifmake debug
+ CFLAGS += -g -fsanitize=address,undefined -std=c17
+ .else
+-CFLAGS += -O3 -DNDEBUG -std=c17
++CFLAGS += -DNDEBUG -std=c17
+ .endif
+ 
+ .ifdef USE_COMPAT_QUEUE
Index: x11-wm/hikari/pkg-descr
===================================================================
--- /dev/null
+++ x11-wm/hikari/pkg-descr
@@ -0,0 +1,5 @@
+Hikari is a stacking window manager with additional tiling capabilities, it is
+heavily inspired by the Calm Window manager (cwm(1)). Its core concepts are
+windows, groups, sheets and the workspace.
+
+WWW: https://hub.darcs.net/raichoo/hikari