Index: x11-wm/picom/Makefile
===================================================================
--- x11-wm/picom/Makefile
+++ x11-wm/picom/Makefile
@@ -2,14 +2,10 @@
 
 PORTNAME=	picom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.5
+DISTVERSION=	Next-187
+DISTVERSIONSUFFIX=	-gdef63f9
 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
 
@@ -26,12 +22,10 @@
 
 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
 
@@ -39,8 +33,7 @@
 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
@@ -58,12 +51,12 @@
 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/' \
Index: x11-wm/picom/distinfo
===================================================================
--- x11-wm/picom/distinfo
+++ x11-wm/picom/distinfo
@@ -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 = 1583611585
+SHA256 (yshui-picom-vNext-187-gdef63f9_GH0.tar.gz) = 801c4c0a345de57e44549fe5021837018e932f5e3f7e5865f028a26743bdd003
+SIZE (yshui-picom-vNext-187-gdef63f9_GH0.tar.gz) = 234013
Index: x11-wm/picom/pkg-plist
===================================================================
--- x11-wm/picom/pkg-plist
+++ x11-wm/picom/pkg-plist
@@ -1,5 +1,4 @@
 bin/compton
-bin/compton-convgen.py
 bin/compton-trans
 bin/picom
 bin/picom-trans