tdb: updated to 1.3.16

1.3.16:
Unknown changes.

3 files changed, 33 insertions, 23 deletions

diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index cde2e669b21..e757da2201c 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2018/07/03 05:03:07 adam Exp $
+# $NetBSD: Makefile,v 1.34 2019/01/03 19:35:24 adam Exp $
 
-DISTNAME=	tdb-1.3.8
+DISTNAME=	tdb-1.3.16
 CATEGORIES=	databases
 MASTER_SITES=	http://www.samba.org/ftp/tdb/
 
@@ -17,28 +17,35 @@ CONFLICTS+=	samba<3.6.6nb3
 
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-python
+CONFIG_SHELL=		${PYTHONBIN}
+CONFIGURE_SCRIPT=	${WRKSRC}/buildtools/bin/waf
+CONFIGURE_ARGS+=	configure
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--abi-check-disable
+CONFIGURE_ARGS+=	--disable-symbol-versions
+.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
+CONFIGURE_ARGS+=	--jobs=${MAKE_JOBS}
+.else
+CONFIGURE_ARGS+=	--jobs=1
+.endif
+TEST_TARGET=		test
 
 PKGCONFIG_OVERRIDE=	tdb.pc.in
 
-PYTHON_FOR_BUILD_ONLY=	yes
-REPLACE_PYTHON+= buildtools/bin/waf
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.2.12
-
 USE_GCC_RUNTIME=	yes
 
-.include "../../mk/bsd.prefs.mk"
+PYTHON_VERSIONS_ACCEPTED=	27
 
-.if ${OPSYS} == "Darwin"
-post-build:
-	@install_name_tool -id ${PREFIX}/lib/libtdb.dylib \
-		${WRKSRC}/bin/default/libtdb.dylib
+PY_PATCHPLIST=		yes
+REPLACE_PYTHON+=	buildtools/bin/waf
 
-post-install:
-	@install_name_tool -id ${PREFIX}/lib/libtdb.dylib \
-		${DESTDIR}${PREFIX}/lib/libtdb.${PKGVERSION_NOREV}.dylib
-.endif
+SUBST_CLASSES+=		docbook
+SUBST_MESSAGE.docbook=	Fixing docbook URLs.
+SUBST_FILES.docbook+=	buildtools/wafsamba/samba_conftests.py
+SUBST_FILES.docbook+=	buildtools/wafsamba/wafsamba.py
+SUBST_STAGE.docbook=	pre-configure
+SUBST_SED.docbook+=	-e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tdb/PLIST b/databases/tdb/PLIST
index 7a14b258505..0dd42455aa3 100644
--- a/databases/tdb/PLIST
+++ b/databases/tdb/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/30 13:24:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/01/03 19:35:24 adam Exp $
 bin/tdbbackup
 bin/tdbdump
 bin/tdbrestore
 bin/tdbtool
 include/tdb.h
 lib/libtdb.so
-lib/libtdb.so.1
 lib/libtdb.so.${PKGVERSION}
+lib/libtdb.so.1
 lib/pkgconfig/tdb.pc
+${PYSITELIB}/_tdb_text.py
+${PYSITELIB}/tdb.so
 man/man8/tdbbackup.8
 man/man8/tdbdump.8
 man/man8/tdbrestore.8
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo
index d8a505a48a5..ed815dae6a6 100644
--- a/databases/tdb/distinfo
+++ b/databases/tdb/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2015/11/21 09:42:18 wiz Exp $
+$NetBSD: distinfo,v 1.13 2019/01/03 19:35:24 adam Exp $
 
-SHA1 (tdb-1.3.8.tar.gz) = 3ac6779e14ed37caa27d5243777a2c7c485ef087
-RMD160 (tdb-1.3.8.tar.gz) = 8f1d7b43b40abf9bcf18331c314fec334eb98996
-SHA512 (tdb-1.3.8.tar.gz) = 9a7040206bbaae419a296714fe14fcbd3b67c0cef2b0f33563d52336aac2fe814049f5136a148fb049a273bb36fe81e3d777df58869c93f45d6e42b4adf9970b
-Size (tdb-1.3.8.tar.gz) = 494106 bytes
+SHA1 (tdb-1.3.16.tar.gz) = 13b369b92d4cdc8057d90fc2b79657c9f5b72ec6
+RMD160 (tdb-1.3.16.tar.gz) = 887b296466ea584bf4f9881347572f3f85b8e305
+SHA512 (tdb-1.3.16.tar.gz) = 7b17852986e48a32f3f8f303dd2a26503a69fcf7849f22f51483334c9abda9f189b521679e51b4ee5a80197a8f304a084dde0f56d92cfe953d3a4ede557526d2
+Size (tdb-1.3.16.tar.gz) = 504330 bytes
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3