diff options
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/samba.mk | 5 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index f0104a9428c0..8e410b29e554 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -23,9 +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.2 || ${SAMBA_DEFAULT} == 4.3 -SAMBALIBS= ${LOCALBASE}/lib -.elif ${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 SAMBALIBS= ${LOCALBASE}/lib/samba4 .else IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} @@ -42,4 +40,3 @@ RUN_DEPENDS+= smbd:${SAMBAPORT} .endif .endif - diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 10c37376733e..82363c7b996a 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -83,7 +83,7 @@ PYTHON2_DEFAULT?= 2.7 PYTHON3_DEFAULT?= 3.6 # Possible values: 2.2, 2.3, 2.4 RUBY_DEFAULT?= 2.3 -# Possible values: 4.2, 4.3, 4.4, 4.5, 4.6 +# Possible values: 4.4, 4.5, 4.6 SAMBA_DEFAULT?= 4.4 # Possible values: base, openssl, openssl-devel, libressl, libressl-devel .if !defined(SSL_DEFAULT) |