databases/tdb: Upgrade 1.4.3 to 1.4.7.

PR:		257528

3 files changed, 79 insertions, 110 deletions

diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 5ecf5f7ac97f..ff68bc4ee47d 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,115 +1,70 @@
-PORTNAME=		tdb
-PORTVERSION=		1.4.3
-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 <bsd.port.options.mk>
-
-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:build,test
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:3.4+
-
-PLIST_FILES+=		${PYTHON_SITELIBDIR}/tdb${PYTHON_EXT_SUFFIX}.so \
-			${PYTHON_SITELIBDIR}/_tdb_text.py
-.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
+PORTNAME=			tdb
+DISTVERSION=			1.4.7
+PORTREVISION=			0
+PORTEPOCH=			1
+CATEGORIES=			databases
+MASTER_SITES=			SAMBA
+
+MAINTAINER=			timur@FreeBSD.org
+COMMENT=			Trivial Database
+
+LICENSE=			GPLv3
+
+USES=				compiler pkgconfig shebangfix waf
+USE_LDCONFIG=			yes
+SHEBANG_GLOB=			*.py
+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 \
+				--disable-rpath-install \
+				--bundled-libraries=NONE \
+				--builtin-libraries=replace \
+				--without-gettext
+CONFIGURE_ENV=			PYTHONHASHSEED=1
+MAKE_ENV=			PYTHONHASHSEED=1
+
+MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
+
+OPTIONS_DEFINE=			MANPAGES DEBUG PYTHON
+OPTIONS_DEFAULT=		PYTHON
+OPTIONS_SUB=			yes
+
+DEBUG_CFLAGS=			-g -ggdb3 -O0
+DEBUG_CONFIGURE_ON=		--verbose --enable-debug
+DEBUG_MAKE_ARGS=		--verbose
+
+PYTHON_USES=			gettext-runtime python:3.6+
+PYTHON_USE+=			python=py3kplist
+PYTHON_USES_OFF=		python:build,test
+PYTHON_CONFIGURE_OFF=		--disable-python
+
+MANPAGES_CONFIGURE_ENV_OFF+=	XSLTPROC="true"
+MANPAGES_BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+				xsltproc:textproc/libxslt
 # 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}
+CFLAGS+=			${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_clang=			-fno-color-diagnostics
+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
+				@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+					${BUILD_WRKSRC}/wscript
 
 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
+				${MKDIR} ${BUILD_WRKSRC}/bin/default/man
+				${INSTALL_MAN} ${FILESDIR}/tdb*.8 ${BUILD_WRKSRC}/bin/default/man
 
 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
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tdb*
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtdb.so.1
+
+post-install-PYTHON-on:
+				${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo
index bbcd60410368..1e2aae9589e7 100644
--- a/databases/tdb/distinfo
+++ b/databases/tdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577717387
-SHA256 (tdb-1.4.3.tar.gz) = c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b
-SIZE (tdb-1.4.3.tar.gz) = 702836
+TIMESTAMP = 1659106948
+SHA256 (tdb-1.4.7.tar.gz) = a4fb168def533f31ff2c07f7d9844bb3131e6799f094ebe77d0380adc987c20e
+SIZE (tdb-1.4.7.tar.gz) = 741714
diff --git a/databases/tdb/pkg-plist b/databases/tdb/pkg-plist
new file mode 100644
index 000000000000..a021d8b29093
--- /dev/null
+++ b/databases/tdb/pkg-plist
@@ -0,0 +1,14 @@
+bin/tdbbackup
+bin/tdbdump
+bin/tdbrestore
+bin/tdbtool
+include/tdb.h
+lib/libtdb.so
+lib/libtdb.so.1
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
+libdata/pkgconfig/tdb.pc
+man/man8/tdbbackup.8.gz
+man/man8/tdbdump.8.gz
+man/man8/tdbrestore.8.gz
+man/man8/tdbtool.8.gz