Index: head/x11-wm/picom/Makefile
===================================================================
--- head/x11-wm/picom/Makefile	(revision 531408)
+++ head/x11-wm/picom/Makefile	(revision 531409)
@@ -1,78 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	picom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.5
+DISTVERSION=	8-rc1
 CATEGORIES=	x11-wm
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	bd5a5fb56812.patch:-p1 065f9ffd4d35.patch:-p1
-PATCHFILES+=	9657d52cd709.patch:-p1 de3db23e23be.patch:-p1
-PATCHFILES+=	e54058fcc740.patch:-p1
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Lightweight X11 compositor
 
 LICENSE=	MIT MPL20
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSES/MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
 LIB_DEPENDS=	libev.so:devel/libev \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-render-util.so:x11/xcb-util-renderutil
 RUN_DEPENDS=	xprop:x11/xprop \
 		xwininfo:x11/xwininfo
 
 CONFLICTS_INSTALL=	compton # bin/compton
 
-USES=		compiler:c11 meson localbase pkgconfig python:3.4+,run \
-		shebangfix xorg
+USES=		compiler:c11 meson localbase pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	x11 xcb xext pixman
 GH_ACCOUNT=	yshui
-SHEBANG_FILES=	bin/compton-convgen.py
 MESON_ARGS=	-Dunittest=true
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	CONFIG DBUS DOCS DRM OPENGL PCRE
 OPTIONS_DEFAULT=CONFIG DBUS OPENGL PCRE
 
 CONFIG_DESC=		Configuration file parsing support
-CONFIG_LIB_DEPENDS=	libconfig.so:devel/libconfig \
-			libxdg-basedir.so:x11/libxdg-basedir
+CONFIG_LIB_DEPENDS=	libconfig.so:devel/libconfig
 CONFIG_MESON_TRUE=	config_file
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_MESON_TRUE=	regex
 
 DRM_DESC=		DRM VSync fallback (deprecated)
 DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_MESON_TRUE=		vsync_drm
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gl
 OPENGL_MESON_TRUE=	opengl
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_MESON_TRUE=	dbus
 
 DOCS_BUILD_DEPENDS=	a2x:textproc/asciidoc
-DOCS_MESON_TRUE=	build_docs
+DOCS_MESON_TRUE=	with_docs
 DOCS_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 			share/man/man1/${PORTNAME}-trans.1.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e '/config_system_dir/s,/etc,${PREFIX}&,' \
+	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/src/config_libconfig.c
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e "/project_version/s/=.*/= '${DISTVERSIONFULL}'/" \
 		${WRKSRC}/meson.build
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.sample.conf \
 		${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
Index: head/x11-wm/picom/distinfo
===================================================================
--- head/x11-wm/picom/distinfo	(revision 531408)
+++ head/x11-wm/picom/distinfo	(revision 531409)
@@ -1,13 +1,3 @@
-TIMESTAMP = 1574114370
-SHA256 (yshui-picom-v7.5_GH0.tar.gz) = 1fdeda688d09643563e4314f885beaf074023235e56598ae98d481364e615607
-SIZE (yshui-picom-v7.5_GH0.tar.gz) = 219456
-SHA256 (bd5a5fb56812.patch) = a7e29d526517f05fb90f3a6415ef08108ba45865175a676f50376ef8d0e10a7f
-SIZE (bd5a5fb56812.patch) = 680
-SHA256 (065f9ffd4d35.patch) = 5d6d687c9ee1eb6ab7a9d39636bb85c4aac7d36ad13433ac66885914ff2e2944
-SIZE (065f9ffd4d35.patch) = 10209
-SHA256 (9657d52cd709.patch) = 23b11ce269e385560e240bf68bd11ce8df1afa4d73dc6ee0ac995541a0817ea2
-SIZE (9657d52cd709.patch) = 761
-SHA256 (de3db23e23be.patch) = cd8acbfcd4a4a368e665aab78533cd660409a3316541a846d678fa3aef702fae
-SIZE (de3db23e23be.patch) = 877
-SHA256 (e54058fcc740.patch) = 61cd841768e632c4af403788e13f6b062eec5a8fb3410635332e6af25730195e
-SIZE (e54058fcc740.patch) = 1026
+TIMESTAMP = 1586569627
+SHA256 (yshui-picom-v8-rc1_GH0.tar.gz) = 28b58296ae13dc5f6ff0a2c887c7603ff8dfb1bd1707adc98d05796038aa5a53
+SIZE (yshui-picom-v8-rc1_GH0.tar.gz) = 242192
Index: head/x11-wm/picom/pkg-plist
===================================================================
--- head/x11-wm/picom/pkg-plist	(revision 531408)
+++ head/x11-wm/picom/pkg-plist	(revision 531409)
@@ -1,10 +1,9 @@
 bin/compton
-bin/compton-convgen.py
 bin/compton-trans
 bin/picom
 bin/picom-trans
 @sample etc/xdg/picom.conf.sample
 share/applications/compton.desktop
 share/applications/picom.desktop
 share/icons/hicolor/48x48/apps/compton.png
 share/icons/hicolor/scalable/apps/compton.svg