diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2017-12-18 07:00:10 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2017-12-18 07:00:10 +0000 |
| commit | ca8acdfe497efca7dd464d5cd1dc4808e3df7e4f (patch) | |
| tree | 13b8ddf9753b0ebda73bcd3fda8d52e853dd06d5 | |
| parent | In sight of long-overdue update of `lang/ocaml', start cleaning things up: (diff) | |
Allow to use samba47 with USES=samba
PR: 224418
Submitted by: timur@
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=456595
| -rw-r--r-- | Mk/Uses/samba.mk | 2 | ||||
| -rw-r--r-- | 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 8e410b29e554..db9bda535822 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -23,7 +23,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.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} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 8f3580ed9af6..2f7a4115206c 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -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) |