git: fdf4519f1cb7 - main - x11-wm/picom: disable compton symlinks

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf4519f1cb7625eabd1082752097dff82caa242

commit fdf4519f1cb7625eabd1082752097dff82caa242
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-27 17:47:59 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-27 18:14:40 +0000

    x11-wm/picom: disable compton symlinks
---
 x11-wm/compton/Makefile | 2 --
 x11-wm/picom/Makefile   | 7 +++----
 x11-wm/picom/distinfo   | 2 ++
 x11-wm/picom/pkg-plist  | 5 -----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index 57932a4d320e..c36479c6b915 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -12,8 +12,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	xprop:x11/xprop \
 		xwininfo:x11/xwininfo
 
-CONFLICTS_INSTALL=	picom # bin/compton
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	chjj
 GH_TAGNAME=	b7f43ee
diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile
index dbfcf3fe6264..d682e360abd9 100644
--- a/x11-wm/picom/Makefile
+++ b/x11-wm/picom/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	picom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	78223caea3f7.patch:-p1 # https://github.com/yshui/picom/pull/422
+PATCHFILES+=	b74f9d761664.patch:-p1 # https://github.com/yshui/picom/pull/424
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Lightweight X11 compositor
@@ -21,13 +22,11 @@ LIB_DEPENDS=	libev.so:devel/libev \
 RUN_DEPENDS=	xprop:x11/xprop \
 		xwininfo:x11/xwininfo
 
-CONFLICTS_INSTALL=	compton # bin/compton
-
 USES=		compiler:c11 meson localbase pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	x11 xcb xext pixman
 GH_ACCOUNT=	yshui
-MESON_ARGS=	-Dunittest=true
+MESON_ARGS=	-Dcompton=false -Dunittest=true
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	CONFIG DBUS DOCS DRM OPENGL PCRE
diff --git a/x11-wm/picom/distinfo b/x11-wm/picom/distinfo
index 3cd80748d6da..0dfac8f21ca1 100644
--- a/x11-wm/picom/distinfo
+++ b/x11-wm/picom/distinfo
@@ -3,3 +3,5 @@ SHA256 (yshui-picom-v8.2_GH0.tar.gz) = 9d0c2533985e9670ff175e717a42b5bf1a2a00ccd
 SIZE (yshui-picom-v8.2_GH0.tar.gz) = 242653
 SHA256 (78223caea3f7.patch) = f9e32a1d348ea77343366e96111529f2cd2e78562aaf28252f9ea17c72afb7b1
 SIZE (78223caea3f7.patch) = 868
+SHA256 (b74f9d761664.patch) = 7938e13e812b3125677fce2be4d50aeb1988e2244211ec6c5ff9fc42b1c18073
+SIZE (b74f9d761664.patch) = 1978
diff --git a/x11-wm/picom/pkg-plist b/x11-wm/picom/pkg-plist
index 66edf3494d57..109a74ec14ca 100644
--- a/x11-wm/picom/pkg-plist
+++ b/x11-wm/picom/pkg-plist
@@ -1,9 +1,4 @@
-bin/compton
-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