From owner-svn-ports-head@freebsd.org  Sun Mar 26 11:59:08 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 0BCD7D1C91F;
 Sun, 26 Mar 2017 11:59:08 +0000 (UTC) (envelope-from mat@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 CF8781113;
 Sun, 26 Mar 2017 11:59:07 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2QBx6kx052712;
 Sun, 26 Mar 2017 11:59:06 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2QBx6Pu052711;
 Sun, 26 Mar 2017 11:59:06 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201703261159.v2QBx6Pu052711@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Sun, 26 Mar 2017 11:59:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r436960 - head/Mk/Uses
X-SVN-Group: ports-head
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.23
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: Sun, 26 Mar 2017 11:59:08 -0000

Author: mat
Date: Sun Mar 26 11:59:06 2017
New Revision: 436960
URL: https://svnweb.freebsd.org/changeset/ports/436960

Log:
  Refactor USES=samba a bit, and add Samba 4.6 support there.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/samba.mk

Modified: head/Mk/Uses/samba.mk
==============================================================================
--- head/Mk/Uses/samba.mk	Sun Mar 26 11:48:13 2017	(r436959)
+++ head/Mk/Uses/samba.mk	Sun Mar 26 11:59:06 2017	(r436960)
@@ -21,22 +21,12 @@ samba_ARGS=	build run
 IGNORE=		USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
 .endif
 
-.if ${SAMBA_DEFAULT} == 4.2
+SAMBAPORT=	net/samba${SAMBA_DEFAULT:S/.//}
 SAMBAINCLUDES=	${LOCALBASE}/include/samba4
+.if ${SAMBA_DEFAULT} == 4.2 || ${SAMBA_DEFAULT} == 4.3
 SAMBALIBS=	${LOCALBASE}/lib
-SAMBAPORT=	net/samba42
-.elif ${SAMBA_DEFAULT} == 4.3
-SAMBAINCLUDES=	${LOCALBASE}/include/samba4
-SAMBALIBS=	${LOCALBASE}/lib
-SAMBAPORT=	net/samba43
-.elif ${SAMBA_DEFAULT} == 4.4
-SAMBAINCLUDES=	${LOCALBASE}/include/samba4
-SAMBALIBS=	${LOCALBASE}/lib/samba4
-SAMBAPORT=	net/samba44
-.elif ${SAMBA_DEFAULT} == 4.5
-SAMBAINCLUDES=	${LOCALBASE}/include/samba4
+.elif ${SAMBA_DEFAULT} == 4.4 || ${SAMBA_DEFAULT} == 4.5 || ${SAMBA_DEFAULT} == 4.6
 SAMBALIBS=	${LOCALBASE}/lib/samba4
-SAMBAPORT=	net/samba45
 .else
 IGNORE=		Invalid version of samba: ${SAMBA_DEFAULT}
 .endif