diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 3b5ee50d71de..d3d29e2b86c8 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,67 +1,67 @@ PORTNAME= duplicity -DISTVERSION= 3.1.0 +DISTVERSION= 3.2.0.2 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= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pipx>0:devel/py-pipx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-gettext>0:devel/py-setuptools-gettext@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${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}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} -USES= cpe localbase python shebangfix +USES= cpe gettext-tools localbase python shebangfix CPE_VENDOR= ${PORTNAME}_project USE_LDCONFIG= yes USE_PYTHON= autoplist noflavors pep517 SHEBANG_FILES= duplicity/__main__.py -PORTDOCS= AUTHORS.md README-LOG.md README-REPO.md README.md +PORTDOCS= AUTHORS.md README-REPO.md README.md -OPTIONS_DEFINE= B2 DOCS DROPBOX FTP FTPS NLS S3 +OPTIONS_DEFINE= B2 DOCS DROPBOX FTP FTPS 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 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 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} .include diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo index 91c3056f02f8..dea754fcbb74 100644 --- a/sysutils/duplicity/distinfo +++ b/sysutils/duplicity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1781731039 -SHA256 (duplicity-3.1.0.tar.gz) = a74ef057e2c39c27e8a3493b2e98c88c747408424f12e66233462b59b235ce82 -SIZE (duplicity-3.1.0.tar.gz) = 944883 +TIMESTAMP = 1787865853 +SHA256 (duplicity-3.2.0.2.tar.gz) = 3ddf185f5247f62f32aef212f5b97205decfc0391dec849cb6f84590ba1da6c6 +SIZE (duplicity-3.2.0.2.tar.gz) = 1719497 diff --git a/sysutils/duplicity/files/extra-patch-setup.py b/sysutils/duplicity/files/extra-patch-setup.py deleted file mode 100644 index 7d860294b566..000000000000 --- a/sysutils/duplicity/files/extra-patch-setup.py +++ /dev/null @@ -1,31 +0,0 @@ ---- setup.py.orig 2026-06-16 16:27:24 UTC -+++ setup.py -@@ -126,28 +126,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 -- 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 cleanup(): - if os.path.exists("po/LINGUAS"): diff --git a/sysutils/duplicity/files/patch-pyproject.toml b/sysutils/duplicity/files/patch-pyproject.toml index d923f6acce53..f574c7732682 100644 --- a/sysutils/duplicity/files/patch-pyproject.toml +++ b/sysutils/duplicity/files/patch-pyproject.toml @@ -1,15 +1,34 @@ ---- pyproject.toml.orig 2026-06-16 16:27:24 UTC +--- pyproject.toml.orig 2026-08-27 11:55:49 UTC +++ pyproject.toml -@@ -33,10 +33,10 @@ requires = [ +@@ -33,8 +33,8 @@ requires = [ [build-system] requires = [ "build>=1.1", - "pip>=24.0", -+ "pip>=23.3.2", - "pipx>=1.5", - "packaging>=20.0", - "setuptools>=78.1.0", ++ "pip>=23.3.2", + "setuptools>=63.1.0", + "setuptools-gettext>=0.1.18", "wheel>=0.42.0", ] - build-backend = "setuptools.build_meta" +@@ -64,20 +64,6 @@ compiler = "msgfmt" + ] + [tool.setuptools-gettext] + compiler = "msgfmt" +-[tool.setuptools.data-files] +-"share/doc/duplicity" = [ +- "CHANGELOG.md", +- "AUTHORS.md", +- "COPYING", +- "README.md", +- "README-ARCH.md", +- "README-INSTALL.md", +- "README-LOG.md", +- "README-RELEASE.md", +- "README-REPO.md", +- "README-SNAP.md", +- "README-TESTING.md", +-] + "share/man/man1" = [ + "man/duplicity.1", + ] diff --git a/sysutils/duplicity/files/patch-setup.py b/sysutils/duplicity/files/patch-setup.py deleted file mode 100644 index 5f773dab50ff..000000000000 --- a/sysutils/duplicity/files/patch-setup.py +++ /dev/null @@ -1,21 +0,0 @@ ---- setup.py.orig 2026-06-17 21:18:32 UTC -+++ setup.py -@@ -108,18 +108,6 @@ def get_data_files(): - "man/duplicity.1", - ], - ), -- ( -- f"share/doc/duplicity-{Version}", -- [ -- "CHANGELOG.md", -- "AUTHORS.md", -- "COPYING", -- "README.md", -- "README-LOG.md", -- "README-REPO.md", -- "README-TESTING.md", -- ], -- ), - ] - - # short circuit fot READTHEDOCS