diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 7b01abd9802a..e6793d8d32cc 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,76 +1,75 @@ PORTNAME= duplicity -DISTVERSION= 2.1.5 -PORTREVISION= 1 +DISTVERSION= 2.2.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= ${PY_SETUPTOOLS} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${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= bin/duplicity testing/overrides/bin/* +SHEBANG_FILES= duplicity/__main__.py testing/overrides/bin/* -PORTDOCS= CONTRIBUTING.md README-LOG.md README-REPO.md README-TESTING.md \ +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 ebd071b5d335..23163269b581 100644 --- a/sysutils/duplicity/distinfo +++ b/sysutils/duplicity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704707559 -SHA256 (duplicity-2.1.5.tar.gz) = 676c14e1b0029396954a054ddc2e9f12c939dfcfa95a4fb79b27ec396d6c15d1 -SIZE (duplicity-2.1.5.tar.gz) = 1559641 +TIMESTAMP = 1707206291 +SHA256 (duplicity-2.2.2.tar.gz) = 833ef5fa922d559be1c4f6a0f61315e8cb26da409f2024bcf310ba3fb9486d27 +SIZE (duplicity-2.2.2.tar.gz) = 1978264 diff --git a/sysutils/duplicity/files/patch-setup.py b/sysutils/duplicity/files/patch-setup.py index 1c5e69fb4034..c3afeb75bc21 100644 --- a/sysutils/duplicity/files/patch-setup.py +++ b/sysutils/duplicity/files/patch-setup.py @@ -1,21 +1,21 @@ ---- setup.py.orig 2023-12-25 16:22:33 UTC +--- setup.py.orig 2024-02-06 08:04:58 UTC +++ setup.py -@@ -87,18 +87,6 @@ def get_data_files(): - "bin/duplicity.1", +@@ -99,18 +99,6 @@ def get_data_files(): + "man/duplicity.1", ], ), - ( - f"share/doc/duplicity-{Version}", - [ - "CHANGELOG.md", -- "CONTRIBUTING.md", +- "AUTHORS.md", - "COPYING", - "README.md", - "README-LOG.md", - "README-REPO.md", - "README-TESTING.md", - ], - ), ] # short circuit fot READTHEDOCS