From owner-svn-ports-head@freebsd.org  Mon Dec 18 07:00:11 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8AD79EA379E;
 Mon, 18 Dec 2017 07:00:11 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5673F6E374;
 Mon, 18 Dec 2017 07:00:11 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBI70AYI044794;
 Mon, 18 Dec 2017 07:00:10 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBI70AUU044792;
 Mon, 18 Dec 2017 07:00:10 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201712180700.vBI70AUU044792@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 18 Dec 2017 07:00:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456595 - in head/Mk: . Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: antoine
X-SVN-Commit-Paths: in head/Mk: . Uses
X-SVN-Commit-Revision: 456595
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Dec 2017 07:00:11 -0000

Author: antoine
Date: Mon Dec 18 07:00:10 2017
New Revision: 456595
URL: https://svnweb.freebsd.org/changeset/ports/456595

Log:
  Allow to use samba47 with USES=samba
  
  PR:		224418
  Submitted by:	timur@
  With hat:	portmgr

Modified:
  head/Mk/Uses/samba.mk
  head/Mk/bsd.default-versions.mk

Modified: head/Mk/Uses/samba.mk
==============================================================================
--- head/Mk/Uses/samba.mk	Mon Dec 18 06:55:06 2017	(r456594)
+++ head/Mk/Uses/samba.mk	Mon Dec 18 07:00:10 2017	(r456595)
@@ -23,7 +23,7 @@ IGNORE=		USES=samba has invalid arguments: ${samba_ARG
 
 SAMBAPORT=	net/samba${SAMBA_DEFAULT:S/.//}
 SAMBAINCLUDES=	${LOCALBASE}/include/samba4
-.if ${SAMBA_DEFAULT} == 4.4 || ${SAMBA_DEFAULT} == 4.5 || ${SAMBA_DEFAULT} == 4.6
+.if ${SAMBA_DEFAULT} == 4.4 || ${SAMBA_DEFAULT} == 4.5 || ${SAMBA_DEFAULT} == 4.6 || ${SAMBA_DEFAULT} == 4.7
 SAMBALIBS=	${LOCALBASE}/lib/samba4
 .else
 IGNORE=		Invalid version of samba: ${SAMBA_DEFAULT}

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Mon Dec 18 06:55:06 2017	(r456594)
+++ head/Mk/bsd.default-versions.mk	Mon Dec 18 07:00:10 2017	(r456595)
@@ -85,7 +85,7 @@ PYTHON2_DEFAULT?=	2.7
 PYTHON3_DEFAULT?=	3.6
 # Possible values: 2.2, 2.3, 2.4
 RUBY_DEFAULT?=		2.3
-# Possible values: 4.4, 4.5, 4.6
+# Possible values: 4.4, 4.5, 4.6, 4.7
 SAMBA_DEFAULT?=		4.4
 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)