Page MenuHomeFreeBSD
Files F151103766

D8919.id23286.diff
No OneTemporary
Actions

D8919.id23286.diff
View Options

Index: Mk/Uses/samba.mk
===================================================================
--- /dev/null
+++ Mk/Uses/samba.mk
@@ -0,0 +1,38 @@
+
+.if !defined(_INCLUDE_USES_SAMBA_MK)
+_INCLUDE_USES_SAMBA_MK= yes
+
+.if !${samba_ARGS}
+IGNORE= USES=samba requires an argument
+.endif
+
+.if ${samba_ARGS:Nbuild:Nlib:Nrun}
+IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nlib:Nrun}
+.endif
+
+.if ${SAMBA_DEFAULT} == 4.2
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+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
+.endif
+
+.if ${samba_ARGS:Mbuild}
+BUILD_DEPENDS+= smbd:${SAMBAPORT}
+.endif
+.if ${samba_ARGS:Mlib}
+LIB_DEPENDS+= libsmbclient.so:${SAMBAPORT}
+.endif
+.if ${samba_ARGS:Mrun}
+RUN_DEPENDS+= smbd:${SAMBAPORT}
+.endif
+
+.endif
+
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -78,6 +78,8 @@
PYTHON3_DEFAULT?= 3.5
# Possible values: 2.1, 2.2, 2.3, 2.4
RUBY_DEFAULT?= 2.2
+# Possible values: 4.2, 4.3, 4.4
+SAMBA_DEFAULT?= 4.4
# Possible values: base, openssl, openssl-devel, libressl, libressl-devel
.if !defined(SSL_DEFAULT)
# If no preference was set, check for an installed base version
Index: net/samba42/Makefile
===================================================================
--- net/samba42/Makefile
+++ net/samba42/Makefile
@@ -155,7 +155,6 @@
--with-winbind \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
Index: net/samba42/pkg-plist
===================================================================
--- net/samba42/pkg-plist
+++ net/samba42/pkg-plist
@@ -197,6 +197,8 @@
lib/libsamba-util.so.0
lib/libsamdb.so
lib/libsamdb.so.0
+lib/libsmbclient.so
+lib/libsmbclient.so.0
lib/libsmbclient-raw.so
lib/libsmbclient-raw.so.0
lib/libsmbconf.so
@@ -473,6 +475,7 @@
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/smbclient-raw.pc
%%PKGCONFIGDIR%%/torture.pc
%%PKGCONFIGDIR%%/wbclient.pc
Index: net/samba43/Makefile
===================================================================
--- net/samba43/Makefile
+++ net/samba43/Makefile
@@ -155,7 +155,6 @@
--with-winbind \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
Index: net/samba43/pkg-plist
===================================================================
--- net/samba43/pkg-plist
+++ net/samba43/pkg-plist
@@ -204,6 +204,8 @@
lib/libsamba-util.so.0
lib/libsamdb.so
lib/libsamdb.so.0
+lib/libsmbclient.so
+lib/libsmbclient.so.0
lib/libsmbclient-raw.so
lib/libsmbclient-raw.so.0
lib/libsmbconf.so
@@ -499,6 +501,7 @@
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/smbclient-raw.pc
%%PKGCONFIGDIR%%/torture.pc
%%PKGCONFIGDIR%%/wbclient.pc
Index: net/samba44/Makefile
===================================================================
--- net/samba44/Makefile
+++ net/samba44/Makefile
@@ -156,7 +156,6 @@
--disable-rpath \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
Index: net/samba44/pkg-plist
===================================================================
--- net/samba44/pkg-plist
+++ net/samba44/pkg-plist
@@ -160,6 +160,8 @@
lib/samba4/libsamba-util.so.0
lib/samba4/libsamdb.so
lib/samba4/libsamdb.so.0
+lib/samba4/libsmbclient.so
+lib/samba4/libsmbclient.so.0
lib/samba4/libsmbconf.so
lib/samba4/libsmbconf.so.0
%%LDAP%%lib/samba4/libsmbldap.so
@@ -450,6 +452,7 @@
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/wbclient.pc
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 2:16 AM (7 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31006473
Default Alt Text
D8919.id23286.diff (4 KB)

Event Timeline