Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -13432,3 +13432,4 @@
 www/nuvolaplayer-youtube||2019-10-21|Useless without audio/nuvolaplayer
 japanese/yasou-fpw||2019-10-23|Has expired: the only remaining mastersite times out
 lang/gcc5|lang/gcc|2019-10-30|Has expired: Unsupported by upstream. Use GCC 9 or newer instead.
+x11-wm/compton-yshui|x11-wm/picom|2019-??-??|Project renamed
Index: x11-wm/Makefile
===================================================================
--- x11-wm/Makefile
+++ x11-wm/Makefile
@@ -27,7 +27,6 @@
     SUBDIR += compizconfig-backend-gconf
     SUBDIR += compizconfig-python
     SUBDIR += compton
-    SUBDIR += compton-yshui
     SUBDIR += ctwm
     SUBDIR += cwm
     SUBDIR += devilspie
@@ -98,6 +97,7 @@
     SUBDIR += peksystray
     SUBDIR += pekwm
     SUBDIR += phluid
+    SUBDIR += picom
     SUBDIR += piewm
     SUBDIR += plasma5-kdecoration
     SUBDIR += plasma5-kwin
Index: x11-wm/compton-yshui/distinfo
===================================================================
--- x11-wm/compton-yshui/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1569024480
-SHA256 (yshui-picom-v7.4_GH0.tar.gz) = 9323046b00a881ff07fbb118354e47be68df3d98c89ad1063a663242a1200d7d
-SIZE (yshui-picom-v7.4_GH0.tar.gz) = 218898
-SHA256 (bd5a5fb56812.patch) = a7e29d526517f05fb90f3a6415ef08108ba45865175a676f50376ef8d0e10a7f
-SIZE (bd5a5fb56812.patch) = 680
-SHA256 (065f9ffd4d35.patch) = 5d6d687c9ee1eb6ab7a9d39636bb85c4aac7d36ad13433ac66885914ff2e2944
-SIZE (065f9ffd4d35.patch) = 10209
Index: x11-wm/compton-yshui/files/patch-src_log.c
===================================================================
--- /dev/null
+++ x11-wm/compton-yshui/files/patch-src_log.c
@@ -1,21 +0,0 @@
-Drop after FreeBSD 11 EOL, other systems had timespec_get() for years.
-
-../src/log.c:162:20: error: use of undeclared identifier 'TIME_UTC'
-        timespec_get(&ts, TIME_UTC);
-                          ^
-log.c:(.text+0x1db): undefined reference to `timespec_get'
-
---- src/log.c.orig	2019-09-21 00:08:00 UTC
-+++ src/log.c
-@@ -159,7 +159,11 @@ attr_printf(4, 5) void log_printf(struct log *l, int l
- 	}
- 
- 	struct timespec ts;
-+#ifdef TIME_UTC
- 	timespec_get(&ts, TIME_UTC);
-+#else
-+	clock_gettime(CLOCK_REALTIME, &ts);
-+#endif
- 	auto tm = localtime(&ts.tv_sec);
- 	char time_buf[100];
- 	strftime(time_buf, sizeof time_buf, "%x %T", tm);
Index: x11-wm/compton/Makefile
===================================================================
--- x11-wm/compton/Makefile
+++ x11-wm/compton/Makefile
@@ -14,7 +14,7 @@
 RUN_DEPENDS=	xprop:x11/xprop \
 		xwininfo:x11/xwininfo
 
-CONFLICTS_INSTALL=	compton-yshui # bin/compton
+CONFLICTS_INSTALL=	picom # bin/compton
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chjj
Index: x11-wm/picom/Makefile
===================================================================
--- x11-wm/picom/Makefile
+++ x11-wm/picom/Makefile
@@ -1,13 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	compton
+PORTNAME=	picom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.4
+DISTVERSION=	Next-120
+DISTVERSIONSUFFIX=	-g8e0d421
 CATEGORIES=	x11-wm
-PKGNAMESUFFIX=	-yshui
-
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	bd5a5fb56812.patch:-p1 065f9ffd4d35.patch:-p1
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Lightweight X11 compositor
@@ -25,12 +22,10 @@
 
 CONFLICTS_INSTALL=	compton # bin/compton
 
-USES=		compiler:c11 meson localbase pkgconfig python:3.4+,run shebangfix
+USES=		compiler:c11 meson localbase pkgconfig
 USE_GITHUB=	yes
 USE_XORG=	x11 xcb xext pixman
 GH_ACCOUNT=	yshui
-GH_PROJECT=	picom
-SHEBANG_FILES=	bin/compton-convgen.py
 MESON_ARGS=	-Dunittest=true
 TEST_TARGET=	test
 
@@ -56,7 +51,7 @@
 DBUS_MESON_TRUE=	dbus
 
 DOCS_BUILD_DEPENDS=	a2x:textproc/asciidoc
-DOCS_MESON_TRUE=	build_docs
+DOCS_MESON_TRUE=	with_docs
 DOCS_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 			man/man1/${PORTNAME}-trans.1.gz
 
Index: x11-wm/picom/distinfo
===================================================================
--- /dev/null
+++ x11-wm/picom/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1571997975
+SHA256 (yshui-picom-vNext-120-g8e0d421_GH0.tar.gz) = 09eb71267f3a96cf3bb083139a06299535f582fe35584ca7ff41bb090f1d29a2
+SIZE (yshui-picom-vNext-120-g8e0d421_GH0.tar.gz) = 226358
Index: x11-wm/picom/pkg-descr
===================================================================
--- x11-wm/picom/pkg-descr
+++ x11-wm/picom/pkg-descr
@@ -1,5 +1,5 @@
-Compton is a standalone compositor for X11 for window managers without
-built-in compositing. This is an actively maintained fork of Compton.
+Picom (formerly a Compton fork) is a standalone compositor for X11 for
+window managers without built-in compositing.
 
 Features:
 - Rendering with optional VSync via OpenGL or XRender
@@ -12,4 +12,4 @@
 - Config, log and PID file support
 - Remote control via DBus
 
-WWW: https://github.com/yshui/compton
+WWW: https://github.com/yshui/picom
Index: x11-wm/picom/pkg-plist
===================================================================
--- x11-wm/picom/pkg-plist
+++ x11-wm/picom/pkg-plist
@@ -1,7 +1,9 @@
 bin/compton
-bin/compton-convgen.py
 bin/compton-trans
-@sample etc/xdg/compton.conf.sample
+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