Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jun 2019 22:44:25 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r504597 - in head: databases/tdb databases/tdb/files devel/talloc devel/talloc/files devel/tevent devel/tevent/files
Message-ID:  <201906192244.x5JMiPjP022749@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Wed Jun 19 22:44:25 2019
New Revision: 504597
URL: https://svnweb.freebsd.org/changeset/ports/504597

Log:
  Upgrade Samba supplimentary ports to the new build system. Effectively they are dependent now from Python 3.4+ for the build, unless NO_PYTHON is specified,
  in which case ports still can be build with Python 2.7.
  
  That should address legacy Python dependencies for some non-Samba ports as well.

Added:
  head/databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py
     - copied, changed from r504596, head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/databases/tdb/files/patch-buildtools_wafsamba_samba__install.py
     - copied, changed from r504596, head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
  head/databases/tdb/files/patch-buildtools_wafsamba_wscript
     - copied, changed from r504596, head/databases/tdb/files/patch-buildtools__wafsamba__wscript
  head/databases/tdb/files/patch-lib_replace_wscript
     - copied, changed from r504596, head/databases/tdb/files/patch-lib__replace__wscript
  head/devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py
     - copied, changed from r504596, head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/devel/talloc/files/patch-buildtools_wafsamba_samba__install.py
     - copied, changed from r504596, head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
  head/devel/talloc/files/patch-buildtools_wafsamba_wscript
     - copied, changed from r504596, head/devel/talloc/files/patch-buildtools__wafsamba__wscript
  head/devel/talloc/files/patch-lib_replace_wscript
     - copied, changed from r504596, head/devel/talloc/files/patch-lib__replace__wscript
  head/devel/tevent/files/patch-buildtools_wafsamba_samba__autoconf.py
     - copied, changed from r504596, head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/devel/tevent/files/patch-buildtools_wafsamba_samba__install.py
     - copied, changed from r504596, head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
  head/devel/tevent/files/patch-buildtools_wafsamba_wscript
     - copied, changed from r504596, head/devel/tevent/files/patch-buildtools__wafsamba__wscript
  head/devel/tevent/files/patch-lib_replace_wscript
     - copied, changed from r504596, head/devel/tevent/files/patch-lib__replace__wscript
Deleted:
  head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
  head/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
  head/databases/tdb/files/patch-buildtools__wafsamba__wscript
  head/databases/tdb/files/patch-lib__replace__wscript
  head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py
  head/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
  head/devel/talloc/files/patch-buildtools__wafsamba__wscript
  head/devel/talloc/files/patch-lib__replace__wscript
  head/devel/talloc/files/patch-third_party__waf__wafadmin__Tools__cc.py
  head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py
  head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py
  head/devel/tevent/files/patch-buildtools__wafsamba__samba_python.py
  head/devel/tevent/files/patch-buildtools__wafsamba__wscript
  head/devel/tevent/files/patch-lib__replace__wscript
  head/devel/tevent/files/patch-third_party__waf__wafadmin__Tools__cc.py
Modified:
  head/databases/tdb/Makefile
  head/databases/tdb/distinfo
  head/databases/tdb/files/patch-wscript
  head/devel/talloc/Makefile
  head/devel/talloc/distinfo
  head/devel/talloc/files/patch-talloc.c
  head/devel/talloc/files/patch-wscript
  head/devel/talloc/files/talloc.3
  head/devel/tevent/Makefile
  head/devel/tevent/distinfo
  head/devel/tevent/files/patch-wscript

Modified: head/databases/tdb/Makefile
==============================================================================
--- head/databases/tdb/Makefile	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/databases/tdb/Makefile	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=		tdb
-PORTVERSION=		1.3.16
+PORTVERSION=		1.4.0
 PORTREVISION=		0
-PORTEPOCH=		1
+PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
 
@@ -14,6 +14,8 @@ LICENSE=		GPLv3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
+CONFLICTS_INSTALL=	tdb1-*
+
 #FLAVORS=		default nopython debug
 #nopython_PKGNAMESUFFIX=	-nopython
 #debug_PKGNAMESUFFIX=	-debug
@@ -21,7 +23,7 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON
 #debug_CONFLICTS=	tdb tdb-nopython
 #default_CONFLICTS=	tdb-nopython tdb-debug
 
