From nobody Tue Nov 23 07:51:50 2021 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 068E118AD0D5; Tue, 23 Nov 2021 07:51:51 +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 4HyxDQ5VtVz4Rnx; Tue, 23 Nov 2021 07:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9E23F12BD9; Tue, 23 Nov 2021 07:51:50 +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 1AN7pojE097705; Tue, 23 Nov 2021 07:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AN7poSN097704; Tue, 23 Nov 2021 07:51:50 GMT (envelope-from git) Date: Tue, 23 Nov 2021 07:51:50 GMT Message-Id: <202111230751.1AN7poSN097704@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 9d8571acc5e8 - main - emulators/wine: Simplify 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d8571acc5e8cdb4a09bc69f2d17180f0a8248da Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637653910; 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=0N2h3NinEePTFdKojEmpnpV+0SDmYYg38au5vyAixEg=; b=w4NKHFAp8L1ieONKenl7YXSi/ITpk9Wl0xzmknYQszaTPnhjDGGzrwd+57xEw1KZMsFJxE G5n8jPq8YLgHXTlCyar9oR88jsDKDmFFCqPOhUolW35dnP1KnC2M+phSXS0E2OXO0VgfcP tKxR7FvJst/p2bpWlNCtjwYBh5P/ja6awSFeutsovq8o6ArJITj4O9WoXB7ntTwvHr2tRm Z1Zvjo72LEeOrACktfIwj8DByOQN6GOTvm9LG8AeoAdvsx3AQdWgBEAAesLd0sXEaba3kV bEu58rCGS3XhYpnL5YyvQxaNSCMPwLzlCcNcApV+goHorzmyI43uCn7qUPryPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637653910; a=rsa-sha256; cv=none; b=STcoeosEyPI3m012jZKtMUA5tNMymeAaShl7GClij1q6fAlD3NjgTkmZwXGLWdFC9B9yMT XpHmUoHI5njrY8JFbWPtfkH4FDn007r6eX67m0tqIMC+Wydw/PbvD0rLkKi5/2Asv3nJp7 231gM6oY0a3A5yLaDQU8f8tn34rCDsB6Vp3wZ77j3eOh2tywQN79yNJtfM8OLXeZzunChq CEaJJsBXu96cqEXBj5BVXy7Bqqqfmh9ZIC9UPtmrU8LHS/fGw1CuotXmPyHLamNc9vG/L+ 31btnFsqpMTSXJUfUZJXRdw2QWptamEOaOdUY/0hSKwVZiMWQ/V76jQny1B7wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d8571acc5e8cdb4a09bc69f2d17180f0a8248da commit 9d8571acc5e8cdb4a09bc69f2d17180f0a8248da Author: Gerald Pfeifer AuthorDate: 2021-11-23 07:48:15 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-23 07:48:15 +0000 emulators/wine: Simplify CONFLICTS_INSTALL wine-devel-* versus wine-devel-[0-9]* does not make a practical difference, but simpler is better (plus portlint has started to warn about it). --- emulators/wine/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index adbc2b205f47..ed3e5754d68f 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -27,7 +27,7 @@ USE_SDL= sdl2 CPE_VENDOR= winehq -CONFLICTS_INSTALL= wine-devel-[0-9]* +CONFLICTS_INSTALL= wine-devel-* GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \