Received: by mail.netbsd.org (Postfix, from userid 605) id A520384D5B; Sun, 30 Apr 2023 17:44:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D3EF584D15 for ; Sun, 30 Apr 2023 17:44:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id sl8Vt4f0g1KV for ; Sun, 30 Apr 2023 17:44:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 266C884CF9 for ; Sun, 30 Apr 2023 17:44:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1375BFA87; Sun, 30 Apr 2023 17:44:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1682876698270700" MIME-Version: 1.0 Date: Sun, 30 Apr 2023 17:44:58 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/graphics/libepoxy To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20230430174458.1375BFA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1682876698270700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Apr 30 17:44:58 UTC 2023 Modified Files: pkgsrc/graphics/libepoxy: buildlink3.mk Log Message: libepoxy: if we were built with 'x11', buildlink what we were buildlunk with. Fixes gtk3's configure not finding a suitable libepoxy (at least on macOS), then building a vendored copy instead and failing PLIST check. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/libepoxy/buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1682876698270700 Content-Disposition: inline Content-Length: 848 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/libepoxy/buildlink3.mk diff -u pkgsrc/graphics/libepoxy/buildlink3.mk:1.5 pkgsrc/graphics/libepoxy/buildlink3.mk:1.6 --- pkgsrc/graphics/libepoxy/buildlink3.mk:1.5 Sun Sep 13 16:01:04 2020 +++ pkgsrc/graphics/libepoxy/buildlink3.mk Sun Apr 30 17:44:57 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2020/09/13 16:01:04 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2023/04/30 17:44:57 schmonz Exp $ BUILDLINK_TREE+= libepoxy @@ -8,6 +8,13 @@ LIBEPOXY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.2 BUILDLINK_PKGSRCDIR.libepoxy?= ../../graphics/libepoxy +pkgbase:= libepoxy +.include "../../mk/pkg-build-options.mk" + +.if ${PKG_BUILD_OPTIONS.libepoxy:Mx11} +.include "../../x11/libX11/buildlink3.mk" +.endif + .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} != "Darwin" --_----------=_1682876698270700--