diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index e6793d8d32cc..52b288f85c8b 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,75 +1,74 @@ PORTNAME= duplicity -DISTVERSION= 2.2.2 +DISTVERSION= 2.2.3 CATEGORIES= sysutils MASTER_SITES= PYPI MAINTAINER= eduardo@FreeBSD.org COMMENT= Backup tool that uses librsync and GnuPG WWW= https://duplicity.gitlab.io/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8.0:devel/py-setuptools-scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= librsync.so:net/librsync RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} TEST_DEPENDS= gtar>0:archivers/gtar \ par2cmdline>0:archivers/par2cmdline USES= cpe localbase python shebangfix CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= yes USE_PYTHON= autoplist noflavors pep517 pytest SHEBANG_FILES= duplicity/__main__.py testing/overrides/bin/* PORTDOCS= AUTHORS.md README-LOG.md README-REPO.md README-TESTING.md \ README.md OPTIONS_DEFINE= B2 DOCS DROPBOX FTP FTPS GDOCS NLS S3 OPTIONS_DEFAULT= B2 DROPBOX GNUPG2 S3 OPTIONS_GROUP= GPG OPTIONS_SINGLE= GPG OPTIONS_SINGLE_GPG= GNUPG GNUPG2 B2_DESC= Backblaze B2 backend DROPBOX_DESC= Dropbox backend FTP_DESC= FTP backend FTPS_DESC= FTPS backend GDOCS_DESC= Google Docs backend GPG_DESC= GnuPG support GNUPG_DESC= Use GnuPG 1 GNUPG2_DESC= Use GnuPG 2 S3_DESC= Amazon S3 backend B2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}b2sdk>=0.1.8:devel/py-b2sdk@${PY_FLAVOR} DROPBOX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dropbox>0:www/py-dropbox@${PY_FLAVOR} FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3 FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydrive>0:devel/py-pydrive@${PY_FLAVOR} GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg NLS_USES= gettext-tools NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-setup.py S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/duplicity/_librsync*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} pre-test: @${REINPLACE_CMD} -e 's,python3,${PYTHON_CMD:T},' \ ${WRKSRC}/testing/functional/__init__.py .include diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo index 23163269b581..45add1b2d565 100644 --- a/sysutils/duplicity/distinfo +++ b/sysutils/duplicity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707206291 -SHA256 (duplicity-2.2.2.tar.gz) = 833ef5fa922d559be1c4f6a0f61315e8cb26da409f2024bcf310ba3fb9486d27 -SIZE (duplicity-2.2.2.tar.gz) = 1978264 +TIMESTAMP = 1710967459 +SHA256 (duplicity-2.2.3.tar.gz) = 4ad43f93601b1a41fb5f642bdda1706a1fb75f8ef1d6d482dd7f23107eaee87d +SIZE (duplicity-2.2.3.tar.gz) = 1978008 diff --git a/sysutils/duplicity/files/extra-patch-setup.py b/sysutils/duplicity/files/extra-patch-setup.py index b9b8c66d973d..18af0c97b3be 100644 --- a/sysutils/duplicity/files/extra-patch-setup.py +++ b/sysutils/duplicity/files/extra-patch-setup.py @@ -1,30 +1,31 @@ ---- setup.py.orig 2023-12-25 18:14:22 UTC +--- setup.py.orig 2024-03-20 20:49:22 UTC +++ setup.py -@@ -105,27 +105,6 @@ def get_data_files(): +@@ -111,28 +111,6 @@ def get_data_files(): if os.environ.get("READTHEDOCS") == "True": return data_files - # msgfmt the translation files - assert os.path.exists("po"), "Missing 'po' directory." - - linguas = glob.glob("po/*.po") - for lang in linguas: - lang = lang[3:-3] - try: - os.mkdir(os.path.join("po", lang)) - except os.error: - pass -- assert not os.system(f"cp po/{lang}.po po/{lang}"), lang -- assert not os.system(f"msgfmt po/{lang}.po -o po/{lang}/duplicity.mo"), lang +- subprocess.run(f"cp po/{lang}.po po/{lang}", shell=True, check=True) +- subprocess.run(f"msgfmt po/{lang}.po -o po/{lang}/duplicity.mo", shell=True, check=True) - - for root, dirs, files in os.walk("po"): - for file in files: - path = os.path.join(root, file) - if path.endswith("duplicity.mo"): - lang = os.path.split(root)[-1] - data_files.append((f"share/locale/{lang}/LC_MESSAGES", [f"po/{lang}/duplicity.mo"])) - - return data_files +- - - def VersionedCopy(source, dest): + def cleanup(): + if os.path.exists("po/LINGUAS"):