-USES=			compiler pkgconfig waf
+USES=			compiler gettext-runtime pkgconfig waf 
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
@@ -33,9 +35,13 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
-OPTIONS_DEFINE=		MANPAGES
+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 -DTDB_TRACE=1
+
 .include <bsd.port.options.mk>
 
 TDB_BINS=		bin/tdbbackup \
@@ -49,44 +55,17 @@ PLIST_FILES+=		include/tdb.h \
 			lib/libtdb.so.1 \
 			${PKGCONFIGDIR}/tdb.pc
 
-.if defined(SAMBA4_DEBUG)
-CFLAGS+=		-DTDB_TRACE=1
-.endif
 
 .if defined(NO_PYTHON)
-USES+=			python:2.7,build
+USES+=			python:2.7+,build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			python:2.7
+USES+=			python:3.4+
 
 PLIST_FILES+=		${PYTHON_SITELIBDIR}/tdb.so \
 			${PYTHON_SITELIBDIR}/_tdb_text.py
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${SAMBA4_PYTHON3_SITELIBDIR}/_tdb_text.py
-.endif
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
@@ -134,9 +113,6 @@ post-install:
 .endfor
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/databases/tdb/distinfo
==============================================================================
--- head/databases/tdb/distinfo	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/databases/tdb/distinfo	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531611906
-SHA256 (tdb-1.3.16.tar.gz) = 6a3fc2616567f23993984ada3cea97d953a27669ffd1bfbbe961f26e0cf96cc5
-SIZE (tdb-1.3.16.tar.gz) = 504330
+TIMESTAMP = 1560369252
+SHA256 (tdb-1.4.0.tar.gz) = c1a0729c5400fb495465fa4bd953ae290db43c28dacd0506aef50dc482132d35
+SIZE (tdb-1.4.0.tar.gz) = 696994

Copied and modified: head/databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py (from r504596, head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py)
==============================================================================
--- head/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
+--- buildtools/wafsamba/samba_autoconf.py.orig	2019-02-26 06:44:21 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
+@@ -573,7 +573,7 @@ def library_flags(self, libs):
  
  
  @conf
