From nobody Fri Apr 04 19:15:13 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZTpGB1SBzz5sHM9; Fri, 04 Apr 2025 19:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTpG962Bxz3p2M; Fri, 04 Apr 2025 19:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743794113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvjYUQxDiWn8og6C0m8PK4cMA5W5S7a9HCvmcxOjUAs=; b=GY6NzsaY+3U9k5FiDPOuneWoVbiI1CdZQ/qKG+6EWJZdk1D8CxMECbYUUeag4YIVJUXqu0 ZYH0Crdunt6Nx1VuVzH2HaKdT4QyzIQObFCpchM4a98KFL1zJ8HPdld4G+qNg+NAUjub+1 S6YEWG6OXsci/UGlCTwc2nx1PLwKEZWJZkiGl2F/f+KNvtRfC21kWALBt1Ozqtyq2EOIag uajF4wXSdlom5UVqIVGMRpzNOHdjHVQ8UVyRzp4+ZYxyx0bw3MSR7lwqTLEn9iWvvcgJk8 Vxf8lcgomggKVVTa8Er6OzkTLDcWQQlAP4qWDYvffQagZFtN0HsejiK2XYqQxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743794113; a=rsa-sha256; cv=none; b=rSxyzTMTjktRMBl4eJpKzZNvPKGLbYSaJVnoKVDyf6Gph2OIO42WZgAWTRxh8Jil8r4ve5 wQhharvJlWJ4Mp/MzsvZIZbUGkQzzgGi7OP5hLtcfZVCghzIOWoI9jDu0L2KrEK4AsYEf0 48KzkKXOlUrL/B5roJCp8vsk0KnNPPCEx+6wilB6e8Zi5GRfwJe8FrkfTuDVURY3gA1TpU 57KIdI+fL+hIAdjPHMnpt6C7S1x7Cu5I1JCrCU6/d0A2mrIf1aOxOrHkEuZmsrdOBjmbh5 DpZdby5FmcRwnZ74Xp5sCv39mXspRj9/Hwj1FAA4K14vcRdmH8X+ZdjjkbaEuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743794113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvjYUQxDiWn8og6C0m8PK4cMA5W5S7a9HCvmcxOjUAs=; b=EekuQdOu2/YgOq1eyNcO3OBgM0qxhyllFodIdA9xbxkzqIZtwbTqcLnSa3qf6D6i1jXDRo bAMtgVCrleArWmaBcnABGdfHvAogjnRAIZm4A8izMiPDXeCDIdQ5w2ekXZLO3s6EVEof3p bw19s3yjtvWPv8RjvP3DjWU5kK7glXTvOrO5WPYUYb+yuzdA+HqA/50HqQkIpNMWVv77Zp G0BFEPW45V7LNJjc3n96OBYZUjYrHTklDY+A2dWGcKd6dQXJPOBzPdu9GKDkO2Vsx1MWPn r80Y4naWF+frSlPs5b0OcQIyh+VjZwcNswif3wNQDDl0vBV1m+N2/yH6vw3BJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZTpG9543PzyDK; Fri, 04 Apr 2025 19:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 534JFDrP093778; Fri, 4 Apr 2025 19:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 534JFDEn093775; Fri, 4 Apr 2025 19:15:13 GMT (envelope-from git) Date: Fri, 4 Apr 2025 19:15:13 GMT Message-Id: <202504041915.534JFDEn093775@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 87b108e9d614 - main - devel/gobject-introspection: Override PREFIX for the @bootstrap flavor List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87b108e9d6140e94d3c26d8ca64136c26b53a318 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=87b108e9d6140e94d3c26d8ca64136c26b53a318 commit 87b108e9d6140e94d3c26d8ca64136c26b53a318 Author: Gleb Popov AuthorDate: 2025-04-04 10:20:02 +0000 Commit: Gleb Popov 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