From nobody Sat Apr 6 15:19:02 2024 X-Original-To: dev-commits-ports-all@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 4VBfCC1KNVz5GqDN; Sat, 6 Apr 2024 15:19:03 +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 4VBfCC0VXSz4qL2; Sat, 6 Apr 2024 15:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712416743; 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=7dQb7ynjW8Ee5htRZ/szn+mmrlBEDSerOK2tOeZN6yI=; b=lMXTOn0xHQy2LC35914+1KLVwo+fXJyTl3YXohdHVYHTw7GvTstG0QID0M+1uJbYx4hT1x kDkpb9RkJUWT2cyGRIWk3mirh2ji7ySasbKjkdYuneC5DLs+HNicxgws2vdNqIut01l+Am gLJnO4VsHlrYVAIIxa+VC7HRmTF5Dqbq5dQ2GXq/8pX0XCGS0nhBWwCqncvS/oQFr/oHoo mEMCwlfGWKyIlPo2gyvGmrPxzrT6KDLC+NdxD74CGZkI8Rtu2oOQhwSzVpYGPfG1uuANsJ bmokJRPnwJvKbnm1N7uPC+OVTEx43kJ96sU9OoFd40awQV2jL6jiSdKnAtBkBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712416743; a=rsa-sha256; cv=none; b=UMs7LyVpwOf8Q9CXb/CB9YBsIvgJkd1732oMwI4Mdmi9laqCM7eqPVMTZABPsPiZyE6Zex 7Heou17cg77ZrvFutseR8eprrL9OijrmSoVLhnbQtjy5jQOEMFgvUxWYvy9H4RFWCcAAsX MmUeK2NE3V9dTN2affDy5Nj/fjOL8nP1umdgZFhOfqvFyzPfM6xZJapNjwH0Tnv2pBY4X/ xMeHhq/CkgZDNbSdzMreXTYzk1DR2F9Y4whWeJqMrYQjAfc3vNmOUDgW0zaRKbLCtHy5Us EG60/vLVBasE/z9NaX4IisvUG7IDH8881f97o9S/4uX4vSzqi7UkMGj9PQNjPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712416743; 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=7dQb7ynjW8Ee5htRZ/szn+mmrlBEDSerOK2tOeZN6yI=; b=b8iH0AzsbVKEfdDqMu29ntRmYftOFGYR+5GQ9z2zA+o/p/0MuGLiZ7jCpSW15jSqw/c1QM Pw08cHLsNf53Fm2Mgj2vystLZeewZQ6OjCUkff1rLrKfJbUH+NuTMEJ7f9Ws06Yz76f6MA lnwhLywdLMzyb6yubyGIPlcE6JCh5ufY4O7Zkre+6z8ulQXe4I59BXW+TO80012OXnrMGR tZvkYpCv+OSoU75ATQVgF8KSxPVLwOeFTrvvWqyIH3wt0cpgEUZ82IgmracfO+sXsOn+l1 eV96RC9O4EoNRO6t61BW0P/dFGfkzo3UaCagytb44kUxiBnD8YBpKS7gLUbbxQ== 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 4VBfCB759bzpfh; Sat, 6 Apr 2024 15:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436FJ2kj022946; Sat, 6 Apr 2024 15:19:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436FJ2Cp022943; Sat, 6 Apr 2024 15:19:02 GMT (envelope-from git) Date: Sat, 6 Apr 2024 15:19:02 GMT Message-Id: <202404061519.436FJ2Cp022943@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: c0cf30c53a36 - main - databases/p5-DBD-mysql: adjust CONFICTS_INSTALL after adding databases/p5-DBD-mysql4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0cf30c53a36bb8f5db853035c145573f44cb557 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0cf30c53a36bb8f5db853035c145573f44cb557 commit c0cf30c53a36bb8f5db853035c145573f44cb557 Author: Vladimir Druzenko AuthorDate: 2024-04-06 15:14:16 +0000 Commit: Vladimir Druzenko 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