@@ -9,7 +9,7 @@
      '''check if a set of libraries exist as system libraries
  
      returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
+@@ -593,11 +593,14 @@ int foo()
              ret.append(lib)
              continue
  
@@ -17,36 +17,20 @@
 +            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, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
+-            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, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
+-            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:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          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):
              conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
+-

Copied and modified: head/databases/tdb/files/patch-buildtools_wafsamba_samba__install.py (from r504596, head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py)
==============================================================================
--- head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/databases/tdb/files/patch-buildtools_wafsamba_samba__install.py	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,4 +1,4 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
+--- buildtools/wafsamba/samba_install.py.orig	2019-02-14 11:21:38 UTC
 +++ buildtools/wafsamba/samba_install.py
 @@ -118,7 +118,7 @@ def install_library(self):
                  inst_name    = bld.make_libname(t.target)

Copied and modified: head/databases/tdb/files/patch-buildtools_wafsamba_wscript (from r504596, head/databases/tdb/files/patch-buildtools__wafsamba__wscript)
==============================================================================
--- head/databases/tdb/files/patch-buildtools__wafsamba__wscript	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/databases/tdb/files/patch-buildtools_wafsamba_wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
+--- buildtools/wafsamba/wscript.orig	2019-02-26 06:44:21 UTC
 +++ buildtools/wafsamba/wscript
-@@ -76,10 +76,10 @@ def set_options(opt):
+@@ -82,10 +82,10 @@ def options(opt):
  
      opt.add_option('--with-libiconv',
                     help='additional directory to search for libiconv',

Copied and modified: head/databases/tdb/files/patch-lib_replace_wscript (from r504596, head/databases/tdb/files/patch-lib__replace__wscript)
==============================================================================
--- head/databases/tdb/files/patch-lib__replace__wscript	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/databases/tdb/files/patch-lib_replace_wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,11 +1,11 @@
---- lib/replace/wscript.orig	2017-08-24 11:27:53 UTC
+--- lib/replace/wscript.orig	2019-02-26 06:44:21 UTC
 +++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
+@@ -119,7 +119,7 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
      conf.CHECK_HEADERS('libgen.h')
  
 -    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
 +    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
          conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
  
-     # Check for process set name support
+     if conf.CHECK_CFLAGS('-Wno-unused-function'):

Modified: head/databases/tdb/files/patch-wscript
==============================================================================
--- head/databases/tdb/files/patch-wscript	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/databases/tdb/files/patch-wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- wscript.orig	2017-08-24 11:29:08 UTC
+--- wscript.orig	2019-02-26 07:02:52 UTC
 +++ wscript
-@@ -115,7 +115,7 @@ def build(bld):
+@@ -121,7 +121,7 @@ def build(bld):
      COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
  
      if bld.env.standalone_tdb:

Modified: head/devel/talloc/Makefile
==============================================================================
--- head/devel/talloc/Makefile	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/talloc/Makefile	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		talloc
-PORTVERSION=		2.1.14
+PORTVERSION=		2.2.0
 PORTREVISION=		0
 CATEGORIES=		devel
 MASTER_SITES=		SAMBA
@@ -13,6 +13,8 @@ LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
+CONFLICTS_INSTALL=	talloc1-*
+
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	talloc
@@ -30,9 +32,13 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
-OPTIONS_DEFINE=		MANPAGES
+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 \
@@ -41,44 +47,18 @@ PLIST_FILES+=		include/talloc.h \
 			${PKGCONFIGDIR}/talloc.pc
 
 .if defined(NO_PYTHON)
-USES+=			python:2.7,build
+USES+=			python:2.7+,build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			python:2.7
+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
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
 .endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so \
-			lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so.2 \
-			${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${PKGCONFIGDIR}/pytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.pc
-.endif
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
@@ -122,10 +102,6 @@ post-install:
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.so
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/talloc/distinfo
==============================================================================
--- head/devel/talloc/distinfo	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/talloc/distinfo	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531611950
-SHA256 (talloc-2.1.14.tar.gz) = b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce
-SIZE (talloc-2.1.14.tar.gz) = 444589
+TIMESTAMP = 1558143287
+SHA256 (talloc-2.2.0.tar.gz) = 5c6f6a45ef96b3fd0b28942673a68d0c6af5dcca9d676a2e4d57ce7e86c22ebc
+SIZE (talloc-2.2.0.tar.gz) = 633467

Copied and modified: head/devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py (from r504596, head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py)
==============================================================================
--- head/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/talloc/files/patch-buildtools_wafsamba_samba__autoconf.py	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
+--- buildtools/wafsamba/samba_autoconf.py.orig	2019-03-21 10:12:32 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
+@@ -573,7 +573,7 @@ def library_flags(self, libs):
  
  
  @conf
@@ -9,7 +9,7 @@
      '''check if a set of libraries exist as system libraries
  
      returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
+@@ -593,11 +593,14 @@ int foo()
              ret.append(lib)
              continue
  
@@ -17,36 +17,20 @@
 +            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, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
+-            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, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
+-            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:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          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):
              conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
+-

Copied and modified: head/devel/talloc/files/patch-buildtools_wafsamba_samba__install.py (from r504596, head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py)
==============================================================================
--- head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/talloc/files/patch-buildtools_wafsamba_samba__install.py	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
+--- buildtools/wafsamba/samba_install.py.orig	2019-03-21 10:12:32 UTC
 +++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
+@@ -115,7 +115,7 @@ def install_library(self):
                  inst_name    = bld.make_libname(t.target)
          elif self.vnum:
              vnum_base    = self.vnum.split('.')[0]
@@ -8,4 +8,4 @@
 +            install_name = bld.make_libname(target_name, version=vnum_base)
              install_link = bld.make_libname(target_name, version=vnum_base)
              inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
+             if not self.private_library or not t.env.SONAME_ST:

Copied and modified: head/devel/talloc/files/patch-buildtools_wafsamba_wscript (from r504596, head/devel/talloc/files/patch-buildtools__wafsamba__wscript)
==============================================================================
--- head/devel/talloc/files/patch-buildtools__wafsamba__wscript	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/talloc/files/patch-buildtools_wafsamba_wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
+--- buildtools/wafsamba/wscript.orig	2019-03-21 10:12:32 UTC
 +++ buildtools/wafsamba/wscript
