diff options
Diffstat (limited to 'devel')
27 files changed, 0 insertions, 1557 deletions
diff --git a/devel/Makefile b/devel/Makefile index 7962178946b8..324c227dd2e2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4950,7 +4950,6 @@ SUBDIR += py-robotremoteserver SUBDIR += py-rope SUBDIR += py-rose - SUBDIR += py-roxlib SUBDIR += py-rply SUBDIR += py-rq SUBDIR += py-rq-scheduler @@ -6611,7 +6610,6 @@ SUBDIR += tablist SUBDIR += tailor SUBDIR += talloc - SUBDIR += talloc1 SUBDIR += tass64 SUBDIR += tbb SUBDIR += tcl-memchan @@ -6636,7 +6634,6 @@ SUBDIR += termcolor SUBDIR += terminality SUBDIR += tevent - SUBDIR += tevent1 SUBDIR += tex-kpathsea SUBDIR += tex-libtexlua SUBDIR += tex-libtexluajit diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile deleted file mode 100644 index 70b0bae107c8..000000000000 --- a/devel/py-roxlib/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $FreeBSD$ - -PORTNAME= roxlib -PORTVERSION= 2.0.6 -PORTREVISION= 4 -CATEGORIES= devel python -MASTER_SITES= SF/rox/ROX-Lib/${PORTVERSION} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= rox-lib2-${PORTVERSION} - -MAINTAINER= olgeni@FreeBSD.org -COMMENT= Python libraries for ROX - -DEPRECATED= Old, uses EOLed python27 -EXPIRATION_DATE= 2020-02-16 - -USES= gnome python:2.7 shebangfix tar:bzip2 -USE_PYTHON= flavors -USE_GNOME= pygtk2:run -SHEBANG_FILES= ROX-Lib2/AppRun ROX-Lib2/python/make_docs.py - -RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer - -do-build: - @${PYTHON_CMD} -m compileall ${WRKSRC} - @${PYTHON_CMD} -O -m compileall ${WRKSRC} - @cd ${WRKSRC}/ROX-Lib2/python && ${PYTHON_CMD} make_docs.py - -do-install: - ${CP} -r ${WRKSRC}/ROX-Lib2 ${STAGEDIR}${PREFIX}/lib - -.include <bsd.port.mk> diff --git a/devel/py-roxlib/distinfo b/devel/py-roxlib/distinfo deleted file mode 100644 index a0609638ce1f..000000000000 --- a/devel/py-roxlib/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (rox-lib2-2.0.6.tar.bz2) = d0ddf57eeb43ef6628fd2045ba331f3a4550e385e2b84d430c8ebb517ed8ad2f -SIZE (rox-lib2-2.0.6.tar.bz2) = 145972 diff --git a/devel/py-roxlib/pkg-descr b/devel/py-roxlib/pkg-descr deleted file mode 100644 index 80577461699c..000000000000 --- a/devel/py-roxlib/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python libraries required by some ROX desktop applications. - -WWW: http://rox.sourceforge.net/phpwiki/index.php/ROX-Lib diff --git a/devel/py-roxlib/pkg-plist b/devel/py-roxlib/pkg-plist deleted file mode 100644 index ed59ed355571..000000000000 --- a/devel/py-roxlib/pkg-plist +++ /dev/null @@ -1,205 +0,0 @@ -lib/ROX-Lib2/.DirIcon -lib/ROX-Lib2/AppInfo.xml -lib/ROX-Lib2/AppRun -lib/ROX-Lib2/Help/COPYING -lib/ROX-Lib2/Help/Changes -lib/ROX-Lib2/Help/Errors -lib/ROX-Lib2/Help/README -lib/ROX-Lib2/Help/TODO -lib/ROX-Lib2/Help/findrox.py -lib/ROX-Lib2/Help/findrox.pyc -lib/ROX-Lib2/Help/findrox.pyo -lib/ROX-Lib2/Help/python/rox.AppInfo.html -lib/ROX-Lib2/Help/python/rox.InfoWin.html -lib/ROX-Lib2/Help/python/rox.Menu.html -lib/ROX-Lib2/Help/python/rox.OptionsBox.html -lib/ROX-Lib2/Help/python/rox.applet.html -lib/ROX-Lib2/Help/python/rox.basedir.html -lib/ROX-Lib2/Help/python/rox.choices.html -lib/ROX-Lib2/Help/python/rox.debug.html -lib/ROX-Lib2/Help/python/rox.filer.html -lib/ROX-Lib2/Help/python/rox.fileutils.html -lib/ROX-Lib2/Help/python/rox.html -lib/ROX-Lib2/Help/python/rox.i18n.html -lib/ROX-Lib2/Help/python/rox.icon_theme.html -lib/ROX-Lib2/Help/python/rox.launch.html -lib/ROX-Lib2/Help/python/rox.loading.html -lib/ROX-Lib2/Help/python/rox.master_proxy.html -lib/ROX-Lib2/Help/python/rox.mime.html -lib/ROX-Lib2/Help/python/rox.mime_handler.html -lib/ROX-Lib2/Help/python/rox.options.html -lib/ROX-Lib2/Help/python/rox.processes.html -lib/ROX-Lib2/Help/python/rox.proxy.html -lib/ROX-Lib2/Help/python/rox.saving.html -lib/ROX-Lib2/Help/python/rox.session.html -lib/ROX-Lib2/Help/python/rox.settings.html -lib/ROX-Lib2/Help/python/rox.singleton.html -lib/ROX-Lib2/Help/python/rox.su.html -lib/ROX-Lib2/Help/python/rox.suchild.html -lib/ROX-Lib2/Help/python/rox.tasks.html -lib/ROX-Lib2/Help/python/rox.templates.html -lib/ROX-Lib2/Help/python/rox.thumbnail.html -lib/ROX-Lib2/Help/python/rox.uri_handler.html -lib/ROX-Lib2/Help/python/rox.xattr.html -lib/ROX-Lib2/Help/python/rox.xxmlrpc.html -lib/ROX-Lib2/Messages/de.gmo -lib/ROX-Lib2/Messages/de.po -lib/ROX-Lib2/Messages/dist -lib/ROX-Lib2/Messages/es.gmo -lib/ROX-Lib2/Messages/es.po -lib/ROX-Lib2/Messages/fr.gmo -lib/ROX-Lib2/Messages/fr.po -lib/ROX-Lib2/Messages/hu.gmo -lib/ROX-Lib2/Messages/hu.po -lib/ROX-Lib2/Messages/it.gmo -lib/ROX-Lib2/Messages/it.po -lib/ROX-Lib2/Messages/pl.gmo -lib/ROX-Lib2/Messages/pl.po -lib/ROX-Lib2/Messages/pt_BR.gmo -lib/ROX-Lib2/Messages/pt_BR.po -lib/ROX-Lib2/Messages/update-po -lib/ROX-Lib2/Messages/zh_CN.gmo -lib/ROX-Lib2/Messages/zh_CN.po -lib/ROX-Lib2/Messages/zh_TW.gmo -lib/ROX-Lib2/Messages/zh_TW.po -lib/ROX-Lib2/ROX-Lib2.xml -lib/ROX-Lib2/python/check.sh -lib/ROX-Lib2/python/make_docs.py -lib/ROX-Lib2/python/make_docs.pyc -lib/ROX-Lib2/python/make_docs.pyo -lib/ROX-Lib2/python/rox/AppInfo.py -lib/ROX-Lib2/python/rox/AppInfo.pyc -lib/ROX-Lib2/python/rox/AppInfo.pyo -lib/ROX-Lib2/python/rox/InfoWin.py -lib/ROX-Lib2/python/rox/InfoWin.pyc -lib/ROX-Lib2/python/rox/InfoWin.pyo -lib/ROX-Lib2/python/rox/Menu.py -lib/ROX-Lib2/python/rox/Menu.pyc -lib/ROX-Lib2/python/rox/Menu.pyo -lib/ROX-Lib2/python/rox/OptionsBox.py -lib/ROX-Lib2/python/rox/OptionsBox.pyc -lib/ROX-Lib2/python/rox/OptionsBox.pyo -lib/ROX-Lib2/python/rox/__init__.py -lib/ROX-Lib2/python/rox/__init__.pyc -lib/ROX-Lib2/python/rox/__init__.pyo -lib/ROX-Lib2/python/rox/applet.py -lib/ROX-Lib2/python/rox/applet.pyc -lib/ROX-Lib2/python/rox/applet.pyo -lib/ROX-Lib2/python/rox/basedir.py -lib/ROX-Lib2/python/rox/basedir.pyc -lib/ROX-Lib2/python/rox/basedir.pyo -lib/ROX-Lib2/python/rox/choices.py -lib/ROX-Lib2/python/rox/choices.pyc -lib/ROX-Lib2/python/rox/choices.pyo -lib/ROX-Lib2/python/rox/debug.py -lib/ROX-Lib2/python/rox/debug.pyc -lib/ROX-Lib2/python/rox/debug.pyo -lib/ROX-Lib2/python/rox/filer.py -lib/ROX-Lib2/python/rox/filer.pyc -lib/ROX-Lib2/python/rox/filer.pyo -lib/ROX-Lib2/python/rox/fileutils.py -lib/ROX-Lib2/python/rox/fileutils.pyc -lib/ROX-Lib2/python/rox/fileutils.pyo -lib/ROX-Lib2/python/rox/i18n.py -lib/ROX-Lib2/python/rox/i18n.pyc -lib/ROX-Lib2/python/rox/i18n.pyo -lib/ROX-Lib2/python/rox/icon_theme.py -lib/ROX-Lib2/python/rox/icon_theme.pyc -lib/ROX-Lib2/python/rox/icon_theme.pyo -lib/ROX-Lib2/python/rox/launch.py -lib/ROX-Lib2/python/rox/launch.pyc -lib/ROX-Lib2/python/rox/launch.pyo -lib/ROX-Lib2/python/rox/loading.py -lib/ROX-Lib2/python/rox/loading.pyc -lib/ROX-Lib2/python/rox/loading.pyo -lib/ROX-Lib2/python/rox/master_proxy.py -lib/ROX-Lib2/python/rox/master_proxy.pyc -lib/ROX-Lib2/python/rox/master_proxy.pyo -lib/ROX-Lib2/python/rox/mime.py -lib/ROX-Lib2/python/rox/mime.pyc -lib/ROX-Lib2/python/rox/mime.pyo -lib/ROX-Lib2/python/rox/mime_handler.py -lib/ROX-Lib2/python/rox/mime_handler.pyc -lib/ROX-Lib2/python/rox/mime_handler.pyo -lib/ROX-Lib2/python/rox/options.py -lib/ROX-Lib2/python/rox/options.pyc -lib/ROX-Lib2/python/rox/options.pyo -lib/ROX-Lib2/python/rox/processes.py -lib/ROX-Lib2/python/rox/processes.pyc -lib/ROX-Lib2/python/rox/processes.pyo -lib/ROX-Lib2/python/rox/proxy.py -lib/ROX-Lib2/python/rox/proxy.pyc -lib/ROX-Lib2/python/rox/proxy.pyo -lib/ROX-Lib2/python/rox/saving.py -lib/ROX-Lib2/python/rox/saving.pyc -lib/ROX-Lib2/python/rox/saving.pyo -lib/ROX-Lib2/python/rox/session.py -lib/ROX-Lib2/python/rox/session.pyc -lib/ROX-Lib2/python/rox/session.pyo -lib/ROX-Lib2/python/rox/settings.py -lib/ROX-Lib2/python/rox/settings.pyc -lib/ROX-Lib2/python/rox/settings.pyo -lib/ROX-Lib2/python/rox/singleton.py -lib/ROX-Lib2/python/rox/singleton.pyc -lib/ROX-Lib2/python/rox/singleton.pyo -lib/ROX-Lib2/python/rox/su.py -lib/ROX-Lib2/python/rox/su.pyc -lib/ROX-Lib2/python/rox/su.pyo -lib/ROX-Lib2/python/rox/suchild.py -lib/ROX-Lib2/python/rox/suchild.pyc -lib/ROX-Lib2/python/rox/suchild.pyo -lib/ROX-Lib2/python/rox/suchild.sh -lib/ROX-Lib2/python/rox/tasks.py -lib/ROX-Lib2/python/rox/tasks.pyc -lib/ROX-Lib2/python/rox/tasks.pyo -lib/ROX-Lib2/python/rox/templates.py -lib/ROX-Lib2/python/rox/templates.pyc -lib/ROX-Lib2/python/rox/templates.pyo -lib/ROX-Lib2/python/rox/thumbnail.py -lib/ROX-Lib2/python/rox/thumbnail.pyc -lib/ROX-Lib2/python/rox/thumbnail.pyo -lib/ROX-Lib2/python/rox/uri_handler.py -lib/ROX-Lib2/python/rox/uri_handler.pyc -lib/ROX-Lib2/python/rox/uri_handler.pyo -lib/ROX-Lib2/python/rox/xattr.py -lib/ROX-Lib2/python/rox/xattr.pyc -lib/ROX-Lib2/python/rox/xattr.pyo -lib/ROX-Lib2/python/rox/xxmlrpc.py -lib/ROX-Lib2/python/rox/xxmlrpc.pyc -lib/ROX-Lib2/python/rox/xxmlrpc.pyo -lib/ROX-Lib2/tests/python/testall.py -lib/ROX-Lib2/tests/python/testall.pyc -lib/ROX-Lib2/tests/python/testall.pyo -lib/ROX-Lib2/tests/python/testbasedir.py -lib/ROX-Lib2/tests/python/testbasedir.pyc -lib/ROX-Lib2/tests/python/testbasedir.pyo -lib/ROX-Lib2/tests/python/testchoices.py -lib/ROX-Lib2/tests/python/testchoices.pyc -lib/ROX-Lib2/tests/python/testchoices.pyo -lib/ROX-Lib2/tests/python/testicon_theme.py -lib/ROX-Lib2/tests/python/testicon_theme.pyc -lib/ROX-Lib2/tests/python/testicon_theme.pyo -lib/ROX-Lib2/tests/python/testmenu.py -lib/ROX-Lib2/tests/python/testmenu.pyc -lib/ROX-Lib2/tests/python/testmenu.pyo -lib/ROX-Lib2/tests/python/testoptions.py -lib/ROX-Lib2/tests/python/testoptions.pyc -lib/ROX-Lib2/tests/python/testoptions.pyo -lib/ROX-Lib2/tests/python/testprocesses.py -lib/ROX-Lib2/tests/python/testprocesses.pyc -lib/ROX-Lib2/tests/python/testprocesses.pyo -lib/ROX-Lib2/tests/python/testproxy.py -lib/ROX-Lib2/tests/python/testproxy.pyc -lib/ROX-Lib2/tests/python/testproxy.pyo -lib/ROX-Lib2/tests/python/testrox.py -lib/ROX-Lib2/tests/python/testrox.pyc -lib/ROX-Lib2/tests/python/testrox.pyo -lib/ROX-Lib2/tests/python/testsu.py -lib/ROX-Lib2/tests/python/testsu.pyc -lib/ROX-Lib2/tests/python/testsu.pyo -lib/ROX-Lib2/tests/python/testtasks.py -lib/ROX-Lib2/tests/python/testtasks.pyc -lib/ROX-Lib2/tests/python/testtasks.pyo -lib/ROX-Lib2/tests/python/testxxmlrpc.py -lib/ROX-Lib2/tests/python/testxxmlrpc.pyc -lib/ROX-Lib2/tests/python/testxxmlrpc.pyo diff --git a/devel/talloc1/Makefile b/devel/talloc1/Makefile deleted file mode 100644 index 61a5639a8e34..000000000000 --- a/devel/talloc1/Makefile +++ /dev/null @@ -1,137 +0,0 @@ -# $FreeBSD$ - -PORTNAME= talloc -PORTVERSION= 2.1.14 -PORTREVISION= 0 -CATEGORIES= devel -MASTER_SITES= SAMBA -PKGNAMESUFFIX= 1 - -MAINTAINER= timur@FreeBSD.org -COMMENT= Hierarchical pool based memory allocator - -LICENSE= LGPL3 - -DEPRECATED= Old version, uses EOLed python27 -EXPIRATION_DATE= 2020-02-15 - -IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support - -CONFLICTS_INSTALL= talloc-* - -#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 -MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) - -.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 -CONFIGURE_ARGS+= --disable-python -.else -USES+= python:2.7 - -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} -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 -.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> diff --git a/devel/talloc1/distinfo b/devel/talloc1/distinfo deleted file mode 100644 index 04d78200ce6f..000000000000 --- a/devel/talloc1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1531611950 -SHA256 (talloc-2.1.14.tar.gz) = b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce -SIZE (talloc-2.1.14.tar.gz) = 444589 diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__samba_autoconf.py b/devel/talloc1/files/patch-buildtools__wafsamba__samba_autoconf.py deleted file mode 100644 index c92d308462be..000000000000 --- a/devel/talloc1/files/patch-buildtools__wafsamba__samba_autoconf.py +++ /dev/null @@ -1,52 +0,0 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC -+++ buildtools/wafsamba/samba_autoconf.py -@@ -548,7 +548,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 [] -@@ -568,11 +568,29 @@ 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, 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) - 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) - - if not res: - if mandatory: -@@ -873,7 +891,7 @@ 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 diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__samba_install.py b/devel/talloc1/files/patch-buildtools__wafsamba__samba_install.py deleted file mode 100644 index 95f250a86218..000000000000 --- a/devel/talloc1/files/patch-buildtools__wafsamba__samba_install.py +++ /dev/null @@ -1,11 +0,0 @@ ---- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC -+++ buildtools/wafsamba/samba_install.py -@@ -118,7 +118,7 @@ def install_library(self): - inst_name = bld.make_libname(t.target) - elif self.vnum: - vnum_base = self.vnum.split('.')[0] -- install_name = bld.make_libname(target_name, version=self.vnum) -+ 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: diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__samba_python.py b/devel/talloc1/files/patch-buildtools__wafsamba__samba_python.py deleted file mode 100644 index 429ec5e778f9..000000000000 --- a/devel/talloc1/files/patch-buildtools__wafsamba__samba_python.py +++ /dev/null @@ -1,40 +0,0 @@ ---- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC -+++ buildtools/wafsamba/samba_python.py -@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man - - def _check_python_headers(conf, mandatory): - try: -+ from python import _get_python_variables - Configure.ConfigurationError - conf.check_python_headers(mandatory=mandatory) -+ conf.env['PYTHON_SO_ABI'] = _get_python_variables( -+ conf.env['PYTHON'], -+ ["get_config_var('SOABI') or ''"], -+ ['from distutils.sysconfig import get_config_var'] -+ )[0] - except Configure.ConfigurationError: - if mandatory: - raise - - if conf.env['PYTHON_VERSION'] > '3': -- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' -+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG, -+ while environment variable is PYTHON3_SO_ABI_FLAG''' -+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None) -+ if override_PYTHON_SO_ABI_FLAG is not None: -+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ if not conf.env['PYTHON_SO_ABI_FLAG']: -+ if conf.env['PYTHON_SO_ABI']: -+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI'] -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ else: -+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' - else: - conf.env['PYTHON_SO_ABI_FLAG'] = '' -+ - conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ( - conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-')) - diff --git a/devel/talloc1/files/patch-buildtools__wafsamba__wscript b/devel/talloc1/files/patch-buildtools__wafsamba__wscript deleted file mode 100644 index 9399a316c14e..000000000000 --- a/devel/talloc1/files/patch-buildtools__wafsamba__wscript +++ /dev/null @@ -1,15 +0,0 @@ ---- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC -+++ buildtools/wafsamba/wscript -@@ -76,10 +76,10 @@ def set_options(opt): - - opt.add_option('--with-libiconv', - help='additional directory to search for libiconv', -- action='store', dest='iconv_open', default='/usr/local', -+ action='store', dest='iconv_open', default=None, - match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) - opt.add_option('--without-gettext', -- help=("Disable use of gettext"), -+ help=("disable use of gettext"), - action="store_true", dest='disable_gettext', default=False) - - gr = opt.option_group('developer options') diff --git a/devel/talloc1/files/patch-lib__replace__wscript b/devel/talloc1/files/patch-lib__replace__wscript deleted file mode 100644 index 7bf2a8ee21fe..000000000000 --- a/devel/talloc1/files/patch-lib__replace__wscript +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/replace/wscript.orig 2017-07-02 20:22:14 UTC -+++ lib/replace/wscript -@@ -81,7 +81,7 @@ def configure(conf): - conf.CHECK_HEADERS('sys/atomic.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 diff --git a/devel/talloc1/files/patch-talloc.c b/devel/talloc1/files/patch-talloc.c deleted file mode 100644 index a2807e78b0cb..000000000000 --- a/devel/talloc1/files/patch-talloc.c +++ /dev/null @@ -1,20 +0,0 @@ ---- talloc.c.orig 2018-01-13 09:07:51 UTC -+++ talloc.c -@@ -387,6 +387,9 @@ void talloc_lib_init(void) __attribute__ - void talloc_lib_init(void) - { - uint32_t random_value; -+#if defined(HAVE_ARC4RANDOM) -+ random_value = arc4random(); -+#else - #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM) - uint8_t *p; - /* -@@ -420,6 +423,7 @@ void talloc_lib_init(void) - */ - random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF); - } -+#endif /* HAVE_ARC4RANDOM */ - talloc_magic = random_value & ~TALLOC_FLAG_MASK; - } - #else diff --git a/devel/talloc1/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/talloc1/files/patch-third_party__waf__wafadmin__Tools__cc.py deleted file mode 100644 index 5695f3e03841..000000000000 --- a/devel/talloc1/files/patch-third_party__waf__wafadmin__Tools__cc.py +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC -+++ third_party/waf/wafadmin/Tools/cc.py -@@ -88,7 +88,7 @@ def c_hook(self, node): - raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) - return task - --cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' -+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' - cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False) - cls.scan = ccroot.scan - cls.vars.append('CCDEPS') diff --git a/devel/talloc1/files/patch-wscript b/devel/talloc1/files/patch-wscript deleted file mode 100644 index 1d5c9c6d13b4..000000000000 --- a/devel/talloc1/files/patch-wscript +++ /dev/null @@ -1,18 +0,0 @@ ---- wscript.orig 2018-01-13 09:07:51 UTC -+++ wscript -@@ -46,13 +46,14 @@ def configure(conf): - conf.env.TALLOC_COMPAT1 = False - if conf.env.standalone_talloc: - conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 -- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' - conf.env.TALLOC_VERSION = VERSION - - conf.CHECK_XSLTPROC_MANPAGES() - - conf.CHECK_HEADERS('sys/auxv.h') - conf.CHECK_FUNCS('getauxval') -+ conf.CHECK_FUNCS('arc4random') - - conf.SAMBA_CONFIG_H() - diff --git a/devel/talloc1/files/talloc.3 b/devel/talloc1/files/talloc.3 deleted file mode 100644 index 6a10b4990c2e..000000000000 --- a/devel/talloc1/files/talloc.3 +++ /dev/null @@ -1,683 +0,0 @@ -'\" t -.\" Title: talloc -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 2015-04-10 -.\" Manual: System Administration tools -.\" Source: Samba 4.0 -.\" Language: English -.\" -.TH "TALLOC" "3" "2015\-04\-10" "Samba 4\&.0" "System Administration tools" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -talloc \- hierarchical reference counted memory pool system with destructors -.SH "SYNOPSIS" -.sp -.nf -#include <talloc\&.h> -.fi -.SH "DESCRIPTION" -.PP -If you are used to talloc from Samba3 then please read this carefully, as talloc has changed a lot\&. -.PP -The new talloc is a hierarchical, reference counted memory pool system with destructors\&. Quite a mouthful really, but not too bad once you get used to it\&. -.PP -Perhaps the biggest change from Samba3 is that there is no distinction between a "talloc context" and a "talloc pointer"\&. Any pointer returned from talloc() is itself a valid talloc context\&. This means you can do this: -.sp -.if n \{\ -.RS 4 -.\} -.nf - struct foo *X = talloc(mem_ctx, struct foo); - X\->name = talloc_strdup(X, "foo"); - -.fi -.if n \{\ -.RE -.\} -.PP -and the pointer -X\->name -would be a "child" of the talloc context -X -which is itself a child of -mem_ctx\&. So if you do -talloc_free(mem_ctx) -then it is all destroyed, whereas if you do -talloc_free(X) -then just -X -and -X\->name -are destroyed, and if you do -talloc_free(X\->name) -then just the name element of -X -is destroyed\&. -.PP -If you think about this, then what this effectively gives you is an n\-ary tree, where you can free any part of the tree with talloc_free()\&. -.PP -If you find this confusing, then I suggest you run the -testsuite -program to watch talloc in action\&. You may also like to add your own tests to -testsuite\&.c -to clarify how some particular situation is handled\&. -.SH "TALLOC API" -.PP -The following is a complete guide to the talloc API\&. Read it all at least twice\&. -.SS "(type *)talloc(const void *ctx, type);" -.PP -The talloc() macro is the core of the talloc library\&. It takes a memory -\fIctx\fR -and a -\fItype\fR, and returns a pointer to a new area of memory of the given -\fItype\fR\&. -.PP -The returned pointer is itself a talloc context, so you can use it as the -\fIctx\fR -argument to more calls to talloc() if you wish\&. -.PP -The returned pointer is a "child" of the supplied context\&. This means that if you talloc_free() the -\fIctx\fR -then the new child disappears as well\&. Alternatively you can free just the child\&. -.PP -The -\fIctx\fR -argument to talloc() can be NULL, in which case a new top level context is created\&. -.SS "void *talloc_size(const void *ctx, size_t size);" -.PP -The function talloc_size() should be used when you don\*(Aqt have a convenient type to pass to talloc()\&. Unlike talloc(), it is not type safe (as it returns a void *), so you are on your own for type checking\&. -.SS "(typeof(ptr)) talloc_ptrtype(const void *ctx, ptr);" -.PP -The talloc_ptrtype() macro should be used when you have a pointer and want to allocate memory to point at with this pointer\&. When compiling with gcc >= 3 it is typesafe\&. Note this is a wrapper of talloc_size() and talloc_get_name() will return the current location in the source file\&. and not the type\&. -.SS "int talloc_free(void *ptr);" -.PP -The talloc_free() function frees a piece of talloc memory, and all its children\&. You can call talloc_free() on any pointer returned by talloc()\&. -.PP -The return value of talloc_free() indicates success or failure, with 0 returned for success and \-1 for failure\&. The only possible failure condition is if -\fIptr\fR -had a destructor attached to it and the destructor returned \-1\&. See -\(lqtalloc_set_destructor()\(rq -for details on destructors\&. -.PP -If this pointer has an additional parent when talloc_free() is called then the memory is not actually released, but instead the most recently established parent is destroyed\&. See -\(lqtalloc_reference()\(rq -for details on establishing additional parents\&. -.PP -For more control on which parent is removed, see -\(lqtalloc_unlink()\(rq\&. -.PP -talloc_free() operates recursively on its children\&. -.PP -From the 2\&.0 version of talloc, as a special case, talloc_free() is refused on pointers that have more than one parent, as talloc would have no way of knowing which parent should be removed\&. To free a pointer that has more than one parent please use talloc_unlink()\&. -.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 -.\} -.nf - ERROR: talloc_free with references at some_dir/source/foo\&.c:123 - reference at some_dir/source/other\&.c:325 - reference at some_dir/source/third\&.c:121 - -.fi -.if n \{\ -.RE -.\} -.PP -Please see the documentation for talloc_set_log_fn() and talloc_set_log_stderr() for more information on talloc logging functions\&. -.SS "void *talloc_reference(const void *ctx, const void *ptr);" -.PP -The talloc_reference() function makes -\fIctx\fR -an additional parent of -\fIptr\fR\&. -.PP -The return value of talloc_reference() is always the original pointer -\fIptr\fR, unless talloc ran out of memory in creating the reference in which case it will return NULL (each additional reference consumes around 48 bytes of memory on intel x86 platforms)\&. -.PP -If -\fIptr\fR -is NULL, then the function is a no\-op, and simply returns NULL\&. -.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 -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -you can talloc_free() any parent of the original pointer\&. That will reduce the number of parents of this pointer by 1, and will cause this pointer to be freed if it runs out of parents\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} -you can talloc_free() the pointer itself if it has at maximum one parent\&. This behaviour has been changed since the release of version 2\&.0\&. Further informations in the description of "talloc_free"\&. -.RE -.PP -For more control on which parent to remove, see -\(lqtalloc_unlink()\(rq\&. -.SS "int talloc_unlink(const void *ctx, void *ptr);" -.PP -The talloc_unlink() function removes a specific parent from -\fIptr\fR\&. The -\fIctx\fR -passed must either be a context used in talloc_reference() with this pointer, or must be a direct parent of ptr\&. -.PP -Note that if the parent has already been removed using talloc_free() then this function will fail and will return \-1\&. Likewise, if -\fIptr\fR -is NULL, then the function will make no modifications and return \-1\&. -.PP -Usually you can just use talloc_free() instead of talloc_unlink(), but sometimes it is useful to have the additional control on which parent is removed\&. -.SS "void talloc_set_destructor(const void *ptr, int (*destructor)(void *));" -.PP -The function talloc_set_destructor() sets the -\fIdestructor\fR -for the pointer -\fIptr\fR\&. A -\fIdestructor\fR -is a function that is called when the memory used by a pointer is about to be released\&. The destructor receives -\fIptr\fR -as an argument, and should return 0 for success and \-1 for failure\&. -.PP -The -\fIdestructor\fR -can do anything it wants to, including freeing other pieces of memory\&. A common use for destructors is to clean up operating system resources (such as open file descriptors) contained in the structure the destructor is placed on\&. -.PP -You can only place one destructor on a pointer\&. If you need more than one destructor then you can create a zero\-length child of the pointer and place an additional destructor on that\&. -.PP -To remove a destructor call talloc_set_destructor() with NULL for the destructor\&. -.PP -If your destructor attempts to talloc_free() the pointer that it is the destructor for then talloc_free() will return \-1 and the free will be ignored\&. This would be a pointless operation anyway, as the destructor is only called when the memory is just about to go away\&. -.SS "int talloc_increase_ref_count(const void *\fIptr\fR);" -.PP -The talloc_increase_ref_count(\fIptr\fR) function is exactly equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_reference(NULL, ptr); -.fi -.if n \{\ -.RE -.\} -.PP -You can use either syntax, depending on which you think is clearer in your code\&. -.PP -It returns 0 on success and \-1 on failure\&. -.SS "size_t talloc_reference_count(const void *\fIptr\fR);" -.PP -Return the number of references to the pointer\&. -.SS "void talloc_set_name(const void *ptr, const char *fmt, \&.\&.\&.);" -.PP -Each talloc pointer has a "name"\&. The name is used principally for debugging purposes, although it is also possible to set and get the name on a pointer in as a way of "marking" pointers in your code\&. -.PP -The main use for names on pointer is for "talloc reports"\&. See -\(lqtalloc_report_depth_cb()\(rq, -\(lqtalloc_report_depth_file()\(rq, -\(lqtalloc_report()\(rq -\(lqtalloc_report()\(rq -and -\(lqtalloc_report_full()\(rq -for details\&. Also see -\(lqtalloc_enable_leak_report()\(rq -and -\(lqtalloc_enable_leak_report_full()\(rq\&. -.PP -The talloc_set_name() function allocates memory as a child of the pointer\&. It is logically equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, talloc_asprintf(ptr, fmt, \&.\&.\&.)); -.fi -.if n \{\ -.RE -.\} -.PP -Note that multiple calls to talloc_set_name() will allocate more memory without releasing the name\&. All of the memory is released when the ptr is freed using talloc_free()\&. -.SS "void talloc_set_name_const(const void *\fIptr\fR, const char *\fIname\fR);" -.PP -The function talloc_set_name_const() is just like talloc_set_name(), but it takes a string constant, and is much faster\&. It is extensively used by the "auto naming" macros, such as talloc_p()\&. -.PP -This function does not allocate any memory\&. It just copies the supplied pointer into the internal representation of the talloc ptr\&. This means you must not pass a -\fIname\fR -pointer to memory that will disappear before -\fIptr\fR -is freed with talloc_free()\&. -.SS "void *talloc_named(const void *\fIctx\fR, size_t \fIsize\fR, const char *\fIfmt\fR, \&.\&.\&.);" -.PP -The talloc_named() function creates a named talloc pointer\&. It is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -ptr = talloc_size(ctx, size); -talloc_set_name(ptr, fmt, \&.\&.\&.\&.); -.fi -.if n \{\ -.RE -.\} -.SS "void *talloc_named_const(const void *\fIctx\fR, size_t \fIsize\fR, const char *\fIname\fR);" -.PP -This is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -ptr = talloc_size(ctx, size); -talloc_set_name_const(ptr, name); -.fi -.if n \{\ -.RE -.\} -.SS "const char *talloc_get_name(const void *\fIptr\fR);" -.PP -This returns the current name for the given talloc pointer, -\fIptr\fR\&. See -\(lqtalloc_set_name()\(rq -for details\&. -.SS "void *talloc_init(const char *\fIfmt\fR, \&.\&.\&.);" -.PP -This function creates a zero length named talloc context as a top level context\&. It is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_named(NULL, 0, fmt, \&.\&.\&.); -.fi -.if n \{\ -.RE -.\} -.SS "void *talloc_new(void *\fIctx\fR);" -.PP -This is a utility macro that creates a new memory context hanging off an existing context, automatically naming it "talloc_new: __location__" where __location__ is the source line it is called from\&. It is particularly useful for creating a new temporary working context\&. -.SS "(\fItype\fR *)talloc_realloc(const void *\fIctx\fR, void *\fIptr\fR, \fItype\fR, \fIcount\fR);" -.PP -The talloc_realloc() macro changes the size of a talloc pointer\&. It has the following equivalences: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_realloc(ctx, NULL, type, 1) ==> talloc(ctx, type); -talloc_realloc(ctx, ptr, type, 0) ==> talloc_free(ptr); -.fi -.if n \{\ -.RE -.\} -.PP -The -\fIctx\fR -argument is only used if -\fIptr\fR -is not NULL, otherwise it is ignored\&. -.PP -talloc_realloc() returns the new pointer, or NULL on failure\&. The call will fail either due to a lack of memory, or because the pointer has more than one parent (see -\(lqtalloc_reference()\(rq)\&. -.SS "void *talloc_realloc_size(const void *ctx, void *ptr, size_t size);" -.PP -the talloc_realloc_size() function is useful when the type is not known so the type\-safe talloc_realloc() cannot be used\&. -.SS "TYPE *talloc_steal(const void *\fInew_ctx\fR, const TYPE *\fIptr\fR);" -.PP -The talloc_steal() function changes the parent context of a talloc pointer\&. It is typically used when the context that the pointer is currently a child of is going to be freed and you wish to keep the memory for a longer time\&. -.PP -The talloc_steal() function returns the pointer that you pass it\&. It does not have any failure modes\&. -.PP -It is possible to produce loops in the parent/child relationship if you are not careful with talloc_steal()\&. No guarantees are provided as to your sanity or the safety of your data if you do this\&. -.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 -.\} -.nf - WARNING: talloc_steal with references at some_dir/source/foo\&.c:123 - reference at some_dir/source/other\&.c:325 - reference at some_dir/source/third\&.c:121 - -.fi -.if n \{\ -.RE -.\} -.PP -To unambiguously change the parent of a pointer please see the function -\(lqtalloc_reparent()\(rq\&. See the talloc_set_log_fn() documentation for more information on talloc logging\&. -.SS "TYPE *talloc_reparent(const void *\fIold_parent\fR, const void *\fInew_parent\fR, const TYPE *\fIptr\fR);" -.PP -The talloc_reparent() function changes the parent context of a talloc pointer\&. It is typically used when the context that the pointer is currently a child of is going to be freed and you wish to keep the memory for a longer time\&. -.PP -The talloc_reparent() function returns the pointer that you pass it\&. It does not have any failure modes\&. -.PP -The difference between talloc_reparent() and talloc_steal() is that talloc_reparent() can specify which parent you wish to change\&. This is useful when a pointer has multiple parents via references\&. -.SS "TYPE *talloc_move(const void *\fInew_ctx\fR, TYPE **\fIptr\fR);" -.PP -The talloc_move() function is a wrapper around talloc_steal() which zeros the source pointer after the move\&. This avoids a potential source of bugs where a programmer leaves a pointer in two structures, and uses the pointer from the old structure after it has been moved to a new one\&. -.SS "size_t talloc_total_size(const void *\fIptr\fR);" -.PP -The talloc_total_size() function returns the total size in bytes used by this pointer and all child pointers\&. Mostly useful for debugging\&. -.PP -Passing NULL is allowed, but it will only give a meaningful result if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. -.SS "size_t talloc_total_blocks(const void *\fIptr\fR);" -.PP -The talloc_total_blocks() function returns the total memory block count used by this pointer and all child pointers\&. Mostly useful for debugging\&. -.PP -Passing NULL is allowed, but it will only give a meaningful result if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. -.SS "void talloc_report(const void *ptr, FILE *f);" -.PP -The talloc_report() function prints a summary report of all memory used by -\fIptr\fR\&. One line of report is printed for each immediate child of ptr, showing the total memory and number of blocks used by that child\&. -.PP -You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. -.SS "void talloc_report_full(const void *\fIptr\fR, FILE *\fIf\fR);" -.PP -This provides a more detailed report than talloc_report()\&. It will recursively print the entire tree of memory referenced by the pointer\&. References in the tree are shown by giving the name of the pointer that is referenced\&. -.PP -You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. -.SS "" -.HP \w'void\ talloc_report_depth_cb('u -.BI "void talloc_report_depth_cb(" "const\ void\ *ptr" ", " "int\ depth" ", " "int\ max_depth" ", " "void\ (*callback)(const\ void\ *ptr,\ int\ depth,\ int\ max_depth,\ int\ is_ref,\ void\ *priv)" ", " "void\ *priv" ");" -.PP -This provides a more flexible reports than talloc_report()\&. It will recursively call the callback for the entire tree of memory referenced by the pointer\&. References in the tree are passed with -\fIis_ref = 1\fR -and the pointer that is referenced\&. -.PP -You can pass NULL for the pointer, in which case a report is printed for the top level memory context, but only if talloc_enable_leak_report() or talloc_enable_leak_report_full() has been called\&. -.PP -The recursion is stopped when depth >= max_depth\&. max_depth = \-1 means only stop at leaf nodes\&. -.SS "" -.HP \w'void\ talloc_report_depth_file('u -.BI "void talloc_report_depth_file(" "const\ void\ *ptr" ", " "int\ depth" ", " "int\ max_depth" ", " "FILE\ *f" ");" -.PP -This provides a more flexible reports than talloc_report()\&. It will let you specify the depth and max_depth\&. -.SS "void talloc_enable_leak_report(void);" -.PP -This enables calling of talloc_report(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report command line option\&. -.PP -For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\*(Aqt call this function first then passing NULL to talloc_report() or talloc_report_full() won\*(Aqt give you the full tree printout\&. -.PP -Here is a typical talloc report: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc report on \*(Aqnull_context\*(Aq (total 267 bytes in 15 blocks) -libcli/auth/spnego_parse\&.c:55 contains 31 bytes in 2 blocks -libcli/auth/spnego_parse\&.c:55 contains 31 bytes in 2 blocks -iconv(UTF8,CP850) contains 42 bytes in 2 blocks -libcli/auth/spnego_parse\&.c:55 contains 31 bytes in 2 blocks -iconv(CP850,UTF8) contains 42 bytes in 2 blocks -iconv(UTF8,UTF\-16LE) contains 45 bytes in 2 blocks -iconv(UTF\-16LE,UTF8) contains 45 bytes in 2 blocks - -.fi -.if n \{\ -.RE -.\} -.SS "void talloc_enable_leak_report_full(void);" -.PP -This enables calling of talloc_report_full(NULL, stderr) when the program exits\&. In Samba4 this is enabled by using the \-\-leak\-report\-full command line option\&. -.PP -For it to be useful, this function must be called before any other talloc function as it establishes a "null context" that acts as the top of the tree\&. If you don\*(Aqt call this function first then passing NULL to talloc_report() or talloc_report_full() won\*(Aqt give you the full tree printout\&. -.PP -Here is a typical full report: -.sp -.if n \{\ -.RS 4 -.\} -.nf -full talloc report on \*(Aqroot\*(Aq (total 18 bytes in 8 blocks) -p1 contains 18 bytes in 7 blocks (ref 0) - r1 contains 13 bytes in 2 blocks (ref 0) - reference to: p2 - p2 contains 1 bytes in 1 blocks (ref 1) - x3 contains 1 bytes in 1 blocks (ref 0) - x2 contains 1 bytes in 1 blocks (ref 0) - x1 contains 1 bytes in 1 blocks (ref 0) - -.fi -.if n \{\ -.RE -.\} -.SS "(\fItype\fR *)talloc_zero(const void *\fIctx\fR, \fItype\fR);" -.PP -The talloc_zero() macro is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -ptr = talloc(ctx, type); -if (ptr) memset(ptr, 0, sizeof(type)); -.fi -.if n \{\ -.RE -.\} -.SS "void *talloc_zero_size(const void *\fIctx\fR, size_t \fIsize\fR)" -.PP -The talloc_zero_size() function is useful when you don\*(Aqt have a known type\&. -.SS "void *talloc_memdup(const void *\fIctx\fR, const void *\fIp\fR, size_t size);" -.PP -The talloc_memdup() function is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -ptr = talloc_size(ctx, size); -if (ptr) memcpy(ptr, p, size); -.fi -.if n \{\ -.RE -.\} -.SS "char *talloc_strdup(const void *\fIctx\fR, const char *\fIp\fR);" -.PP -The talloc_strdup() function is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -ptr = talloc_size(ctx, strlen(p)+1); -if (ptr) memcpy(ptr, p, strlen(p)+1); -.fi -.if n \{\ -.RE -.\} -.PP -This function sets the name of the new pointer to the passed string\&. This is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, ptr) -.fi -.if n \{\ -.RE -.\} -.SS "char *talloc_strndup(const void *\fIt\fR, const char *\fIp\fR, size_t \fIn\fR);" -.PP -The talloc_strndup() function is the talloc equivalent of the C library function strndup(3)\&. -.PP -This function sets the name of the new pointer to the passed string\&. This is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, ptr) -.fi -.if n \{\ -.RE -.\} -.SS "char *talloc_vasprintf(const void *\fIt\fR, const char *\fIfmt\fR, va_list \fIap\fR);" -.PP -The talloc_vasprintf() function is the talloc equivalent of the C library function vasprintf(3)\&. -.PP -This function sets the name of the new pointer to the new string\&. This is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, ptr) -.fi -.if n \{\ -.RE -.\} -.SS "char *talloc_asprintf(const void *\fIt\fR, const char *\fIfmt\fR, \&.\&.\&.);" -.PP -The talloc_asprintf() function is the talloc equivalent of the C library function asprintf(3)\&. -.PP -This function sets the name of the new pointer to the passed string\&. This is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, ptr) -.fi -.if n \{\ -.RE -.\} -.SS "char *talloc_asprintf_append(char *s, const char *fmt, \&.\&.\&.);" -.PP -The talloc_asprintf_append() function appends the given formatted string to the given string\&. -.PP -This function sets the name of the new pointer to the new string\&. This is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, ptr) -.fi -.if n \{\ -.RE -.\} -.SS "(type *)talloc_array(const void *ctx, type, unsigned int count);" -.PP -The talloc_array() macro is equivalent to: -.sp -.if n \{\ -.RS 4 -.\} -.nf -(type *)talloc_size(ctx, sizeof(type) * count); -.fi -.if n \{\ -.RE -.\} -.PP -except that it provides integer overflow protection for the multiply, returning NULL if the multiply overflows\&. -.SS "void *talloc_array_size(const void *ctx, size_t size, unsigned int count);" -.PP -The talloc_array_size() function is useful when the type is not known\&. It operates in the same way as talloc_array(), but takes a size instead of a type\&. -.SS "(typeof(ptr)) talloc_array_ptrtype(const void *ctx, ptr, unsigned int count);" -.PP -The talloc_ptrtype() macro should be used when you have a pointer to an array and want to allocate memory of an array to point at with this pointer\&. When compiling with gcc >= 3 it is typesafe\&. Note this is a wrapper of talloc_array_size() and talloc_get_name() will return the current location in the source file\&. and not the type\&. -.SS "void *talloc_realloc_fn(const void *ctx, void *ptr, size_t size)" -.PP -This is a non\-macro version of talloc_realloc(), which is useful as libraries sometimes want a realloc function pointer\&. A realloc(3) implementation encapsulates the functionality of malloc(3), free(3) and realloc(3) in one call, which is why it is useful to be able to pass around a single function pointer\&. -.SS "void *talloc_autofree_context(void);" -.PP -This is a handy utility function that returns a talloc context which will be automatically freed on program exit\&. This can be used to reduce the noise in memory leak reports\&. -.SS "void *talloc_check_name(const void *ptr, const char *name);" -.PP -This function checks if a pointer has the specified -\fIname\fR\&. If it does then the pointer is returned\&. It it doesn\*(Aqt then NULL is returned\&. -.SS "(type *)talloc_get_type(const void *ptr, type);" -.PP -This macro allows you to do type checking on talloc pointers\&. It is particularly useful for void* private pointers\&. It is equivalent to this: -.sp -.if n \{\ -.RS 4 -.\} -.nf -(type *)talloc_check_name(ptr, #type) -.fi -.if n \{\ -.RE -.\} -.SS "talloc_set_type(const void *ptr, type);" -.PP -This macro allows you to force the name of a pointer to be a particular -\fItype\fR\&. This can be used in conjunction with talloc_get_type() to do type checking on void* pointers\&. -.PP -It is equivalent to this: -.sp -.if n \{\ -.RS 4 -.\} -.nf -talloc_set_name_const(ptr, #type) -.fi -.if n \{\ -.RE -.\} -.SS "talloc_set_log_fn(void (*log_fn)(const char *message));" -.PP -This function sets a logging function that talloc will use for warnings and errors\&. By default talloc will not print any warnings or errors\&. -.SS "talloc_set_log_stderr(void);" -.PP -This sets the talloc log function to write log messages to stderr -.SH "PERFORMANCE" -.PP -All the additional features of talloc(3) over malloc(3) do come at a price\&. We have a simple performance test in Samba4 that measures talloc() versus malloc() performance, and it seems that talloc() is about 10% slower than malloc() on my x86 Debian Linux box\&. For Samba, the great reduction in code complexity that we get by using talloc makes this worthwhile, especially as the total overhead of talloc/malloc in Samba is already quite small\&. -.SH "SEE ALSO" -.PP -malloc(3), strndup(3), vasprintf(3), asprintf(3), -\m[blue]\fB\%http://talloc.samba.org/\fR\m[] -.SH "AUTHOR" -.PP -The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. -.SH "COPYRIGHT/LICENSE" -.PP -Copyright (C) Andrew Tridgell 2004 -.PP -This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version\&. -.PP -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\&. See the GNU General Public License for more details\&. -.PP -You should have received a copy of the GNU General Public License along with this program; if not, see http://www\&.gnu\&.org/licenses/\&. diff --git a/devel/talloc1/pkg-descr b/devel/talloc1/pkg-descr deleted file mode 100644 index bb86bf2367a9..000000000000 --- a/devel/talloc1/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -A hierarchical pool based memory allocator with destructors. It uses -reference counting to determine when memory should be freed. - -WWW: http://talloc.samba.org/ diff --git a/devel/tevent1/Makefile b/devel/tevent1/Makefile deleted file mode 100644 index 97e6fd3c0429..000000000000 --- a/devel/tevent1/Makefile +++ /dev/null @@ -1,136 +0,0 @@ -# $FreeBSD$ - -PORTNAME= tevent -PORTVERSION= 0.9.37 -PORTREVISION= 0 -PORTEPOCH= 0 -CATEGORIES= devel -MASTER_SITES= SAMBA -PKGNAMESUFFIX= 1 - -MAINTAINER= timur@FreeBSD.org -COMMENT= Talloc based event loop library - -LICENSE= LGPL3 - -DEPRECATED= Old version, uses EOLed python27 -EXPIRATION_DATE= 2020-02-15 - -IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support - -BUILD_DEPENDS= talloc1>=2.1.11:devel/talloc1 -RUN_DEPENDS= talloc1>=2.1.11:devel/talloc1 - -CONFLICTS_INSTALL= tevent-* - -#FLAVORS= default nopython -#nopython_PKGNAMESUFFIX= -nopython -#nopython_CONFLICTS= tevent -#default_CONFLICTS= tevent-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+= --bundled-libraries=!talloc - -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ - --disable-rpath \ - --without-gettext - -OPTIONS_DEFINE= MANPAGES -MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) - -.include <bsd.port.options.mk> - -PLIST_FILES+= include/tevent.h \ - lib/libtevent.so \ - lib/libtevent.so.0 \ - ${PKGCONFIGDIR}/tevent.pc - -.if defined(NO_PYTHON) -USES+= python:2.7,build -CONFIGURE_ARGS+= --disable-python -.else -USES+= python:2.7 - -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} -.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} -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 - -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 - -.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> diff --git a/devel/tevent1/distinfo b/devel/tevent1/distinfo deleted file mode 100644 index 69e2783a89f4..000000000000 --- a/devel/tevent1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1531613973 -SHA256 (tevent-0.9.37.tar.gz) = 168345ed65eac03785cf77b95238e7dc66cbb473a42811693a6b0916e5dae7e0 -SIZE (tevent-0.9.37.tar.gz) = 603859 diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__samba_autoconf.py b/devel/tevent1/files/patch-buildtools__wafsamba__samba_autoconf.py deleted file mode 100644 index c92d308462be..000000000000 --- a/devel/tevent1/files/patch-buildtools__wafsamba__samba_autoconf.py +++ /dev/null @@ -1,52 +0,0 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC -+++ buildtools/wafsamba/samba_autoconf.py -@@ -548,7 +548,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 [] -@@ -568,11 +568,29 @@ 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, 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) - 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) - - if not res: - if mandatory: -@@ -873,7 +891,7 @@ 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 diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__samba_install.py b/devel/tevent1/files/patch-buildtools__wafsamba__samba_install.py deleted file mode 100644 index 95f250a86218..000000000000 --- a/devel/tevent1/files/patch-buildtools__wafsamba__samba_install.py +++ /dev/null @@ -1,11 +0,0 @@ ---- buildtools/wafsamba/samba_install.py.orig 2015-12-10 11:01:40 UTC -+++ buildtools/wafsamba/samba_install.py -@@ -118,7 +118,7 @@ def install_library(self): - inst_name = bld.make_libname(t.target) - elif self.vnum: - vnum_base = self.vnum.split('.')[0] -- install_name = bld.make_libname(target_name, version=self.vnum) -+ 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: diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__samba_python.py b/devel/tevent1/files/patch-buildtools__wafsamba__samba_python.py deleted file mode 100644 index 429ec5e778f9..000000000000 --- a/devel/tevent1/files/patch-buildtools__wafsamba__samba_python.py +++ /dev/null @@ -1,40 +0,0 @@ ---- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC -+++ buildtools/wafsamba/samba_python.py -@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man - - def _check_python_headers(conf, mandatory): - try: -+ from python import _get_python_variables - Configure.ConfigurationError - conf.check_python_headers(mandatory=mandatory) -+ conf.env['PYTHON_SO_ABI'] = _get_python_variables( -+ conf.env['PYTHON'], -+ ["get_config_var('SOABI') or ''"], -+ ['from distutils.sysconfig import get_config_var'] -+ )[0] - except Configure.ConfigurationError: - if mandatory: - raise - - if conf.env['PYTHON_VERSION'] > '3': -- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' -+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG, -+ while environment variable is PYTHON3_SO_ABI_FLAG''' -+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None) -+ if override_PYTHON_SO_ABI_FLAG is not None: -+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ if not conf.env['PYTHON_SO_ABI_FLAG']: -+ if conf.env['PYTHON_SO_ABI']: -+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI'] -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ else: -+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' - else: - conf.env['PYTHON_SO_ABI_FLAG'] = '' -+ - conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ( - conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-')) - diff --git a/devel/tevent1/files/patch-buildtools__wafsamba__wscript b/devel/tevent1/files/patch-buildtools__wafsamba__wscript deleted file mode 100644 index 9399a316c14e..000000000000 --- a/devel/tevent1/files/patch-buildtools__wafsamba__wscript +++ /dev/null @@ -1,15 +0,0 @@ ---- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC -+++ buildtools/wafsamba/wscript -@@ -76,10 +76,10 @@ def set_options(opt): - - opt.add_option('--with-libiconv', - help='additional directory to search for libiconv', -- action='store', dest='iconv_open', default='/usr/local', -+ action='store', dest='iconv_open', default=None, - match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) - opt.add_option('--without-gettext', -- help=("Disable use of gettext"), -+ help=("disable use of gettext"), - action="store_true", dest='disable_gettext', default=False) - - gr = opt.option_group('developer options') diff --git a/devel/tevent1/files/patch-lib__replace__wscript b/devel/tevent1/files/patch-lib__replace__wscript deleted file mode 100644 index 7bf2a8ee21fe..000000000000 --- a/devel/tevent1/files/patch-lib__replace__wscript +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/replace/wscript.orig 2017-07-02 20:22:14 UTC -+++ lib/replace/wscript -@@ -81,7 +81,7 @@ def configure(conf): - conf.CHECK_HEADERS('sys/atomic.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 diff --git a/devel/tevent1/files/patch-third_party__waf__wafadmin__Tools__cc.py b/devel/tevent1/files/patch-third_party__waf__wafadmin__Tools__cc.py deleted file mode 100644 index 5695f3e03841..000000000000 --- a/devel/tevent1/files/patch-third_party__waf__wafadmin__Tools__cc.py +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/waf/wafadmin/Tools/cc.py.orig 2015-11-06 13:25:52 UTC -+++ third_party/waf/wafadmin/Tools/cc.py -@@ -88,7 +88,7 @@ def c_hook(self, node): - raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) - return task - --cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' -+cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' - cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False) - cls.scan = ccroot.scan - cls.vars.append('CCDEPS') diff --git a/devel/tevent1/files/patch-wscript b/devel/tevent1/files/patch-wscript deleted file mode 100644 index dff14b9a21a0..000000000000 --- a/devel/tevent1/files/patch-wscript +++ /dev/null @@ -1,20 +0,0 @@ ---- wscript.orig 2017-07-22 22:25:22 UTC -+++ wscript -@@ -88,7 +88,7 @@ def build(bld): - SRC += ' tevent_port.c' - - if bld.env.standalone_tevent: -- bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' - 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', diff --git a/devel/tevent1/pkg-descr b/devel/tevent1/pkg-descr deleted file mode 100644 index 7e733ff8b42c..000000000000 --- a/devel/tevent1/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -tevent is a simple library that can handle the main event loop for an -application. It supports three kinds of events: timed events, file -descriptors becoming readable or writable and signals. - -Talloc is used for memory management, both internally and for private -data provided by users of the library. - -WWW: http://www.samba.org/ |