From nobody Thu Nov 25 22:37:15 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 2E2D518B8D78; Thu, 25 Nov 2021 22:37:17 +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 4J0Xn75zjwz3KNm; Thu, 25 Nov 2021 22:37:15 +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 A8877258AD; Thu, 25 Nov 2021 22:37:15 +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 1APMbFK4036976; Thu, 25 Nov 2021 22:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APMbF22036975; Thu, 25 Nov 2021 22:37:15 GMT (envelope-from git) Date: Thu, 25 Nov 2021 22:37:15 GMT Message-Id: <202111252237.1APMbF22036975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 6272fce2e638 - main - audio/dumb: Fix ALLEGRO_CONFLICTS 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6272fce2e63896cd4181efdaf8e853f5885c2e35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637879836; 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=Aaeb1ojEOKd34Ykr2wgUQlBN3BvOlTEE1haB7UB3BSs=; b=ypeRJ01GdcNiUF2lW5L+5gATLZ+PoutPJCtcpoInKtkdBPF002t1IFyg2khaETxTH+Yw+X XeU5JcxeW9sZFHAcrd/aimszA7ATFx5/cxRtNOXy/OJVmcfv6PRyfN8fjme2LanLR7WeLu 11ULbR60Av5/NGnKsvt2ZHYPlahXuk68onSVhc/h2Q7mACZTgFOJMcfaY0WR7jkNExDBkh eFBMl/OA81XgqY8nnmxFivcG0v3boylUdkP+juBnlZiilASudaM7tqhMVFrSNCKrXaO5Z8 hbMzHe3sDvgxBcK4POwMcWM+B1iHrtgYN6qZvcnBbs56/Xkosps/iHFdcqmnNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637879836; a=rsa-sha256; cv=none; b=rD5DMCgfFByjKeAv7wlqvsi2jhlhbCc6AuFOr6zI0iPnqj2fJSWHO4Q/6EV34L2/1e97PP +cdtfz/KXnwTXtlPvCznO2CpImkGtVdCtxrZTJnVmTOSTtdHGj48AOXY4AlsqeZ1uBRbbw PDKKYHsoSYeySs15CueB0z7h6PotcTHGx/NTyFJGSifrZlnYnuWdCQTcVJEFBVOWPDnXQt e1fKwmtjiYFuvOtgTKA0mNA9euAwr6LKLB30+Hm5vVXEzHNtc55X1FZha6cit27sXf81aA psIUAbrmhjij+rxQXLv9aj7N4U4fqqjuJZCsxCxlUPknbNlEYAGCb9D4yferFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=6272fce2e63896cd4181efdaf8e853f5885c2e35 commit 6272fce2e63896cd4181efdaf8e853f5885c2e35 Author: Stefan Eßer AuthorDate: 2021-11-25 22:29:51 +0000 Commit: Stefan Eßer CommitDate: 2021-11-25 22:36:59 +0000 audio/dumb: Fix ALLEGRO_CONFLICTS Remove redundant -[0-9]* from the end of the CONFLICTS pattern. Approved by: portmgr (blanket) --- audio/dumb/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile index eb0dc9bf2b65..58a6e54cfed7 100644 --- a/audio/dumb/Makefile +++ b/audio/dumb/Makefile @@ -18,9 +18,9 @@ ALLEGRO_DESC= Enable allegro support ALLEGRO_LIB_DEPENDS= liballeg.so:devel/allegro ALLEGRO_MAKE_ARGS= _PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" \ LINK_ALLEGRO="`allegro-config --libs` -lm" -ALLEGRO_CONFLICTS= dumb-[0-9]* +ALLEGRO_CONFLICTS= dumb ALLEGRO_MAKE_ARGS_OFF= _PORT_ALLEGRO_CFLAGS= -ALLEGRO_CONFLICTS_OFF= dumb-allegro-[0-9]* +ALLEGRO_CONFLICTS_OFF= dumb-allegro # libdumb.a is linked into libaudiere.so from audio/audiere. CFLAGS+= -fPIC