-@@ -76,10 +76,10 @@ def set_options(opt):
+@@ -82,10 +82,10 @@ def options(opt):
  
      opt.add_option('--with-libiconv',
                     help='additional directory to search for libiconv',

Copied and modified: head/devel/talloc/files/patch-lib_replace_wscript (from r504596, head/devel/talloc/files/patch-lib__replace__wscript)
==============================================================================
--- head/devel/talloc/files/patch-lib__replace__wscript	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/talloc/files/patch-lib_replace_wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,11 +1,11 @@
---- lib/replace/wscript.orig	2017-07-02 20:22:14 UTC
+--- lib/replace/wscript.orig	2019-03-21 10:12:32 UTC
 +++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
+@@ -119,7 +119,7 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
      conf.CHECK_HEADERS('libgen.h')
  
 -    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
 +    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
          conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
  
-     # Check for process set name support
+     if conf.CHECK_CFLAGS('-Wno-unused-function'):

Modified: head/devel/talloc/files/patch-talloc.c
==============================================================================
--- head/devel/talloc/files/patch-talloc.c	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/talloc/files/patch-talloc.c	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- talloc.c.orig	2018-01-13 09:07:51 UTC
+--- talloc.c.orig	2019-03-21 10:12:32 UTC
 +++ talloc.c
-@@ -387,6 +387,9 @@ void talloc_lib_init(void) __attribute__
+@@ -396,6 +396,9 @@ void talloc_lib_init(void) __attribute__
  void talloc_lib_init(void)
  {
  	uint32_t random_value;
@@ -10,7 +10,7 @@
  #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)
  	uint8_t *p;
  	/*
-@@ -420,6 +423,7 @@ void talloc_lib_init(void)
+@@ -429,6 +432,7 @@ void talloc_lib_init(void)
  		 */
  		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);
  	}

Modified: head/devel/talloc/files/patch-wscript
==============================================================================
--- head/devel/talloc/files/patch-wscript	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/talloc/files/patch-wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- wscript.orig	2018-01-13 09:07:51 UTC
+--- wscript.orig	2019-03-21 10:12:32 UTC
 +++ wscript
-@@ -46,13 +46,14 @@ def configure(conf):
+@@ -45,13 +45,14 @@ def configure(conf):
      conf.env.TALLOC_COMPAT1 = False
      if conf.env.standalone_talloc:
          conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1

Modified: head/devel/talloc/files/talloc.3
==============================================================================
--- head/devel/talloc/files/talloc.3	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/talloc/files/talloc.3	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: talloc
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>;
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>;
 .\"      Date: 2015-04-10
 .\"    Manual: System Administration tools
 .\"    Source: Samba 4.0
@@ -131,8 +131,6 @@ From the 2\&.0 version of talloc, as a special case, t
 .PP
 To help you find problems in your code caused by this behaviour, if you do try and free a pointer with more than one parent then the talloc logging function will be called to give output like this:
 .PP
-
-.sp
 .if n \{\
 .RS 4
 .\}
@@ -163,8 +161,6 @@ is NULL, then the function is a no\-op, and simply ret
 .PP
 After creating a reference you can free it in one of the following ways:
 .PP
