Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Nov 2021 22:37:15 GMT
From:      =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6272fce2e638 - main - audio/dumb: Fix ALLEGRO_CONFLICTS
Message-ID:  <202111252237.1APMbF22036975@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6272fce2e63896cd4181efdaf8e853f5885c2e35

commit 6272fce2e63896cd4181efdaf8e853f5885c2e35
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-11-25 22:29:51 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111252237.1APMbF22036975>