From nobody Wed Aug 21 17:01:32 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 4Wpt0D5LwPz5VBRk; Wed, 21 Aug 2024 17:01:32 +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 4Wpt0D4k95z4cjk; Wed, 21 Aug 2024 17:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724259692; 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=4wn8aCaLK/MXqvZorJfK4NiY+bPuV3hnY6GrMvx1fpI=; b=Jd82do8ZuYUUJLVq2D5uNJlIGYIM72gDYz2y9NaYGQrViW7JDWAk52zh5lgsKjzyHTt2rR lmMynESq/9J3Vtq2nJ9HlUnK7Wo6M6jcSssyIU8YntQsc3g608w2a7MX1apesXlYsc7/OV vRaLDVf7Q5BcOeJNgrnsK1S/UVKs0XGWamkJF+QbAi5+annIx1w/rGMopDmTZ8B2nX6Mx/ tdfRfJyfe/2h6L+XyTwiJdVxjM6VdsKyFJKaA2f2POrwnk/Kx9w+b0ow5kRlBxqSUvyg8W 92GZPX1L8RiHOkMnWkiDJNIFszr3PlR4wyheS3aL46Yz1fgiIF6tQSurzBWeIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724259692; a=rsa-sha256; cv=none; b=T4jUaFKCeGvP+qkp+jZ+ctTdJTRoJRX4+EkS5P1tGFD8eOQcyFhh79KOH7DFC3LydBKfPn NFSord0sPhoOVIligsXc6GzamBx2IX8aDABYkx+6d3voEzCMvYbjVz0BdUybVYiZEIkzr8 QW8FLNbQ3BgliLPwzI/Nvwvq3l6R7p3mmlSSP0XBRgeqdzUNdUAIRtR8FfOQJSvYUY7iFe 7LvBsxv0/vCq4fHCwV+59WxtpLGI01FzjhwJ1AGCnn4wva2FHD3MM2hj3Tw5FZTQW2dMrD 8/YZ/IjVgE6uIOuXYf2z6jydUUG92ka6qfT6FiSeNV2MhSmLPN1USd+S2Uk58A== 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=1724259692; 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=4wn8aCaLK/MXqvZorJfK4NiY+bPuV3hnY6GrMvx1fpI=; b=WRnAtZMQvuukJLgztAeZvvAIJPnJiT6WS2QJ+Hgl/ZelZqgRIfXRYScNjCVp5BSj0jusgE l6VbyfT3MnEKZWsGm0l7ZJtHkV6kSdNEVwKxSqs7Ajfxr9YF+APX9ezkq6GVAVlRb3+N/Z vT5pow2FStE8Rbs5uxbD6c7HuY81+k+t8yI+VDwKil536FV+rbmMhq8lcB04G0JGt6rhpQ GpGv68BvwY58qIjyi0D4CPdGvpJ5JiawT4BA4NH0hZbqkopbpA0W/4l1OB1J5w9w5u6Kpe KcqFiuUSP9/VVMM7sKcWZXGsGH9VdbNwsDJfiwT92fD7hYetlvFulTa4eaqvzg== 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 4Wpt0D4KmFzsDj; Wed, 21 Aug 2024 17:01:32 +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 47LH1WA0039030; Wed, 21 Aug 2024 17:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47LH1WcW039027; Wed, 21 Aug 2024 17:01:32 GMT (envelope-from git) Date: Wed, 21 Aug 2024 17:01:32 GMT Message-Id: <202408211701.47LH1WcW039027@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: b6c509342f4a - main - Mk/Uses/samba.mk: Clean up and define SAMBA_LDB_PORT 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6c509342f4a065b30cf1afe0b2a8f67bd5a0401 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6c509342f4a065b30cf1afe0b2a8f67bd5a0401 commit b6c509342f4a065b30cf1afe0b2a8f67bd5a0401 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2024-08-19 19:56:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-08-21 17:00:46 +0000 Mk/Uses/samba.mk: Clean up and define SAMBA_LDB_PORT - Deprecate the SAMBAPORT, SAMBALIBS, and SAMBAINCLUDES variables and replace them with the more readable and consistent SAMBA_PORT, SAMBA_LIBDIR, and SAMBA_INCLUDEDIR. The new variables follow the conventions of python.mk, ruby.mk, and cargo.mk more and are more future-proof. - Rearrange the order of IGNORE checks. - Explicitly mention the ports used samba.mk in a searchable manner (i.e., grepping for net/samba419 is going to return samba.mk). - Define SAMBA_LDB_PORT, which allows ports to always use the right version of ldb for the Samba selected via SAMBA_DEFAULT. - Remove old comments about samba.mk becoming more granular once subpackages are committed. Subpackages will not help samba.mk because Samba's bundled dependencies are built as private libraries and are not usable by external software. PR: 280773 Reviewed by: Xavier Beaudouin Approved by: samba (0mp, Xavier Beaudouin ) Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D46322 --- Mk/Uses/samba.mk | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index de3ba677bc7e..27d0ec1595da 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -5,8 +5,6 @@ # Valid ARGS: build, env, lib, run # default is build,run (implicit) # -# When subpackages are available this can be more granular -# # MAINTAINER: samba@FreeBSD.org .if !defined(_INCLUDE_USES_SAMBA_MK) @@ -20,22 +18,35 @@ samba_ARGS= build run IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} . endif -SAMBAPORT= net/samba${SAMBA_DEFAULT:S/.//} -SAMBAINCLUDES= ${LOCALBASE}/include/samba4 -. if ${SAMBA_DEFAULT} == 4.16 || ${SAMBA_DEFAULT} == 4.19 -SAMBALIBS= ${LOCALBASE}/lib/samba4 -. else +. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} . endif +SAMBA_SUFFIX= ${SAMBA_DEFAULT:S/.//} + +SAMBA_PORT_416= net/samba416 +SAMBA_LDB_PORT_416= databases/ldb25 +SAMBA_PORT_419= net/samba419 +SAMBA_LDB_PORT_419= databases/ldb28 + +SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}} +SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4 +SAMBA_LIBDIR= ${LOCALBASE}/lib/samba4 +SAMBA_LDB_PORT= ${SAMBA_LDB_PORT_${SAMBA_SUFFIX}} + . if ${samba_ARGS:Mbuild} -BUILD_DEPENDS+= smbd:${SAMBAPORT} +BUILD_DEPENDS+= smbd:${SAMBA_PORT} . endif . if ${samba_ARGS:Mlib} -LIB_DEPENDS+= libsmbclient.so:${SAMBAPORT} +LIB_DEPENDS+= libsmbclient.so:${SAMBA_PORT} . endif . if ${samba_ARGS:Mrun} -RUN_DEPENDS+= smbd:${SAMBAPORT} +RUN_DEPENDS+= smbd:${SAMBA_PORT} . endif +# Legacy variables. Removing those requires a tree-wide update +# and a note in the CHANGES file +SAMBAPORT= ${SAMBA_PORT} +SAMBAINCLUDES= ${SAMBA_INCLUDEDIR} +SAMBALIBS= ${SAMBA_LIBDIR} .endif