Index: head/databases/tdb/Makefile =================================================================== --- head/databases/tdb/Makefile (revision 514255) +++ head/databases/tdb/Makefile (revision 514256) @@ -1,118 +1,118 @@ # $FreeBSD$ PORTNAME= tdb -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.2 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= Trivial Database 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 #nopython_CONFLICTS= tdb tdb-debug #debug_CONFLICTS= tdb tdb-nopython #default_CONFLICTS= tdb-nopython tdb-debug USES= compiler gettext-runtime pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --disable-rpath \ --without-gettext OPTIONS_DEFINE= MANPAGES DEBUG MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) DEBUG_CONFIGURE_ON= --verbose --enable-debug DEBUG_MAKE_ARGS= --verbose DEBUG_FLAGS= -g -ggdb3 -O0 -DTDB_TRACE=1 .include TDB_BINS= bin/tdbbackup \ bin/tdbdump \ bin/tdbrestore \ bin/tdbtool PLIST_FILES+= include/tdb.h \ ${TDB_BINS} \ lib/libtdb.so \ lib/libtdb.so.1 \ ${PKGCONFIGDIR}/tdb.pc .if defined(NO_PYTHON) USES+= python:2.7+,build,test CONFIGURE_ARGS+= --disable-python .else USES+= python:3.4+ PLIST_FILES+= ${PYTHON_SITELIBDIR}/tdb.so \ ${PYTHON_SITELIBDIR}/_tdb_text.py .endif .include .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 TDB_MAN8= man/man8/tdbbackup.8.gz \ man/man8/tdbdump.8.gz \ man/man8/tdbrestore.8.gz \ man/man8/tdbtool.8.gz PLIST_FILES+= ${TDB_MAN8} 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 ${TDB_MAN8} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man .endfor post-install: .for lib in ${TDB_BINS} lib/libtdb.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib} .endfor .if !defined(NO_PYTHON) ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so .endif .include Index: head/databases/tdb/distinfo =================================================================== --- head/databases/tdb/distinfo (revision 514255) +++ head/databases/tdb/distinfo (revision 514256) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560369252 -SHA256 (tdb-1.4.0.tar.gz) = c1a0729c5400fb495465fa4bd953ae290db43c28dacd0506aef50dc482132d35 -SIZE (tdb-1.4.0.tar.gz) = 696994 +TIMESTAMP = 1567294079 +SHA256 (tdb-1.4.2.tar.gz) = 9040b2cce4028e392f063f91bbe76b8b28fecc2b7c0c6071c67b5eb3168e004a +SIZE (tdb-1.4.2.tar.gz) = 706236 Index: head/databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py =================================================================== --- head/databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py (revision 514255) +++ head/databases/tdb/files/patch-buildtools_wafsamba_samba__autoconf.py (revision 514256) @@ -1,36 +1,35 @@ ---- buildtools/wafsamba/samba_autoconf.py.orig 2019-02-26 06:44:21 UTC +--- buildtools/wafsamba/samba_autoconf.py.orig 2019-08-20 15:35:08 UTC +++ buildtools/wafsamba/samba_autoconf.py @@ -573,7 +573,7 @@ def library_flags(self, libs): @conf -def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False): +def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None): '''check if a set of libraries exist as system libraries returns the sublist of libs that do exist as a syslib or [] @@ -593,11 +593,14 @@ int foo() ret.append(lib) continue + if msg is None: + msg = 'Checking for library %s' % lib + (ccflags, ldflags, cpppath) = library_flags(conf, lib) if shlib: - res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) + res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) else: - res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False) + res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False, msg=msg) if not res: if mandatory: -@@ -925,6 +928,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c +@@ -949,5 +952,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): + if (conf.env.undefined_ignore_ldflags == [] and +- conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])): ++ conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)): conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup'] --