From owner-dev-commits-ports-all@freebsd.org Sat Apr 24 15:13:59 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 67990622F8F; Sat, 24 Apr 2021 15:13:59 +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 4FSF6v2FHmz3HFV; Sat, 24 Apr 2021 15:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3FF6822851; Sat, 24 Apr 2021 15:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13OFDx4i044364; Sat, 24 Apr 2021 15:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13OFDxZH044363; Sat, 24 Apr 2021 15:13:59 GMT (envelope-from git) Date: Sat, 24 Apr 2021 15:13:59 GMT Message-Id: <202104241513.13OFDxZH044363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 63e5104e4d2c - main - Mk: unregister expired Samba 4.11 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63e5104e4d2c026e4cf82fff2ac399a411772aae Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Apr 2021 15:13:59 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=63e5104e4d2c026e4cf82fff2ac399a411772aae commit 63e5104e4d2c026e4cf82fff2ac399a411772aae Author: Rene Ladan AuthorDate: 2021-04-24 15:04:15 +0000 Commit: Rene Ladan CommitDate: 2021-04-24 15:04:15 +0000 Mk: unregister expired Samba 4.11 --- Mk/Uses/samba.mk | 2 +- Mk/bsd.default-versions.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index 2d843d92ab04..101aa6439d68 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -21,7 +21,7 @@ IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} SAMBAPORT= net/samba${SAMBA_DEFAULT:S/.//} SAMBAINCLUDES= ${LOCALBASE}/include/samba4 -.if ${SAMBA_DEFAULT} == 4.11 || ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13 +.if ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13 SAMBALIBS= ${LOCALBASE}/lib/samba4 .else IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 9e41c44e3ef5..0c709c791bfb 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -112,7 +112,7 @@ PYTHON3_DEFAULT?= 3.7 RUBY_DEFAULT?= 2.7 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust -# Possible values: 4.11, 4.12, 4.13 +# Possible values: 4.12, 4.13 SAMBA_DEFAULT?= 4.12 # Possible values: base, openssl, libressl, libressl-devel .if !defined(SSL_DEFAULT)