diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 40e1ba84c..c31cda7d9 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,13 +1,12 @@ COMMENT-main= trivial database library COMMENT-python= Python ${MODPY_VERSION} bindings for tdb -REVISION-main= 0 # Keep in sync with the version bundled in net/samba -V= 1.4.10 +V= 1.4.12 DISTNAME= tdb-$V PKGNAME-python= py3-${DISTNAME} -REVISION-python=0 +REVISION-python= 0 MULTI_PACKAGES= -main -python @@ -61,6 +60,6 @@ CONFIGURE_ARGS= --mandir="${PREFIX}/man" \ --disable-rpath post-install: - ${MODPY_BIN} -m compileall ${WRKINST}/${MODPY_SITEPKG} + ${MODPY_COMPILEALL} ${WRKINST}/${MODPY_SITEPKG} .include diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo index 885f40937..6471965a4 100644 --- a/databases/tdb/distinfo +++ b/databases/tdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (tdb-1.4.10.tar.gz) = AjOOM8FsIcnilXHO9SPnaytwhjYlT28wxs8ZXUjGLa8= -SIZE (tdb-1.4.10.tar.gz) = 747139 +SHA256 (tdb-1.4.12.tar.gz) = bOSydJiBLQkjfs5loNbfrAlBYQ5wmEjsuCKqJBCEzXo= +SIZE (tdb-1.4.12.tar.gz) = 748827 diff --git a/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py b/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py index 1a8a28706..ae284e725 100644 --- a/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py +++ b/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py @@ -4,7 +4,7 @@ Index: buildtools/wafsamba/wafsamba.py --- buildtools/wafsamba/wafsamba.py.orig +++ buildtools/wafsamba/wafsamba.py -@@ -292,6 +292,13 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -294,6 +294,13 @@ def SAMBA_LIBRARY(bld, libname, source, realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON')) link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON')) @@ -18,7 +18,7 @@ Index: buildtools/wafsamba/wafsamba.py # we don't want any public libraries without version numbers if (not private_library and target_type != 'PYTHON' and not realname): if vnum is None and soname is None: -@@ -408,9 +415,9 @@ def SAMBA_LIBRARY(bld, libname, source, +@@ -410,9 +417,9 @@ def SAMBA_LIBRARY(bld, libname, source, if pc_files is not None and not private_library: if pyembed: diff --git a/databases/tdb/pkg/PLIST-python b/databases/tdb/pkg/PLIST-python index fef0ec6df..f901d7280 100644 --- a/databases/tdb/pkg/PLIST-python +++ b/databases/tdb/pkg/PLIST-python @@ -1,5 +1,6 @@ @conflict tdb-<1.3.18p0 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_tdb_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}_tdb_text.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/_tdb_text.py @so lib/python${MODPY_VERSION}/site-packages/tdb.${MODPY_PYC_MAGIC_TAG}so