git: 87b108e9d614 - main - devel/gobject-introspection: Override PREFIX for the @bootstrap flavor

The branch main has been updated by arrowd:

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

commit 87b108e9d6140e94d3c26d8ca64136c26b53a318
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-04-04 10:20:02 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-04-04 19:11:59 +0000

    devel/gobject-introspection: Override PREFIX for the @bootstrap flavor
    
    This allows to break the install-time conflict between gobject-introspection
    and gobject-introspection-bootstrap
    
    PR:             285863
---
 devel/glib20/Makefile                | 9 ++++++++-
 devel/gobject-introspection/Makefile | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 74c94d95816b..2d36f81d6ec3 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -27,7 +27,7 @@ FLAVORS=	default bootstrap
 FLAVOR?=	${FLAVORS:[1]}
 FLAVORS_SUB=	yes
 
-default_BUILD_DEPENDS=	g-ir-scanner:devel/gobject-introspection@bootstrap
+default_EXTRACT_DEPENDS=	${LOCALBASE}/gobject-introspection-bootstrap/bin/g-ir-scanner:devel/gobject-introspection@bootstrap
 default_USES=		trigger
 
 bootstrap_PKGNAMESUFFIX=	-bootstrap
@@ -82,9 +82,16 @@ OPTIONS_DEFINE=
 PREFIX=		${LOCALBASE}/glib-bootstrap
 PLIST_SUB+=	PORTDOCS='@comment ' NLS='@comment ' MANPAGES='@comment '
 .else
+BINARY_ALIAS+=	g-ir-scanner=${LOCALBASE}/gobject-introspection-bootstrap/bin/g-ir-scanner
 MESON_ARGS+=	-Dintrospection=enabled
 .endif
 
+.if ${FLAVOR:U} == default
+post-extract:
+	${CP} -r ${LOCALBASE}/gobject-introspection-bootstrap/libdata/pkgconfig ${PKGCONFIG_LINKDIR}
+	${CP} ${LOCALBASE}/glib-bootstrap/libdata/pkgconfig/* ${PKGCONFIG_LINKDIR}
+.endif
+
 pre-configure-FAM_ALTBACKEND-on:
 	@${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \
 		s|.*kqueue-missing.c.*||g ; \
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index efd8d48a869b..d4026860af33 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gobject-introspection
 DISTVERSION=	1.82.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -20,12 +21,10 @@ FLAVORS=	default bootstrap
 FLAVOR?=	${FLAVORS:[1]}
 
 default_LIB_DEPENDS=	libglib-2.0.so:devel/glib20
-default_CONFLICTS_INSTALL=	gobject-introspection-bootstrap
 
 bootstrap_PKGNAMESUFFIX=	-bootstrap
 bootstrap_BUILD_DEPENDS=	${LOCALBASE}/glib-bootstrap/lib/libglib-2.0.so:devel/glib20@bootstrap
 bootstrap_RUN_DEPENDS=		${LOCALBASE}/glib-bootstrap/lib/libglib-2.0.so:devel/glib20@bootstrap
-bootstrap_CONFLICTS_INSTALL=	gobject-introspection
 
 USES=		bison gettext localbase:ldflags meson pkgconfig python tar:xz
 USE_LDCONFIG=	yes
@@ -41,6 +40,7 @@ TEST_LIB_DEPENDS=	libcairo.so:graphics/cairo
 .if ${FLAVOR:U} == bootstrap
 MESON_ARGS+=	-Dcairo=disabled
 OPTIONS_DEFINE=
+PREFIX=		${LOCALBASE}/${PORTNAME}-bootstrap
 .endif
 
 .include <bsd.port.pre.mk>