From nobody Mon Jun 20 10:11:22 2022 X-Original-To: dev-commits-ports-main@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 CC2FF85FA71; Mon, 20 Jun 2022 10:11:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LRQQy3LR7z3Kjs; Mon, 20 Jun 2022 10:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655719882; 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=LLqi8/7S6igdxjdox0/rlShoyAJKyA5oT0KFqQw65Jg=; b=Yq41AB/+caq0ZnBYmKYNoBfjiMK1IS8wzDyhmGMOHDCZJgiEpZiI2ogfT1eeHpfmJKVXPy m6AdR5DsL9Oyiu0QkSdWQ51+R5dgTZMcqO+Qvsn4FmVRCkxYEhiUQM723eKxN04fM6e6qP MA2u6gfRKiJZy13AXL5DgM3/jBxvgNQgtPNAfguheADtm4ktR74KASHba5O1YEwQL+rg/r tuxujdhY2uHgBZ+jO4rzvHKYkgYSpxElokmVS7pGIlDwTjPOfqRMQOtlFk8TWaXHGGtXNw 0HCUezU+K/nZszQ4R2qp8SJs4m1X21GnF+ij28Ze5vKzAGxcT1fF4G3TUeOSMA== 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 1EBDE1B69C; Mon, 20 Jun 2022 10:11:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25KABMB8095168; Mon, 20 Jun 2022 10:11:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25KABMIS095167; Mon, 20 Jun 2022 10:11:22 GMT (envelope-from git) Date: Mon, 20 Jun 2022 10:11:22 GMT Message-Id: <202206201011.25KABMIS095167@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 05935ad55333 - main - graphics/glfw{,2}: add mutual CONFLICTS_INSTALL List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05935ad553330a4b3a15116efd1a92deed59f274 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655719882; 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=LLqi8/7S6igdxjdox0/rlShoyAJKyA5oT0KFqQw65Jg=; b=iXs4ajpZMaoJSqg344NUdLza5vW97g63smi1Pdd4gvRP13BURM2X3g/ZbB5jLjFBOlreV9 coDORHYQOSWGvdmtBi2d3yQazFXwd7NTQL7yUmPOAUVaq0P2oLrOg8ZAMBrtydehbYy6fW KIA8iIgYN47rxv1FuagbXwNzibFUUiBOttqGc5OlsA6xCGEhEsGULaiSIva4tFhjczGwVe F4kXt5MVsue+XCItxFY4pxr92c22jV9JLpApQ/6HLpyrted0ECT8FfiuneGOWgKyfLyxIK juR0G9pT/krORMP7Df9qMX7XWELHooYMNEi2JLijNfdJWUgnhD+7oxiBZ9RHvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655719882; a=rsa-sha256; cv=none; b=DxYHcm35ubLTed1PFm9a5k9+s8x8GVme1P7pm5SOdrfHq0SRRKDdCjeSROAYMX50FBBmsf SRclvX6Ur+tioGMIP9xF31nwMxfXvge4yFrVpPzdGZuzrB4pnyQYRuKpn4fN+FdtlapICk Xzo/udeBPljzQIT0XSVQCpT7SRPl4uvBvdjhYB27Jg7YIK59CqVDgKMtHDpxL2YD2GfdZz hcZnU9lMZ4P1L9BlO18sC/q/sqyTkZX8Al2ytuYobShBMm2TP5fQcU58bYOiaIgicuJVfP bQvn1JBddung+cgYQF2FVs88CXlpvsEwW6nn0JOcIbS7PMsquGxxzDQt/py8PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=05935ad553330a4b3a15116efd1a92deed59f274 commit 05935ad553330a4b3a15116efd1a92deed59f274 Author: Dmitry Marakasov AuthorDate: 2022-06-20 10:06:51 +0000 Commit: Dmitry Marakasov CommitDate: 2022-06-20 10:08:24 +0000 graphics/glfw{,2}: add mutual CONFLICTS_INSTALL Approved by: portmgr blanket --- graphics/glfw/Makefile | 2 ++ graphics/glfw2/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index 97749d5af364..4edfb208adfd 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -11,6 +11,8 @@ COMMENT= Portable framework for OpenGL development LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.md +CONFLICTS_INSTALL= glfw2 + USES= cmake:insource gl localbase zip USE_GL= glu USE_LDCONFIG= yes diff --git a/graphics/glfw2/Makefile b/graphics/glfw2/Makefile index d088fe1d3f8b..224915fc0e3b 100644 --- a/graphics/glfw2/Makefile +++ b/graphics/glfw2/Makefile @@ -13,6 +13,8 @@ COMMENT= Portable framework for OpenGL development LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/COPYING.txt +CONFLICTS_INSTALL= glfw + USES= gl tar:bzip2 xorg HAS_CONFIGURE= yes CONFIGURE_SCRIPT= compile.sh