Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Apr 2024 15:19:02 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c0cf30c53a36 - main - databases/p5-DBD-mysql: adjust CONFICTS_INSTALL after adding databases/p5-DBD-mysql4
Message-ID:  <202404061519.436FJ2Cp022943@gitrepo.freebsd.org>

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

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

commit c0cf30c53a36bb8f5db853035c145573f44cb557
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-04-06 15:14:16 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-04-06 15:14:16 +0000

    databases/p5-DBD-mysql: adjust CONFICTS_INSTALL after adding databases/p5-DBD-mysql4
    
    databases/p5-DBD-mysql4 added in 95f49cb3b54aa5c685fb3ea73aaf1be76af6111
    
    PR:             277889 275100
    Approved by:    flo, arrowd (mentor, implicit)
---
 databases/p5-DBD-mysql/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 9d3b238bc878..c5cdd232c009 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 CONFIGURE_ARGS=		${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}}
 _CONFIGURE_ARGS_gcc=	--libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`"
 
-CONFLICTS_INSTALL=	p5-DBD-mysql[45][0-9]
+CONFLICTS_INSTALL=	p5-DBD-mysql4
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so



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