svn commit: r436960 - head/Mk/Uses

[Mathieu Arnold]

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