diff -u -N /usr/ports/x11-wm/hikari/Makefile ./Makefile
--- /usr/ports/x11-wm/hikari/Makefile	2020-05-26 17:54:41.345997000 +0200
+++ ./Makefile	2020-06-03 12:23:35.303887000 +0200
@@ -1,7 +1,7 @@
-# $FreeBSD: head/x11-wm/hikari/Makefile 536413 2020-05-24 17:35:04Z salvadore $
+# $FreeBSD: head/x11-wm/hikari/Makefile 529872 2020-03-30 10:07:26Z jbeich $
 
 PORTNAME=	hikari
-DISTVERSION=	1.2.1
+DISTVERSION=	2.0.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
@@ -25,16 +25,8 @@
 USE_GNOME=	cairo glib20 pango
 USE_XORG=	pixman
 MAKE_ARGS=	${WITH_DEBUG:DDEBUG=YES}
-SUB_FILES=	${PORTNAME}.desktop
-SUB_LIST=	COMMENT="${COMMENT}"
-PLIST_FILES=	"${MAYBE_SUID}bin/${PORTNAME}" \
-		"${MAYBE_SUID}bin/${PORTNAME}-unlocker" \
-		etc/pam.d/${PORTNAME}-unlocker \
-		share/man/man1/${PORTNAME}.1.gz \
-		share/wayland-sessions/${PORTNAME}.desktop
-PORTEXAMPLES=	${PORTNAME}.conf
 
-OPTIONS_DEFINE=		EXAMPLES GAMMA LAYERSHELL SCREENCOPY SUID X11
+OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY SUID X11
 OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY SUID X11
 
 GAMMA_DESC=		Include gammacontrol protocol (required by, e.g., Redshift)
@@ -45,17 +37,22 @@
 GAMMA_MAKE_ARGS=	WITH_GAMMACONTROL=YES
 LAYERSHELL_MAKE_ARGS=	WITH_LAYERSHELL=YES
 SCREENCOPY_MAKE_ARGS=	WITH_SCREENCOPY=YES
-SUID_VARS=		MAYBE_SUID="@(,,4755) "
+SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
+SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
 X11_MAKE_ARGS=		WITH_XWAYLAND=YES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/hikari-unlocker ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/pam.d/hikari-unlocker.FreeBSD ${STAGEDIR}${PREFIX}/etc/pam.d/hikari-unlocker
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${SED} "s,PREFIX,${PREFIX}," ${WRKSRC}/etc/hikari/hikari.conf > ${STAGEDIR}${ETCDIR}/hikari.conf.sample
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/share/examples/hikari/hikari.conf ${STAGEDIR}${EXAMPLESDIR}/hikari.conf
 	${INSTALL_MAN} ${WRKSRC}/share/man/man1/hikari.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/backgrounds/hikari
+	${INSTALL_DATA} ${WRKSRC}/share/backgrounds/hikari/hikari_wallpaper.png ${STAGEDIR}${PREFIX}/share/backgrounds/hikari
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions
-	${INSTALL_DATA} ${WRKDIR}/hikari.desktop ${STAGEDIR}${PREFIX}/share/wayland-sessions
+	${INSTALL_DATA} ${WRKSRC}/share/wayland-sessions/hikari.desktop ${STAGEDIR}${PREFIX}/share/wayland-sessions
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pam.d
+	${INSTALL_DATA} ${WRKSRC}/etc/pam.d/hikari-unlocker.FreeBSD ${STAGEDIR}${PREFIX}/etc/pam.d/hikari-unlocker
 
 .include <bsd.port.mk>
diff -u -N /usr/ports/x11-wm/hikari/distinfo ./distinfo
--- /usr/ports/x11-wm/hikari/distinfo	2020-05-26 17:54:41.347471000 +0200
+++ ./distinfo	2020-06-02 19:22:44.376244000 +0200
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590253300
-SHA256 (hikari-1.2.1.tar.gz) = f361ec9a367c03a9e678a8d04361426f6982e661719b9e6a3e742572eae0a8e5
-SIZE (hikari-1.2.1.tar.gz) = 99489
+TIMESTAMP = 1591118564
+SHA256 (hikari-2.0.0.tar.gz) = 0230bd89c90da1082e7d59bd991118e0b76c621ee55d21506893866a44adb5fe
+SIZE (hikari-2.0.0.tar.gz) = 1002997
Common subdirectories: /usr/ports/x11-wm/hikari/files and ./files
diff -u -N /usr/ports/x11-wm/hikari/pkg-plist ./pkg-plist
--- /usr/ports/x11-wm/hikari/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist	2020-06-03 11:54:48.841783000 +0200
@@ -0,0 +1,7 @@
+%%MAYBE_SUID%%bin/hikari
+%%MAYBE_SUID%%bin/hikari-unlocker
+etc/pam.d/hikari-unlocker
+@sample %%ETCDIR%%/hikari.conf.sample
+share/backgrounds/hikari/hikari_wallpaper.png
+share/man/man1/hikari.1.gz
+share/wayland-sessions/hikari.desktop