-
-.sp
 .RS 4
 .ie n \{\
 \h'-04'\(bu\h'+03'\c
@@ -365,8 +361,6 @@ It is possible to produce loops in the parent/child re
 .PP
 Note that if you try and call talloc_steal() on a pointer that has more than one parent then the result is ambiguous\&. Talloc will choose to remove the parent that is currently indicated by talloc_parent() and replace it with the chosen parent\&. You will also get a message like this via the talloc logging functions:
 .PP
-
-.sp
 .if n \{\
 .RS 4
 .\}

Modified: head/devel/tevent/Makefile
==============================================================================
--- head/devel/tevent/Makefile	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/tevent/Makefile	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		tevent
-PORTVERSION=		0.9.37
+PORTVERSION=		0.10.0
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		devel
@@ -14,15 +14,17 @@ LICENSE=		LGPL3
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
-BUILD_DEPENDS=		talloc>=2.1.11:devel/talloc
-RUN_DEPENDS=		talloc>=2.1.11:devel/talloc
+BUILD_DEPENDS=		talloc>=2.2.0:devel/talloc
+RUN_DEPENDS=		talloc>=2.2.0:devel/talloc
 
+CONFLICTS_INSTALL=	tevent1-*
+
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	tevent
 #default_CONFLICTS=	tevent-nopython
 
-USES=			compiler pkgconfig waf
+USES=			compiler gettext-runtime pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		buildtools/bin/waf
 CONFIGURE_LOG=		bin/config.log
@@ -36,9 +38,13 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 			--disable-rpath \
 			--without-gettext
 
-OPTIONS_DEFINE=		MANPAGES
+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/tevent.h \
@@ -47,43 +53,15 @@ PLIST_FILES+=		include/tevent.h \
 			${PKGCONFIGDIR}/tevent.pc
 
 .if defined(NO_PYTHON)
-USES+=			python:2.7,build
+USES+=			python:2.7+,build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			python:2.7
+USES+=			python:3.4+
 
 PLIST_FILES+=		${PYTHON_SITELIBDIR}/_tevent.so \
-			${PYTHON_SITELIBDIR}/tevent.py  \
-			${PYTHON_SITELIBDIR}/tevent.pyc \
-			${PYTHON_SITELIBDIR}/tevent.pyo
-# XXX: This is a gross hack to make port use both Python 2.7+ and 3.3+
-# This is not officially supported, use at your own risk
-.if defined(WITH_SAMBA4_PYTHON3) && ${WITH_SAMBA4_PYTHON3:M3\.[0-9]}
-SAMBA4_PYTHON3_VERSION=	${WITH_SAMBA4_PYTHON3}
-SAMBA4_PYTHON3=		python${SAMBA4_PYTHON3_VERSION}
-SAMBA4_PYTHON3_VER=	${SAMBA4_PYTHON3_VERSION:C/\.//}
-.if !exists(${PORTSDIR}/lang/python${SAMBA4_PYTHON3_VER})
-.error			unsupported or unknown Python version ${SAMBA4_PYTHON3_VERSION}
+			${PYTHON_SITELIBDIR}/tevent.py
 .endif
-BUILD_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-RUN_DEPENDS+=		${SAMBA4_PYTHON3}:lang/python${SAMBA4_PYTHON3_VER}
-# cpython-36m
-SAMBA4_PYTHON3_SO_ABI!=	[ ! -f "${LOCALBASE}/bin/${SAMBA4_PYTHON3}" ] || ${LOCALBASE}/bin/${SAMBA4_PYTHON3} -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")' 2>/dev/null
-SAMBA4_PYTHON3_SITELIBDIR=lib/python${SAMBA4_PYTHON3_VERSION}/site-packages
 
-CONFIGURE_ENV+=		PYTHON3_SO_ABI_FLAG=.${SAMBA4_PYTHON3_SO_ABI}
-CONFIGURE_ARGS+=	--extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
-
-PLIST_SUB+=		SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
-			SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
-
-PLIST_FILES+=		${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so \
-			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.py  \
-			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyc \
-			${SAMBA4_PYTHON3_SITELIBDIR}/tevent.pyo
-.endif
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
@@ -112,19 +90,10 @@ pre-configure:
 				${FALSE}; \
 			fi
 
-.if !defined(NO_PYTHON)
-post-build:
-			${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
-			${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
-.endif
-
 post-install:
 			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
 .if !defined(NO_PYTHON)
 			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
-.if defined(SAMBA4_PYTHON3)
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
-.endif
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/devel/tevent/distinfo
==============================================================================
--- head/devel/tevent/distinfo	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/tevent/distinfo	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531613973
-SHA256 (tevent-0.9.37.tar.gz) = 168345ed65eac03785cf77b95238e7dc66cbb473a42811693a6b0916e5dae7e0
-SIZE (tevent-0.9.37.tar.gz) = 603859
+TIMESTAMP = 1560369699
+SHA256 (tevent-0.10.0.tar.gz) = 33f39612cd6d1ae6a737245784581494846f5bb07827983d2f41f942446aa4e6
+SIZE (tevent-0.10.0.tar.gz) = 794845

Copied and modified: head/devel/tevent/files/patch-buildtools_wafsamba_samba__autoconf.py (from r504596, head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py)
==============================================================================
--- head/devel/tevent/files/patch-buildtools__wafsamba__samba_autoconf.py	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/tevent/files/patch-buildtools_wafsamba_samba__autoconf.py	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
+--- buildtools/wafsamba/samba_autoconf.py.orig	2019-03-21 10:12:32 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -548,7 +548,7 @@ def library_flags(self, libs):
+@@ -573,7 +573,7 @@ def library_flags(self, libs):
  
  
  @conf
@@ -9,7 +9,7 @@
      '''check if a set of libraries exist as system libraries
  
      returns the sublist of libs that do exist as a syslib or []
-@@ -568,11 +568,29 @@ int foo()
+@@ -593,11 +593,14 @@ int foo()
              ret.append(lib)
              continue
  
@@ -17,36 +17,20 @@
 +            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, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(features='c cshlib',
-+                             fragment=fragment,
-+                             lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
+-            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, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
-+            res = conf.check(lib=lib,
-+                             uselib_store=lib,
-+                             ccflags=ccflags,
-+                             ldflags=ldflags,
-+                             uselib=lib.upper(),
-+                             mandatory=False,
-+                             msg=msg)
+-            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:
-@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          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):
              conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
- 
- @conf
+-

Copied and modified: head/devel/tevent/files/patch-buildtools_wafsamba_samba__install.py (from r504596, head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py)
==============================================================================
--- head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/tevent/files/patch-buildtools_wafsamba_samba__install.py	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_install.py.orig	2015-12-10 11:01:40 UTC
+--- buildtools/wafsamba/samba_install.py.orig	2019-03-21 10:12:32 UTC
 +++ buildtools/wafsamba/samba_install.py
-@@ -118,7 +118,7 @@ def install_library(self):
+@@ -115,7 +115,7 @@ def install_library(self):
                  inst_name    = bld.make_libname(t.target)
          elif self.vnum:
              vnum_base    = self.vnum.split('.')[0]
@@ -8,4 +8,4 @@
 +            install_name = bld.make_libname(target_name, version=vnum_base)
              install_link = bld.make_libname(target_name, version=vnum_base)
              inst_name    = bld.make_libname(t.target)
-             if not self.private_library:
+             if not self.private_library or not t.env.SONAME_ST:

Copied and modified: head/devel/tevent/files/patch-buildtools_wafsamba_wscript (from r504596, head/devel/tevent/files/patch-buildtools__wafsamba__wscript)
==============================================================================
--- head/devel/tevent/files/patch-buildtools__wafsamba__wscript	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/tevent/files/patch-buildtools_wafsamba_wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
+--- buildtools/wafsamba/wscript.orig	2019-03-21 10:12:32 UTC
 +++ buildtools/wafsamba/wscript
-@@ -76,10 +76,10 @@ def set_options(opt):
+@@ -82,10 +82,10 @@ def options(opt):
  
      opt.add_option('--with-libiconv',
                     help='additional directory to search for libiconv',

Copied and modified: head/devel/tevent/files/patch-lib_replace_wscript (from r504596, head/devel/tevent/files/patch-lib__replace__wscript)
==============================================================================
--- head/devel/tevent/files/patch-lib__replace__wscript	Wed Jun 19 22:42:50 2019	(r504596, copy source)
+++ head/devel/tevent/files/patch-lib_replace_wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -1,11 +1,11 @@
---- lib/replace/wscript.orig	2017-07-02 20:22:14 UTC
+--- lib/replace/wscript.orig	2019-03-21 10:12:32 UTC
 +++ lib/replace/wscript
-@@ -81,7 +81,7 @@ def configure(conf):
-     conf.CHECK_HEADERS('sys/atomic.h')
+@@ -119,7 +119,7 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
      conf.CHECK_HEADERS('libgen.h')
  
 -    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
 +    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
          conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
  
-     # Check for process set name support
+     if conf.CHECK_CFLAGS('-Wno-unused-function'):

Modified: head/devel/tevent/files/patch-wscript
==============================================================================
--- head/devel/tevent/files/patch-wscript	Wed Jun 19 22:42:50 2019	(r504596)
+++ head/devel/tevent/files/patch-wscript	Wed Jun 19 22:44:25 2019	(r504597)
@@ -9,12 +9,3 @@
          private_library = False
      else:
          private_library = True
-@@ -120,7 +120,7 @@ def build(bld):
-                             cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
- 
- 
--            bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False)
-+            bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py*', flat=False)
- 
-         # install out various python scripts for use by make test
-         bld.SAMBA_SCRIPT('tevent_python',



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906192244.x5JMiPjP022749>