Index: head/devel/talloc/Makefile
===================================================================
--- head/devel/talloc/Makefile	(revision 518226)
+++ head/devel/talloc/Makefile	(revision 518227)
@@ -1,107 +1,107 @@
 # $FreeBSD$
 
 PORTNAME=		talloc
-PORTVERSION=		2.2.0
+PORTVERSION=		2.3.0
 PORTREVISION=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		Hierarchical pool based memory allocator
 
 LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be built with THREADS support
 
 CONFLICTS_INSTALL=	talloc1-*
 
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	talloc
 #default_CONFLICTS=	talloc-nopython
 
 USES=			compiler pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
 OPTIONS_DEFINE=		MANPAGES DEBUG
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
 DEBUG_CONFIGURE_ON=	--verbose --enable-debug
 DEBUG_MAKE_ARGS=	--verbose
 DEBUG_FLAGS=		-g -ggdb3 -O0
 
 .include <bsd.port.options.mk>
 
 PLIST_FILES+=		include/talloc.h \
 			lib/libtalloc.so \
 			lib/libtalloc.so.2 \
 			${PKGCONFIGDIR}/talloc.pc
 
 .if defined(NO_PYTHON)
 USES+=			python:2.7+,build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
 USES+=			python:3.4+
 
 PLIST_FILES+=		include/pytalloc.h \
 			lib/libpytalloc-util.so \
 			lib/libpytalloc-util.so.2 \
 			${PYTHON_SITELIBDIR}/talloc.so \
 			${PKGCONFIGDIR}/pytalloc-util.pc
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=		-fno-color-diagnostics
 .endif
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
 TALLOC_MAN3=		man/man3/talloc.3.gz
 
 PLIST_FILES+=		${TALLOC_MAN3}
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
 				${BUILD_WRKSRC}/wscript
 
 # Use threading (or multiprocessing) but not thread (renamed in python 3+).
 pre-configure:
 			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
 				${ECHO_CMD}; \
 				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
 				${ECHO_CMD}; \
 				${FALSE}; \
 			fi
 
 pre-build-MANPAGES-off:
 			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
 .for man in ${TALLOC_MAN3}
 			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
 .endfor
 
 post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/talloc/distinfo
===================================================================
--- head/devel/talloc/distinfo	(revision 518226)
+++ head/devel/talloc/distinfo	(revision 518227)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558143287
-SHA256 (talloc-2.2.0.tar.gz) = 5c6f6a45ef96b3fd0b28942673a68d0c6af5dcca9d676a2e4d57ce7e86c22ebc
-SIZE (talloc-2.2.0.tar.gz) = 633467
+TIMESTAMP = 1573498827
+SHA256 (talloc-2.3.0.tar.gz) = 75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6
+SIZE (talloc-2.3.0.tar.gz) = 642364
Index: head/devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py
===================================================================
--- head/devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py	(revision 518226)
+++ head/devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py	(revision 518227)
@@ -1,36 +1,35 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2019-03-21 10:12:32 UTC
+--- buildtools/wafsamba/samba_autoconf.py.orig	2019-09-03 13:59:55 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
 @@ -573,7 +573,7 @@ def library_flags(self, libs):
  
  
  @conf
 -def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
 +def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
      '''check if a set of libraries exist as system libraries
  
      returns the sublist of libs that do exist as a syslib or []
 @@ -593,11 +593,14 @@ int foo()
              ret.append(lib)
              continue
  
 +        if msg is None:
 +            msg = 'Checking for library %s' % lib
 +
          (ccflags, ldflags, cpppath) = library_flags(conf, lib)
          if shlib:
 -            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
 +            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
          else:
 -            res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
 +            res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg)
  
          if not res:
              if mandatory:
-@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -944,5 +947,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
-     if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
--        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
-+        if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
+         if (conf.env.undefined_ignore_ldflags == [] and
+-            conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])):
++            conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)):
              conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
--