git: 31c499a80bd5 - main - x11-wm/phoc: remove @phosh flavor after 4f9372d4c09a

The branch main has been updated by jbeich:

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

commit 31c499a80bd52c360568c0a6ade26c8c23a8f89f
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-03 16:36:19 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-03 16:53:01 +0000

    x11-wm/phoc: remove @phosh flavor after 4f9372d4c09a
    
    Bundling doesn't scale unlike port forks as the framework doesn't
    support nesting between unrelated ports. Reduce maintainence by
    dropping a flavor with a workaround for removed port.
    
    https://gitlab.gnome.org/World/Phosh/phosh/-/issues/422
---
 x11-wm/phoc/Makefile                          | 13 ----------
 x11-wm/phoc/Makefile.wlroots                  | 15 ------------
 x11-wm/phoc/distinfo                          |  2 --
 x11-wm/phoc/files/extra-patch-private-wlroots | 35 ---------------------------
 4 files changed, 65 deletions(-)

diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 116504fa194e..2cecbe0cbee4 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -19,8 +19,6 @@ LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter
 
-FLAVORS=	default phosh
-
 USES=		compiler:c11 gl gnome meson pkgconfig python:build shebangfix xorg
 USE_GITLAB=	yes
 USE_GL=		glesv2
@@ -34,16 +32,5 @@ CFLAGS+=	-Wno-error=format-nonliteral # clang
 PLIST_FILES=	bin/${PORTNAME}
 GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
 
-.if ${FLAVOR:U} == phosh || make(makesum)
-PKGNAMESUFFIX=	-${FLAVOR}
-COMMENT+=	(with patched wlroots from PureOS)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-private-wlroots
-CONFLICTS_INSTALL=	${PORTNAME}
-.include "${.CURDIR}/Makefile.wlroots"
-.else
-COMMENT+=	(with system wlroots)
-CONFLICTS_INSTALL=	${PORTNAME}-phosh
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-wm/phoc/Makefile.wlroots b/x11-wm/phoc/Makefile.wlroots
deleted file mode 100644
index 106de7ae5c88..000000000000
--- a/x11-wm/phoc/Makefile.wlroots
+++ /dev/null
@@ -1,15 +0,0 @@
-BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*} \
-		xwayland-devel>0:x11-servers/xwayland-devel
-LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
-		libudev.so:devel/libudev-devd \
-		libdrm.so:graphics/libdrm \
-		libseat.so:sysutils/seatd \
-		libxcb-errors.so:x11/xcb-util-errors \
-		libxcb-render-util.so:x11/xcb-util-renderutil \
-		libxcb-icccm.so:x11/xcb-util-wm
-RUN_DEPENDS+=	mesa-dri>0:graphics/mesa-dri \
-		xwayland-devel>0:x11-servers/xwayland-devel
-USE_GL+=	gbm egl
-GL_TUPLE+=	https://source.puri.sm:Librem5:wlroots:1f8bb9e0e3058fc31a14866dc52e8f83c1287a09:wlroots/subprojects/wlroots
-MESON_ARGS+=	-Dwlroots:default_library=static
-PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
diff --git a/x11-wm/phoc/distinfo b/x11-wm/phoc/distinfo
index 1b74686bb7ab..b651c9127a38 100644
--- a/x11-wm/phoc/distinfo
+++ b/x11-wm/phoc/distinfo
@@ -1,5 +1,3 @@
 TIMESTAMP = 1675164985
 SHA256 (World/Phosh-phoc-8af5ef8fed9f82e80b73c44f82aa11206ba6157b_GL0.tar.gz) = 0f0c342d5f444ad63a11ad5c956aceaff8369c2a1a71921632b0d11f3467306b
 SIZE (World/Phosh-phoc-8af5ef8fed9f82e80b73c44f82aa11206ba6157b_GL0.tar.gz) = 224617
-SHA256 (Librem5-wlroots-1f8bb9e0e3058fc31a14866dc52e8f83c1287a09_GL0.tar.gz) = 5189fb5a24ac0638e073aaf16e6d3bf312ae2471db3e35969dc66caa5d8b56fe
-SIZE (Librem5-wlroots-1f8bb9e0e3058fc31a14866dc52e8f83c1287a09_GL0.tar.gz) = 587020
diff --git a/x11-wm/phoc/files/extra-patch-private-wlroots b/x11-wm/phoc/files/extra-patch-private-wlroots
deleted file mode 100644
index db9282d88597..000000000000
--- a/x11-wm/phoc/files/extra-patch-private-wlroots
+++ /dev/null
@@ -1,35 +0,0 @@
-wlroots 0.12.0 is out-of-date and has no other consumers. Keep it
-private to phoc package for now.
-
---- subprojects/wlroots/include/meson.build.orig	2021-08-20 08:28:34 UTC
-+++ subprojects/wlroots/include/meson.build
-@@ -8,7 +8,9 @@ if conf_data.get('WLR_HAS_XWAYLAND', 0) != 1
- 	exclude_files += 'xwayland.h'
- endif
- 
-+if not meson.is_subproject()
- install_subdir('wlr',
- 	install_dir: get_option('includedir'),
- 	exclude_files: exclude_files,
- )
-+endif
---- subprojects/wlroots/include/wlr/meson.build.orig	2021-08-20 08:28:34 UTC
-+++ subprojects/wlroots/include/wlr/meson.build
-@@ -16,4 +16,6 @@ ver_h = configure_file(
- 	configuration: version_data,
- )
- 
-+if not meson.is_subproject()
- install_headers(conf_h, ver_h, subdir: 'wlr')
-+endif
---- subprojects/wlroots/meson.build.orig	2021-09-12 16:57:08 UTC
-+++ subprojects/wlroots/meson.build
-@@ -147,7 +147,7 @@ lib_wlr = library(
- 	soversion: soversion,
- 	dependencies: wlr_deps,
- 	include_directories: [wlr_inc, proto_inc],
--	install: true,
-+	install: not meson.is_subproject(),
- 	link_args: symbols_flag,
- 	link_depends: symbols_file,
- )