Page MenuHomeFreeBSD
Files F150773188

D48826.id150446.diff
No OneTemporary
Actions

D48826.id150446.diff
View Options

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,28 @@
All ports committers are allowed to commit to this file.
+20250204:
+AUTHOR: yasu@FreeBSD.org
+
+3 new variables are defined if you add 'USES=samba' in Makefile.
+
+* SAMBA_TALLOC_PORT
+* SAMBA_TDB_PORT
+* SAMBA_TEVENT_PORT
+
+They are intended to be used by ports that works with Samba to specify
+proper version of talloc, tdb and/or tevent as dependency such as bellow.
+
+----------------------------------------------------------------------
+LIB_DEPENDS= ibtalloc.so:${SAMBA_TALLOC_PORT} \
+ libtdb.so:${SAMBA_TDB_PORT} \
+ libtevent.so:${SAMBA_TEVENT_PORT}
+USES= samba
+----------------------------------------------------------------------
+
+You need not use them if port just depending on talloc, tdb and/or
+tevent and it has nothing to do with Samba.
+
20250203:
AUTHOR: yasu@FreeBSD.org
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -24,17 +24,28 @@
SAMBA_SUFFIX= ${SAMBA_DEFAULT:S/.//}
-SAMBA_PORT_416= net/samba416
-SAMBA_LDB_PORT_416= databases/ldb25
-SAMBA_PORT_419= net/samba419
-SAMBA_LDB_PORT_419= databases/ldb28
-SAMBA_PORT_420= net/samba420
-SAMBA_LDB_PORT_420= databases/ldb29
-
-SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}}
+. if ${SAMBA_DEFAULT} == 4.16
+SAMBA_PORT= net/samba416
+SAMBA_LDB_PORT= databases/ldb25
+SAMBA_TALLOC_PORT= devel/talloc
+SAMBA_TDB_PORT= databases/tdb
+SAMBA_TEVENT_PORT= devel/tevent
+. elif ${SAMBA_DEFAULT} == 4.19
+SAMBA_PORT= net/samba419
+SAMBA_LDB_PORT= databases/ldb28
+SAMBA_TALLOC_PORT= devel/talloc
+SAMBA_TDB_PORT= databases/tdb
+SAMBA_TEVENT_PORT= devel/tevent
+. elif ${SAMBA_DEFAULT} == 4.20
+SAMBA_PORT= net/samba420
+SAMBA_LDB_PORT= databases/ldb29
+SAMBA_TALLOC_PORT= devel/talloc242
+SAMBA_TDB_PORT= databases/tdb1410
+SAMBA_TEVENT_PORT= devel/tevent016
+. endif
+
SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4
SAMBA_LIBDIR= ${LOCALBASE}/lib/samba4
-SAMBA_LDB_PORT= ${SAMBA_LDB_PORT_${SAMBA_SUFFIX}}
. if ${samba_ARGS:Mbuild}
BUILD_DEPENDS+= smbd:${SAMBA_PORT}
diff --git a/databases/ldb29/Makefile b/databases/ldb29/Makefile
--- a/databases/ldb29/Makefile
+++ b/databases/ldb29/Makefile
@@ -79,8 +79,8 @@
# No fancy color error messages
_CFLAGS_clang= -fno-color-diagnostics
-_LDB_DEPENDS= talloc>=2.4.2:devel/talloc242 tevent>=0.16.0:devel/tevent016 \
- tdb>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \
+_LDB_DEPENDS= talloc242>=2.4.2:devel/talloc242 tevent016>=0.16.0:devel/tevent016 \
+ tdb1410>=1.4.10:databases/tdb1410 lmdb>=0.9.23:databases/lmdb \
popt>=0:devel/popt
_LDB_BINS= bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \
bin/ldbrename
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -27,6 +27,8 @@
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
+CONFLICTS_INSTALL= tdb[0-9]*
+
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= MANPAGES DEBUG PYTHON
diff --git a/databases/tdb1410/Makefile b/databases/tdb1410/Makefile
--- a/databases/tdb1410/Makefile
+++ b/databases/tdb1410/Makefile
@@ -3,6 +3,7 @@
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SAMBA
+PKGNAMESUFFIX= 1410
MAINTAINER= samba@FreeBSD.org
COMMENT= Trivial Database
@@ -27,6 +28,8 @@
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
+CONFLICTS_INSTALL= tdb
+
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= MANPAGES DEBUG PYTHON
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -26,6 +26,8 @@
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
+CONFLICTS_INSTALL= talloc[0-9]*
+
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
diff --git a/devel/talloc242/Makefile b/devel/talloc242/Makefile
--- a/devel/talloc242/Makefile
+++ b/devel/talloc242/Makefile
@@ -2,6 +2,7 @@
DISTVERSION= 2.4.2
CATEGORIES= devel
MASTER_SITES= SAMBA
+PKGNAMESUFFIX= 242
MAINTAINER= samba@FreeBSD.org
COMMENT= Hierarchical pool based memory allocator
@@ -26,6 +27,8 @@
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
+CONFLICTS_INSTALL= talloc
+
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -30,6 +30,8 @@
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
+CONFLICTS_INSTALL= tevent[0-9]*
+
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
diff --git a/devel/tevent016/Makefile b/devel/tevent016/Makefile
--- a/devel/tevent016/Makefile
+++ b/devel/tevent016/Makefile
@@ -3,6 +3,7 @@
PORTEPOCH= 0
CATEGORIES= devel
MASTER_SITES= SAMBA
+PKGNAMESUFFIX= 016
MAINTAINER= samba@FreeBSD.org
COMMENT= Talloc based event loop library
@@ -10,8 +11,8 @@
LICENSE= LGPL3
-BUILD_DEPENDS= talloc>=2.4.2:devel/talloc242
-RUN_DEPENDS= talloc>=2.4.2:devel/talloc242
+BUILD_DEPENDS= talloc242>=2.4.2:devel/talloc242
+RUN_DEPENDS= talloc242>=2.4.2:devel/talloc242
USES= compiler pkgconfig shebangfix waf
USE_LDCONFIG= yes
@@ -30,6 +31,8 @@
CONFIGURE_ENV= PYTHONHASHSEED=1
MAKE_ENV= PYTHONHASHSEED=1
+CONFLICTS_INSTALL= tevent
+
MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)
OPTIONS_DEFINE= DEBUG MANPAGES PYTHON
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -21,7 +21,7 @@
BROKEN_SSL_REASON_libressl-devel= ${BROKEN_SSL_REASON_libressl}
LIB_DEPENDS= libgdbm.so:databases/gdbm \
- libtalloc.so:devel/talloc
+ libtalloc.so:${SAMBA_TALLOC_PORT}
FLAVORS= default ldap mysql pgsql sqlite3
FLAVOR?= ${FLAVORS:[1]}
@@ -151,7 +151,6 @@
UNBOUND_LIB_DEPENDS= libunbound.so:dns/unbound
UNIXODBC_CONFIGURE_WITH= rlm_sql_unixodbc
UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
-WINBIND_USES= samba:build,lib
WINBIND_CONFIGURE_ON= --with-winbind-include-dir=${LOCALBASE}/include/samba4 \
--with-winbind-lib-dir=${LOCALBASE}/lib/samba4
JSON_CONFIGURE_WITH= rlm_json
@@ -167,6 +166,12 @@
SUB_LIST+= RUN_AS_USER="no"
.endif
+.if ${PORT_OPTIONS:MWINBIND}
+USES+= samba:build,lib
+.else
+USES+= samba:env
+.endif
+
# User and group to use if USER option is chosen
RADIUS_USER= freeradius
RADIUS_GROUP= freeradius
diff --git a/net/samba420/Makefile b/net/samba420/Makefile
--- a/net/samba420/Makefile
+++ b/net/samba420/Makefile
@@ -220,8 +220,8 @@
SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
.else
SAMBA4_BUNDLED_LIBS+= !talloc
-BUILD_DEPENDS+= talloc>=2.4.2:devel/talloc242
-RUN_DEPENDS+= talloc>=2.4.2:devel/talloc242
+BUILD_DEPENDS+= talloc242>=2.4.2:devel/talloc242
+RUN_DEPENDS+= talloc242>=2.4.2:devel/talloc242
PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment "
.endif
@@ -233,8 +233,8 @@
SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
.else
SAMBA4_BUNDLED_LIBS+= !tevent
-BUILD_DEPENDS+= tevent>=0.16.1:devel/tevent016
-RUN_DEPENDS+= tevent>=0.16.1:devel/tevent016
+BUILD_DEPENDS+= tevent016>=0.16.1:devel/tevent016
+RUN_DEPENDS+= tevent016>=0.16.1:devel/tevent016
PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment "
.endif
@@ -246,8 +246,8 @@
SUB_LIST+= SAMBA4_BUNDLED_TDB=""
.else
SAMBA4_BUNDLED_LIBS+= !tdb
-BUILD_DEPENDS+= tdb>=1.4.10:databases/tdb1410
-RUN_DEPENDS+= tdb>=1.4.10:databases/tdb1410
+BUILD_DEPENDS+= tdb1410>=1.4.10:databases/tdb1410
+RUN_DEPENDS+= tdb1410>=1.4.10:databases/tdb1410
PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment "
SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment "
.endif
diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile
--- a/security/sssd2/Makefile
+++ b/security/sssd2/Makefile
@@ -40,9 +40,9 @@
libsamba-util.so:${SAMBA_PORT} \
libsasl2.so:security/cyrus-sasl2 \
libsmbclient.so:${SAMBA_PORT} \
- libtalloc.so:devel/talloc \
- libtdb.so:databases/tdb \
- libtevent.so:devel/tevent \
+ libtalloc.so:${SAMBA_TALLOC_PORT} \
+ libtdb.so:${SAMBA_TDB_PORT} \
+ libtevent.so:${SAMBA_TEVENT_PORT} \
libunistring.so:devel/libunistring \
libuuid.so:misc/e2fsprogs-libuuid
diff --git a/www/squid/Makefile b/www/squid/Makefile
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -126,7 +126,6 @@
EXTERNAL_ACL+="LDAP_group eDirectory_userip"
AUTH_SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
AUTH_SASL_VARS= BASIC_AUTH+=SASL
-AUTH_SMB_USES= samba:run
AUTH_SMB_VARS= BASIC_AUTH+=SMB \
EXTERNAL_ACL+=wbinfo_group
AUTH_SQL_RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
@@ -193,7 +192,7 @@
STACKTRACES_LDFLAGS= -lunwind
STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace
STACKTRACES_VARS= STRIP=""
-TDB_LIB_DEPENDS= libtdb.so:databases/tdb
+TDB_LIB_DEPENDS= libtdb.so:${SAMBA_TDB_PORT}
TDB_CONFIGURE_WITH= tdb
TDB_VARS= EXTERNAL_ACL+="time_quota session"
TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent
@@ -254,6 +253,12 @@
--enable-url-rewrite-helpers="fake LFS"
# Other options set via 'make config':
+.if ${PORT_OPTIONS:MAUTH_SMB}
+USES+= samba:run
+.elif ${PORT_OPTIONS:MTDB}
+USES+= samba:env
+.endif
+
.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
CONFIGURE_ARGS+= --disable-optimizations
WITH_DEBUG?= yes

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 11:25 PM (14 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30851336
Default Alt Text
D48826.id150446.diff (9 KB)

Event Timeline