Page MenuHomeFreeBSD
Files F133637952

D48859.id150611.diff
No OneTemporary
Actions

D48859.id150611.diff
View Options

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= freeradius
DISTVERSION= 3.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \
https://freeradius.org/ftp/pub/radius/%SUBDIR%/ \
@@ -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,9 +151,8 @@
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
+WINBIND_CONFIGURE_ON= --with-winbind-include-dir=${SAMBA_INCLUDEDIR} \
+ --with-winbind-lib-dir=${SAMBA_LIBDIR}
JSON_CONFIGURE_WITH= rlm_json
JSON_CONFIGURE_ON= --with-jsonc-lib-dir=${LOCALBASE}/lib \
--with-jsonc-include-dir=${LOCALBASE}/include
@@ -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/security/sssd2/Makefile b/security/sssd2/Makefile
--- a/security/sssd2/Makefile
+++ b/security/sssd2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sssd
PORTVERSION= 2.9.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
PKGNAMESUFFIX= 2
@@ -41,9 +41,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
@@ -194,8 +194,8 @@
STACKTRACES_LDFLAGS= -lunwind
STACKTRACES_EXTRA_PATCHES= ${FILESDIR}/extra-patch-gen-stacktrace
STACKTRACES_VARS= STRIP=""
-TDB_LIB_DEPENDS= libtdb.so:databases/tdb
-TDB_USES= pkgconfig:build
+TDB_LIB_DEPENDS= libtdb.so:${SAMBA_TDB_PORT}
+TDB_USES= pkgconfig:build samba:env
TDB_CONFIGURE_WITH= tdb
TDB_VARS= EXTERNAL_ACL+="time_quota session"
TP_IPFW_CONFIGURE_ENABLE= ipfw-transparent

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 28, 5:00 AM (18 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24333282
Default Alt Text
D48859.id150611.diff (2 KB)

Event Timeline