diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 7d41c9fa1619..d4d01393fe9e 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,6 +1,5 @@ PORTNAME= tdb -PORTVERSION= 1.4.3 -PORTREVISION= 0 +DISTVERSION= 1.4.5 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA @@ -10,107 +9,38 @@ 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 +USES= 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 \ +CONFIGURE_ENV= XSLTPROC="true" +CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ --disable-rpath \ --without-gettext -OPTIONS_DEFINE= MANPAGES DEBUG -MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) +OPTIONS_DEFINE= DEBUG PYTHON +OPTIONS_DEFAULT= PYTHON +OPTIONS_SUB= yes +DEBUG_CFLAGS= -g -ggdb3 -O0 -DTDB_TRACE=1 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:build,test -CONFIGURE_ARGS+= --disable-python -.else -USES+= python:3.4+ +PYTHON_USES= gettext-runtime python:3.6+ +PYTHON_USES_OFF= python:build,test +PYTHON_CONFIGURE_OFF= --disable-python -PLIST_FILES+= ${PYTHON_SITELIBDIR}/tdb${PYTHON_EXT_SUFFIX}.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 +pre-build: + ${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 +.include diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo index bbcd60410368..3b4162fafc9d 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 = 1627813920 +SHA256 (tdb-1.4.5.tar.gz) = bcfced884f7031080998b5c4b1c5dce57567055f79417f86dba40dcde99a0e41 +SIZE (tdb-1.4.5.tar.gz) = 729650 diff --git a/databases/tdb/files/patch-wscript b/databases/tdb/files/patch-wscript index 4869b58adf01..67b51923b557 100644 --- a/databases/tdb/files/patch-wscript +++ b/databases/tdb/files/patch-wscript @@ -1,11 +1,11 @@ ---- wscript.orig 2019-02-26 07:02:52 UTC +--- wscript.orig 2021-08-01 10:32:58 UTC +++ wscript -@@ -121,7 +121,7 @@ def build(bld): +@@ -115,7 +115,7 @@ def build(bld): COMMON_SRC = bld.SUBDIR('common', COMMON_FILES) if bld.env.standalone_tdb: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' -+ bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' ++ bld.env.PKGCONFIGDIR = '${LIBDIR}data/pkgconfig' private_library = False else: private_library = True 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