From nobody Thu Feb 06 05:14:13 2025 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 4YpQJ54JkMz5n3v5; Thu, 06 Feb 2025 05:14:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpQJ53nS1z3R0N; Thu, 06 Feb 2025 05:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738818853; 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=XIkZt4XqRfsyD/gfEU31GU9RG/GRMA/L6TbSJliphp0=; b=KUM+eGGpjJ2+13RN98QtXbwsp1ASmmhabE54w6EMwG4xS/tZTy1t7KAtZVrzLizjL/OeqD oqoXwt5O4AghgcY6WEZSXVhFj6dvNXunPtaia2IYIqT07oe+HrLQCLjThXB2LNXaP53aiN vpf9pnkSMnDxSu5XgvAbEyWXHnWs21MQkWngWRugsyB2M9fVl2fpGBkXS2IxNWkRdtLs9u phH7wNH6iQlDjASNouKsOjJOPthY//BqwXsYJezS/OXif90cVXd3FbQ/KMqc7FFellhQ0y lL6ZMHTbZ4RbllMaXxm2K8+9dfq3NVVRzUw7aUHz6gUOV4S4X95HQQ4sJeYdUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738818853; 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=XIkZt4XqRfsyD/gfEU31GU9RG/GRMA/L6TbSJliphp0=; b=cLlrxVrCF6zK/URc7oSsSOunzqiwN133SsBAFVc7c6vODBPsDNOSf6+FoSW5sMcsR5MxBP QdW3KfxlcYU5zldWsli2qH/LanbmJsUKBdi0SEFRY6/aW6pOc2RXiPLaE/Reka3YDsAU8A bC4Bm1Ci0NO5OO5h3nPfWp8ueKv+S7h6GAysQI56WcEqRX+jAkxXE46wGCQMOe9jEwEgf3 WNCf11b1mQI7nbmmF7qWPScOh6z4hX6Gk0rz6D9CwrhmToqXteOcMoH2P0gGkfdeu1bBwH lZSx1omsL1KjITnTfNX5M/OAOx7vlnOxyH50MC9avYFiTLw3niDRjY8Vd7h7og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738818853; a=rsa-sha256; cv=none; b=w5kEdUppUaWwk3QFZePjuBIr8eK085zjvXMu5hFsC4PGjkOPBflVsjxo/DMHE1mPjezyzf 7DEwoH3hee7bUPlfQu+SbY8UrBkvjfrhLMRt1zJgH9G4vQHF5Qn7vvk0rX3A0hED0Elmrr joEe+rd+MtKiPPcpYErkQWeMKNnKplV+mqxzNyjyd+8X4qYW7BJbRHtZvDFVAtYzqjnXX4 fFz/PXPonNwbKTxLrk4NQXvFDAYCVr68ud9V2hfUbp1043XVM39nhQYGG2lssPmp8nifGB 47aYyJ76eU8hkKzH5AMDZLSWSiF8j7qbv2blKXBRVyoONc+wduSwXgbMQgGLJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpQJ53M6cz8MG; Thu, 06 Feb 2025 05:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5165EDkA040343; Thu, 6 Feb 2025 05:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5165EDcV040340; Thu, 6 Feb 2025 05:14:13 GMT (envelope-from git) Date: Thu, 6 Feb 2025 05:14:13 GMT Message-Id: <202502060514.5165EDcV040340@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: ed189afb0884 - main - */*: Fix conflict of PKGNAME 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed189afb08843f9b4246a380261b30b35a25fcab Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed189afb08843f9b4246a380261b30b35a25fcab commit ed189afb08843f9b4246a380261b30b35a25fcab Author: Yasuhiro Kimura AuthorDate: 2025-02-05 05:04:12 +0000 Commit: Yasuhiro Kimura CommitDate: 2025-02-06 04:58:50 +0000 */*: Fix conflict of PKGNAME * Fix conflict of PKGNAME by adding PKGNAMESUFFIX to the ports below - databases/tdb1410 - devel/talloc242 - devel/tevent016 * Set CONFLICTS_INSTALL between different versions of each port. * Update dependencies of databases/ldb29 and net/samba420 to reflect change of PKGNAME. * Bump PORTREVISION of modified ports. Reviewed by: 0mp, kiwi Differential Revision: https://reviews.freebsd.org/D48826 --- databases/ldb29/Makefile | 5 +++-- databases/tdb/Makefile | 2 ++ databases/tdb1410/Makefile | 4 ++++ devel/talloc/Makefile | 2 ++ devel/talloc242/Makefile | 4 ++++ devel/tevent/Makefile | 2 ++ devel/tevent016/Makefile | 8 ++++++-- net/samba420/Makefile | 13 +++++++------ 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/databases/ldb29/Makefile b/databases/ldb29/Makefile index ad3d19886f89..19f44c6601fd 100644 --- a/databases/ldb29/Makefile +++ b/databases/ldb29/Makefile @@ -1,5 +1,6 @@ PORTNAME= ldb PORTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SAMBA PKGNAMESUFFIX?= ${PORTVERSION:C/([[:digit:]]+)[.]([[:digit:]]+).*/\1\2/} @@ -79,8 +80,8 @@ PYTHON3_PLIST_FILES= ${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc \ # No fancy color error messages _CFLAGS_clang= -fno-color-diagnostics -_LDB_DEPENDS= talloc>=2.4.2:devel/talloc242 tevent>=0.16.0:devel/tevent016 \ - tdb>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \ +_LDB_DEPENDS= talloc242>=2.4.2:devel/talloc242 tevent016>=0.16.0:devel/tevent016 \ + tdb1410>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \ popt>=0:devel/popt _LDB_BINS= bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \ bin/ldbrename diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index b697ca6414e2..ecbbf156c8cc 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -27,6 +27,8 @@ CONFIGURE_ARGS+= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 +CONFLICTS_INSTALL= tdb[0-9]* + MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) OPTIONS_DEFINE= MANPAGES DEBUG PYTHON diff --git a/databases/tdb1410/Makefile b/databases/tdb1410/Makefile index f6a2386cd5d2..38e1114ada8c 100644 --- a/databases/tdb1410/Makefile +++ b/databases/tdb1410/Makefile @@ -1,8 +1,10 @@ PORTNAME= tdb DISTVERSION= 1.4.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA +PKGNAMESUFFIX= 1410 MAINTAINER= samba@FreeBSD.org COMMENT= Trivial Database @@ -27,6 +29,8 @@ CONFIGURE_ARGS+= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 +CONFLICTS_INSTALL= tdb + MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) OPTIONS_DEFINE= MANPAGES DEBUG PYTHON diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile index 1adbb88f0886..0e2752159337 100644 --- a/devel/talloc/Makefile +++ b/devel/talloc/Makefile @@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 +CONFLICTS_INSTALL= talloc[0-9]* + MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) OPTIONS_DEFINE= DEBUG MANPAGES PYTHON diff --git a/devel/talloc242/Makefile b/devel/talloc242/Makefile index 136c6b66a230..32e6c09f8a0f 100644 --- a/devel/talloc242/Makefile +++ b/devel/talloc242/Makefile @@ -1,7 +1,9 @@ PORTNAME= talloc DISTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SAMBA +PKGNAMESUFFIX= 242 MAINTAINER= samba@FreeBSD.org COMMENT= Hierarchical pool based memory allocator @@ -26,6 +28,8 @@ CONFIGURE_ARGS+= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 +CONFLICTS_INSTALL= talloc + MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) OPTIONS_DEFINE= DEBUG MANPAGES PYTHON diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile index 0ab8dec78ce6..7f2fb453050d 100644 --- a/devel/tevent/Makefile +++ b/devel/tevent/Makefile @@ -30,6 +30,8 @@ CONFIGURE_ARGS= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 +CONFLICTS_INSTALL= tevent[0-9]* + MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) OPTIONS_DEFINE= DEBUG MANPAGES PYTHON diff --git a/devel/tevent016/Makefile b/devel/tevent016/Makefile index 4775452bf995..d718cf50ce21 100644 --- a/devel/tevent016/Makefile +++ b/devel/tevent016/Makefile @@ -1,8 +1,10 @@ PORTNAME= tevent DISTVERSION= 0.16.1 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= devel MASTER_SITES= SAMBA +PKGNAMESUFFIX= 016 MAINTAINER= samba@FreeBSD.org COMMENT= Talloc based event loop library @@ -10,8 +12,8 @@ WWW= https://tevent.samba.org/ LICENSE= LGPL3 -BUILD_DEPENDS= talloc>=2.4.2:devel/talloc242 -RUN_DEPENDS= talloc>=2.4.2:devel/talloc242 +BUILD_DEPENDS= talloc242>=2.4.2:devel/talloc242 +RUN_DEPENDS= talloc242>=2.4.2:devel/talloc242 USES= compiler pkgconfig shebangfix waf USE_LDCONFIG= yes @@ -30,6 +32,8 @@ CONFIGURE_ARGS= --disable-rpath \ CONFIGURE_ENV= PYTHONHASHSEED=1 MAKE_ENV= PYTHONHASHSEED=1 +CONFLICTS_INSTALL= tevent + MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) OPTIONS_DEFINE= DEBUG MANPAGES PYTHON diff --git a/net/samba420/Makefile b/net/samba420/Makefile index 1ef52242b8da..f0657b1b2dcc 100644 --- a/net/samba420/Makefile +++ b/net/samba420/Makefile @@ -1,5 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}420 PORTVERSION= ${SAMBA4_VERSION} +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -220,8 +221,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else SAMBA4_BUNDLED_LIBS+= !talloc -BUILD_DEPENDS+= talloc>=2.4.2:devel/talloc242 -RUN_DEPENDS+= talloc>=2.4.2:devel/talloc242 +BUILD_DEPENDS+= talloc242>=2.4.2:devel/talloc242 +RUN_DEPENDS+= talloc242>=2.4.2:devel/talloc242 PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment " SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " .endif @@ -233,8 +234,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="" SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" .else SAMBA4_BUNDLED_LIBS+= !tevent -BUILD_DEPENDS+= tevent>=0.16.1:devel/tevent016 -RUN_DEPENDS+= tevent>=0.16.1:devel/tevent016 +BUILD_DEPENDS+= tevent016>=0.16.1:devel/tevent016 +RUN_DEPENDS+= tevent016>=0.16.1:devel/tevent016 PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment " SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " .endif @@ -246,8 +247,8 @@ PLIST_SUB+= SAMBA4_BUNDLED_TDB="" SUB_LIST+= SAMBA4_BUNDLED_TDB="" .else SAMBA4_BUNDLED_LIBS+= !tdb -BUILD_DEPENDS+= tdb>=1.4.10:databases/tdb1410 -RUN_DEPENDS+= tdb>=1.4.10:databases/tdb1410 +BUILD_DEPENDS+= tdb1410>=1.4.10:databases/tdb1410 +RUN_DEPENDS+= tdb1410>=1.4.10:databases/tdb1410 PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " .endif