From nobody Wed Feb 28 14:30:21 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 4TlGwZ1r2Gz5Bh2T; Wed, 28 Feb 2024 14:30:22 +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 4TlGwZ1JSsz4l94; Wed, 28 Feb 2024 14:30:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709130622; 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=/WCEq0kCmhEJuhZybJP2bzndJqw/MmXwwLh5r6sH1po=; b=IbxojFFCca541dTXIgWKhmBrbyYi2g3Gye3y9OmbBVfe+5pYzkd2Q63nD1oTKoGiZ88UUw lZcK3WCvKfeKDEgxQsAXWOidp+2EA6oZmmMpP8/uOH67TuYLDDla9PSxK/kLS+uAO+mtYk hjxjqoimCSy6ZZ+dptgCg1QBvdJLxZyfafgVo3DAEqVg8vGwa8Ruxo7oetn+dn8XD8sXFU uIvgXRu/lSdsC4hkjbE3NqiMstvSK+MN7oNOVt0/tIPWKsrKdleIHZSOz0890d1J5tRXmf 6xSEJnDmGS4WCw80V1ZLetqiygJgfaiahTpJ4um/QrfmkZta+9F1m6dxAnsRdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709130622; a=rsa-sha256; cv=none; b=dfPX8SIcYqmOYInBA0xaXPmK2S/arbWfa0ESqAJ0ZwDODh9qc5+9yh60HqM7oWBVB/uQWO vvtlqKCc+WzFIN65tEOyhjhvrBNr/24wCAc6zcbg0MZUEIOL+XtcMK6IZ09hkFLwh/nX78 rA7Nnyvr1Vf+kMCpuAcsQaIluu0EeaezyQ4e1ISavcLpXUYaE6U1BO6mysvdGEGjEpKM/s gH7B8kP2ywGgKZDFFRE425GXX1+Zkh2UOtn2v9/PQnt7mnsbi1zCBPmrx5eyfLVFGiziuZ Lzav14PQpsKqcmfVR+0GIQa9FHam2N7tVO2KGuz0fkAca9W093E2RhZax7Nq7w== 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=1709130622; 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=/WCEq0kCmhEJuhZybJP2bzndJqw/MmXwwLh5r6sH1po=; b=ZqKw7Zy2YnSWBO+lUwfCt9YKyuFRPUVmzKE+pfuOWs5TOltaQkglgM4Wj9v/3q8hJDSYQP cn6PgHGeT7E6zAueoBia6mOW9sYPisEYtj5SnCs92onG8oigI1/NI8CRY6a8e4k/ihUOjA c5Q6K3AV3t4MNE0Ll0/Tob+pi/aaSJRofrdrbBEkvMRsE0llNlD+OE5MQYOsbjN8meN1m0 TxxstknP0xH5Q4pv4QKqbmFEw2sTkdQpEJshZe8CL0+2Sesjmnrmzqd0aBptGyWhxWlOtK kWgaZXmM0FHwGO8KAr+aZ16j88J40AhTOnOCX/48gY1YWwpEAIseWbnV+N3YxQ== 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 4TlGwZ0M8Jz11Jn; Wed, 28 Feb 2024 14:30:22 +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 41SEULWv091829; Wed, 28 Feb 2024 14:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SEULaD091826; Wed, 28 Feb 2024 14:30:21 GMT (envelope-from git) Date: Wed, 28 Feb 2024 14:30:21 GMT Message-Id: <202402281430.41SEULaD091826@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 06b59a3047f5 - main - net/samba419: fix conflict with talloc 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06b59a3047f5d79b229135a0c9a64fe359ae13b0 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=06b59a3047f5d79b229135a0c9a64fe359ae13b0 commit 06b59a3047f5d79b229135a0c9a64fe359ae13b0 Author: Denis Shaposhnikov AuthorDate: 2024-02-28 14:28:06 +0000 Commit: Mikael Urankar CommitDate: 2024-02-28 14:30:15 +0000 net/samba419: fix conflict with talloc PR: 276988 --- net/samba419/Makefile | 10 ++++++++-- net/samba419/pkg-plist | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/net/samba419/Makefile b/net/samba419/Makefile index fad94b93861b..312dba2f48b8 100644 --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}419 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -213,7 +213,6 @@ SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " # talloc .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= talloc -CONFLICTS_INSTALL+= talloc-* talloc1-* PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" .else @@ -658,6 +657,13 @@ post-install-fix-manpages: ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/${f} ${STAGEDIR}${PREFIX}/share/man/man1/samba-${f} . endfor .endif + +.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes +. for f in talloc.3 + ${MV} ${STAGEDIR}${PREFIX}/share/man/man3/${f} ${STAGEDIR}${PREFIX}/share/man/man3/samba-${f} +. endfor +.endif + .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes . for f in tdbbackup.8 tdbdump.8 tdbrestore.8 tdbtool.8 ${MV} ${STAGEDIR}${PREFIX}/share/man/man8/${f} ${STAGEDIR}${PREFIX}/share/man/man8/samba-${f} diff --git a/net/samba419/pkg-plist b/net/samba419/pkg-plist index c9087d686bb1..93e4d4c12334 100644 --- a/net/samba419/pkg-plist +++ b/net/samba419/pkg-plist @@ -454,7 +454,7 @@ share/man/man8/winbindd.8.gz %%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpytalloc-util%%PYTHON_EXT_SUFFIX%%-samba4.so %%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_LIBDIR%%/private/libtalloc-samba4.so -%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/talloc.3.gz +%%SAMBA4_BUNDLED_TALLOC%%share/man/man3/samba-talloc.3.gz %%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_tdb_text.py %%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so %%SAMBA4_BUNDLED_TDB%%bin/tdbbackup