svn commit: r486075 - in head/net/samba48: . files
Timur I. Bakeyev
timur at FreeBSD.org
Wed Nov 28 00:38:24 UTC 2018
Author: timur
Date: Wed Nov 28 00:38:23 2018
New Revision: 486075
URL: https://svnweb.freebsd.org/changeset/ports/486075
Log:
Add missing command line switch to enable MIT Kerberos build.
Modified:
head/net/samba48/Makefile
head/net/samba48/files/patch-source3__wscript
Modified: head/net/samba48/Makefile
==============================================================================
--- head/net/samba48/Makefile Wed Nov 28 00:06:34 2018 (r486074)
+++ head/net/samba48/Makefile Wed Nov 28 00:38:23 2018 (r486075)
@@ -156,14 +156,14 @@ SAMBA4_BUNDLED_LIBS+= !libarchive
BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
### Bundled libraries
-#SAMBA4_BUNDLED_CMOCKA?= no
-#SAMBA4_BUNDLED_TALLOC?= no
-#SAMBA4_BUNDLED_TEVENT?= no
-#SAMBA4_BUNDLED_TDB?= no
-#SAMBA4_BUNDLED_LDB?= yes
-#SAMBA4_LDB= 13
+SAMBA4_BUNDLED_CMOCKA?= no
+SAMBA4_BUNDLED_TALLOC?= no
+SAMBA4_BUNDLED_TEVENT?= no
+SAMBA4_BUNDLED_TDB?= no
+SAMBA4_BUNDLED_LDB?= yes
+SAMBA4_LDB= 13
# cmocka
-.if defined(SAMBA4_BUNDLED_CMOCKA)
+.if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
SAMBA4_BUNDLED_LIBS+= cmocka
CONFLICTS+= cmocka-1.*
PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA=""
@@ -176,7 +176,7 @@ PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="@comment "
SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment "
.endif
# talloc
-.if defined(SAMBA4_BUNDLED_TALLOC)
+.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
SAMBA4_BUNDLED_LIBS+= talloc
CONFLICTS+= talloc-2.*
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
@@ -189,7 +189,7 @@ PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
.endif
# tevent
-.if defined(SAMBA4_BUNDLED_TEVENT)
+.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
SAMBA4_BUNDLED_LIBS+= tevent
CONFLICTS+= tevent-0.*
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
@@ -202,7 +202,7 @@ PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
.endif
# tdb
-.if defined(SAMBA4_BUNDLED_TDB)
+.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
SAMBA4_BUNDLED_LIBS+= tdb
CONFLICTS+= tdb-1.*
PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
@@ -215,7 +215,7 @@ PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.endif
# ldb
-.if defined(SAMBA4_BUNDLED_LDB) || !defined(SAMBA4_LDB)
+.if (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) || !defined(SAMBA4_LDB)
SAMBA4_BUNDLED_LDB= yes
SAMBA4_BUNDLED_LIBS+= ldb
CONFLICTS+= ldb-1.* ldb1[23]-1.*
@@ -237,7 +237,9 @@ PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment "
.endif
-.if defined(SAMBA4_BUNDLED_TALLOC) || defined(SAMBA4_BUNDLED_TEVENT) || defined(SAMBA4_BUNDLED_TDB)
+.if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TEVENT} == yes) \
+ || (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \
+ || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
SAMBA4_BUNDLED_LIBS+= replace
.endif
# Don't use external libcom_err
@@ -342,7 +344,8 @@ LDAP_USE= OPENLDAP=yes
LDAP_VARS= SAMBA4_MODULES+=idmap_ldap
GSSAPI_MIT_CONFIGURE_ON= --with-system-mitkrb5 ${GSSAPIBASEDIR} \
- --with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc
+ --with-system-mitkdc=${GSSAPIBASEDIR}/sbin/krb5kdc \
+ --with-experimental-mit-ad-dc
GSSAPI_MIT_USES= gssapi:mit
LIBZFS_CONFIGURE_WITH= libzfs
Modified: head/net/samba48/files/patch-source3__wscript
==============================================================================
--- head/net/samba48/files/patch-source3__wscript Wed Nov 28 00:06:34 2018 (r486074)
+++ head/net/samba48/files/patch-source3__wscript Wed Nov 28 00:38:23 2018 (r486075)
@@ -1,5 +1,5 @@
---- source3/wscript.orig 2018-06-26 16:42:46.000000000 +0200
-+++ source3/wscript 2018-08-07 20:55:38.331688000 +0200
+--- source3/wscript.orig 2018-06-26 18:42:46 UTC
++++ source3/wscript
@@ -47,6 +47,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('sendfile-support')
opt.SAMBA3_ADD_OPTION('utmp')
More information about the svn-ports-all
mailing list