Index: sysutils/rdiff-backup/Makefile =================================================================== --- sysutils/rdiff-backup/Makefile +++ sysutils/rdiff-backup/Makefile @@ -2,42 +2,37 @@ # $FreeBSD$ PORTNAME= rdiff-backup -PORTVERSION= 1.2.8 -PORTREVISION= 3 +DISTVERSIONPREFIX= v +DISTVERSION= 2.0.0 PORTEPOCH= 1 CATEGORIES= sysutils -MASTER_SITES= SAVANNAH \ - LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= uzsolt@uzsolt.hu COMMENT= Local/remote mirroring+incremental backup LICENSE= GPLv2 -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= librsync.so:net/librsync +USES= localbase:ldflags python:3.5+ +USE_GITHUB= yes +USE_LDCONFIG= yes +USE_PYTHON= distutils + CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0* PORTSCOUT= limitw:1,even -USES= python:2.7 -USE_PYTHON= distutils -USE_LDCONFIG= yes - MAN1S= rdiff-backup.1 rdiff-backup-statistics.1 DOCS= CHANGELOG README COPYING FAQ.html OPTIONS_DEFINE= DOCS post-install: - ${INSTALL_MAN} ${MAN1S:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.for lib in C.so _librsync.so - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME:S,-,_,}/${lib} -.endfor + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rdiff_backup/_librsync.so + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rdiff_backup/C.so .include Index: sysutils/rdiff-backup/distinfo =================================================================== --- sysutils/rdiff-backup/distinfo +++ sysutils/rdiff-backup/distinfo @@ -1,2 +1,3 @@ -SHA256 (rdiff-backup-1.2.8.tar.gz) = 0d91a85b40949116fa8aaf15da165c34a2d15449b3cbe01c8026391310ac95db -SIZE (rdiff-backup-1.2.8.tar.gz) = 196526 +TIMESTAMP = 1588748473 +SHA256 (rdiff-backup-rdiff-backup-v2.0.0_GH0.tar.gz) = 4e96d98541b492e60249339330286c745d16b27bad136161aa5c87f64573c9b5 +SIZE (rdiff-backup-rdiff-backup-v2.0.0_GH0.tar.gz) = 404409 Index: sysutils/rdiff-backup/files/patch-__librsyncmodule.c =================================================================== --- sysutils/rdiff-backup/files/patch-__librsyncmodule.c +++ /dev/null @@ -1,16 +0,0 @@ ---- _librsyncmodule.c.orig 2009-03-16 14:36:21 UTC -+++ _librsyncmodule.c -@@ -59,8 +59,13 @@ _librsync_new_sigmaker(PyObject* self, P - if (sm == NULL) return NULL; - sm->x_attr = NULL; - -+#ifdef RS_DEFAULT_STRONG_LEN - sm->sig_job = rs_sig_begin((size_t)blocklen, - (size_t)RS_DEFAULT_STRONG_LEN); -+#else -+ sm->sig_job = rs_sig_begin((size_t)blocklen, -+ (size_t)8, RS_MD4_SIG_MAGIC); -+#endif - return (PyObject*)sm; - } - Index: sysutils/rdiff-backup/files/patch-setup.py =================================================================== --- sysutils/rdiff-backup/files/patch-setup.py +++ sysutils/rdiff-backup/files/patch-setup.py @@ -1,31 +1,17 @@ ---- setup.py.orig 2008-08-06 21:24:28.756047734 +0200 -+++ setup.py 2008-08-06 21:24:18.122056264 +0200 -@@ -58,6 +58,10 @@ - 'zipfile': None - }) +--- setup.py.orig 2020-05-06 08:49:32 UTC ++++ setup.py +@@ -136,7 +136,7 @@ class clean(distutils.command.clean.clean): -+LOCALBASE = os.getenv("LOCALBASE", "/usr/local") -+include_dirs = ["%s/include" % LOCALBASE] -+library_dirs = ["%s/lib" % LOCALBASE] -+ - setup(name="rdiff-backup", - version=version_string, - description="Local/remote mirroring+incremental backup", -@@ -68,14 +72,8 @@ - ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]), - Extension("rdiff_backup._librsync", - ["_librsyncmodule.c"], -- include_dirs=incdir_list, -- library_dirs=libdir_list, -+ include_dirs=include_dirs, -+ library_dirs=library_dirs, - libraries=libname, - extra_link_args=lflags_arg)], -- scripts = ['rdiff-backup', 'rdiff-backup-statistics'], -- data_files = [('share/man/man1', ['rdiff-backup.1', -- 'rdiff-backup-statistics.1']), -- ('share/doc/rdiff-backup-%s' % (version_string,), -- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])], -- **extra_options) -- -+ scripts = ['rdiff-backup', 'rdiff-backup-statistics']) + setup( + name="rdiff-backup", +- use_scm_version=True, ++ use_scm_version=False, + description="Backup and Restore utility, easy to use, efficient, locally and remotely usable", + long_description=""" + rdiff-backup is a simple backup tool which can be used locally and remotely, +@@ -222,5 +222,4 @@ setup( + 'build_py': build_py, + 'clean': clean, + }, +- setup_requires=['setuptools_scm'], + ) Index: sysutils/rdiff-backup/pkg-plist =================================================================== --- sysutils/rdiff-backup/pkg-plist +++ sysutils/rdiff-backup/pkg-plist @@ -1,112 +1,115 @@ bin/rdiff-backup bin/rdiff-backup-statistics +share/bash-completion/completions/rdiff-backup +share/man/man1/rdiff-backup-statistics.1.gz +share/man/man1/rdiff-backup.1.gz +%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/DEVELOP.md +%%PORTDOCS%%%%DOCSDIR%%/FAQ.md +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/Windows-DEVELOP.md +%%PORTDOCS%%%%DOCSDIR%%/Windows-README.md +%%PORTDOCS%%%%DOCSDIR%%/examples.md +%%PYTHON_SITELIBDIR%%/rdiff_backup-0.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/rdiff_backup-0.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/rdiff_backup-0.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/rdiff_backup-0.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/rdiff_backup/C.so %%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/Globals.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Globals.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Globals.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/Hardlink.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Hardlink.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Hardlink.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/Main.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Main.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Main.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/Rdiff.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Rdiff.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Rdiff.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/Security.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Security.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Security.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/SetConnections.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/SetConnections.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/SetConnections.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/TempFile.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/TempFile.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/TempFile.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/Time.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/Time.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/Time.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/__init__.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/__init__.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/__init__.pyo +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/FilenameMapping.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/FilenameMapping.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Globals.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Globals.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Hardlink.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Hardlink.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Main.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Main.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Rdiff.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Rdiff.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Security.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Security.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/SetConnections.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/SetConnections.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/TempFile.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/TempFile.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Time.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/Time.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/__init__.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/__init__.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/backup.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/backup.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/compare.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/compare.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/connection.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/connection.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/eas_acls.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/eas_acls.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/fs_abilities.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/fs_abilities.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/hash.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/hash.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/increment.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/increment.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/iterfile.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/iterfile.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/librsync.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/librsync.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/log.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/log.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/longname.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/longname.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/manage.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/manage.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/metadata.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/metadata.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/regress.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/regress.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/restore.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/restore.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/robust.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/robust.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/rorpiter.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/rorpiter.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/rpath.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/rpath.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/selection.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/selection.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/statistics.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/statistics.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/user_group.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/user_group.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/win_acls.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/rdiff_backup/__pycache__/win_acls.cpython-37.pyc %%PYTHON_SITELIBDIR%%/rdiff_backup/_librsync.so %%PYTHON_SITELIBDIR%%/rdiff_backup/backup.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/compare.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/eas_acls.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/hash.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/iterfile.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/iterfile.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/iterfile.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/lazy.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/lazy.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/lazy.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/librsync.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/librsync.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/librsync.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/log.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/longname.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/manage.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/metadata.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/metadata.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/metadata.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/regress.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/regress.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/regress.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/restore.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/restore.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/restore.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/robust.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/robust.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/robust.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/rorpiter.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/rorpiter.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/rorpiter.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/rpath.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/rpath.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/rpath.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/selection.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/selection.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/selection.pyo -%%PYTHON_SITELIBDIR%%/rdiff_backup/static.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/static.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/static.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/statistics.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo %%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py -%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc -%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo -man/man1/rdiff-backup-statistics.1.gz -man/man1/rdiff-backup.1.gz -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/FAQ.html -%%PORTDOCS%%%%DOCSDIR%%/README