svn commit: r456595 - in head/Mk: . Uses

[Antoine Brodin]

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)