git: c40f5879b7e9 - main - x11/gromit-mpx: revert incomplete gtk3/X11=off

The branch main has been updated by jbeich:

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

commit c40f5879b7e92bc37f08f0f9ab26001e563e666b
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-06-04 12:53:06 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-06-04 12:53:55 +0000

    x11/gromit-mpx: revert incomplete gtk3/X11=off
    
    This reverts commit 7bc32204d7fa0e175e0993b94cba678c96784360.
    
    $ gromit-mpx
    (gromit-mpx:56156): Gtk-WARNING **: cannot open display: :0
---
 x11/gromit-mpx/Makefile | 13 ++-----------
 x11/gromit-mpx/distinfo |  4 ----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/x11/gromit-mpx/Makefile b/x11/gromit-mpx/Makefile
index 925440527d3b..d7b706493cfc 100644
--- a/x11/gromit-mpx/Makefile
+++ b/x11/gromit-mpx/Makefile
@@ -3,10 +3,6 @@ DISTVERSION=	1.4.3
 PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	698a43a8dcd7.patch:-p1 # https://github.com/bk138/gromit-mpx/pull/177
-PATCHFILES+=	7cd913191b48.patch:-p1 # https://github.com/bk138/gromit-mpx/pull/177
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Desktop annotation tool, multi-pointer port of Gromit
 WWW=		https://github.com/bk138/gromit-mpx
@@ -16,19 +12,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator
 
-USES=		cmake gnome pkgconfig
+USES=		cmake gnome pkgconfig xorg
 USE_CSTD=	gnu99
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_XORG=	x11 xi
 GH_ACCOUNT=	bk138
 LDFLAGS+=	-Wl,--as-needed # atk, dbusmenu, pango
 
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
-
-X11_USES=	xorg
-X11_USE=	XORG=x11 xi
-
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/data.*cfg/s/)/ RENAME ${PORTNAME}.cfg.sample)/' \
diff --git a/x11/gromit-mpx/distinfo b/x11/gromit-mpx/distinfo
index 1c530714dae4..9260264e1a65 100644
--- a/x11/gromit-mpx/distinfo
+++ b/x11/gromit-mpx/distinfo
@@ -1,7 +1,3 @@
 TIMESTAMP = 1664109823
 SHA256 (bk138-gromit-mpx-1.4.3_GH0.tar.gz) = 01c3e37ea0977a507349df34c474bdc939a57287aa41ce96d9eeb4d21279c6a4
 SIZE (bk138-gromit-mpx-1.4.3_GH0.tar.gz) = 1861824
-SHA256 (698a43a8dcd7.patch) = ad3943e4b288939b8e1637f60c2325a89b0fe8acb3e378ac6c61fdf42ec51be5
-SIZE (698a43a8dcd7.patch) = 7528
-SHA256 (7cd913191b48.patch) = f5f9911f59201d3fcc1aff40e1e802ebd824c2b5328597c71a5c9de70f66c6d4
-SIZE (7cd913191b48.patch) = 922