aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/py-rdiff-backup/Makefile35
-rw-r--r--sysutils/py-rdiff-backup/distinfo3
-rw-r--r--sysutils/py-rdiff-backup/pkg-descr (renamed from sysutils/rdiff-backup/pkg-descr)0
-rw-r--r--sysutils/rdiff-backup/Makefile43
-rw-r--r--sysutils/rdiff-backup/distinfo2
-rw-r--r--sysutils/rdiff-backup/files/patch-__librsyncmodule.c16
-rw-r--r--sysutils/rdiff-backup/files/patch-setup.py31
-rw-r--r--sysutils/rdiff-backup/pkg-plist112
10 files changed, 40 insertions, 205 deletions
diff --git a/MOVED b/MOVED
index 42a5bf5895bf..2f17d6417d65 100644
--- a/MOVED
+++ b/MOVED
@@ -15011,3 +15011,4 @@ net-p2p/parity-ethereum|net-p2p/openethereum|2020-05-13|Renamed upstream for tra
net-im/linux-telegram-desktop|net-im/telegram-desktop|2020-05-13|Has expired: Broken for more than 6 months, use native version
devel/libphutil||2020-05-15|Has expired: Upstream merged functionality into downstream projects.
print/frescobaldi|print/py-frescobaldi|2020-05-16|Renamed to comply with Python Ports Policy
+sysutils/rdiff-backup|sysutils/py-rdiff-backup@py37|2020-05-16|Renamed comply with Python Ports Policy and flavored
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 17cb2a3224cf..cebae349e0b6 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -991,6 +991,7 @@
SUBDIR += py-pyznap
SUBDIR += py-queuelib
SUBDIR += py-ranger
+ SUBDIR += py-rdiff-backup
SUBDIR += py-salt
SUBDIR += py-scandir
SUBDIR += py-scarab
@@ -1029,7 +1030,6 @@
SUBDIR += rclean
SUBDIR += rcm
SUBDIR += rdate
- SUBDIR += rdiff-backup
SUBDIR += rdup
SUBDIR += read-edid
SUBDIR += recoverdm
diff --git a/sysutils/py-rdiff-backup/Makefile b/sysutils/py-rdiff-backup/Makefile
new file mode 100644
index 000000000000..02166bf3ba86
--- /dev/null
+++ b/sysutils/py-rdiff-backup/Makefile
@@ -0,0 +1,35 @@
+# Created by: Gerhard Häring <gh@ghaering.de>
+# $FreeBSD$
+
+PORTNAME= rdiff-backup
+DISTVERSION= 2.0.0
+CATEGORIES= sysutils python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= uzsolt@uzsolt.hu
+COMMENT= Easy to use and efficient backup and restore utility
+
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
+LIB_DEPENDS= librsync.so:net/librsync
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
+
+USES= localbase:ldflags python:3.5+
+USE_LDCONFIG= yes
+USE_PYTHON= autoplist concurrent distutils
+
+CONFLICTS= rdiff-backup-devel-[0-9]* rdiff-backup-1.0*
+
+PORTSCOUT= limitw:1,even
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rdiff_backup/_librsync.so
+ ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rdiff_backup/C.so
+
+do-test:
+ cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox
+
+.include <bsd.port.mk>
diff --git a/sysutils/py-rdiff-backup/distinfo b/sysutils/py-rdiff-backup/distinfo
new file mode 100644
index 000000000000..5ea1a0e3a762
--- /dev/null
+++ b/sysutils/py-rdiff-backup/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1589335376
+SHA256 (rdiff-backup-2.0.0.tar.gz) = 1ce16abd4232d49212654572bf1fae4cdbc94e4056d96ef506feeeb87c14a0c3
+SIZE (rdiff-backup-2.0.0.tar.gz) = 408363
diff --git a/sysutils/rdiff-backup/pkg-descr b/sysutils/py-rdiff-backup/pkg-descr
index 9fafa799da3f..9fafa799da3f 100644
--- a/sysutils/rdiff-backup/pkg-descr
+++ b/sysutils/py-rdiff-backup/pkg-descr
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
deleted file mode 100644
index 6b4459d611c7..000000000000
--- a/sysutils/rdiff-backup/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Gerhard Häring <gh@ghaering.de>
-# $FreeBSD$
-
-PORTNAME= rdiff-backup
-PORTVERSION= 1.2.8
-PORTREVISION= 3
-PORTEPOCH= 1
-CATEGORIES= sysutils
-MASTER_SITES= SAVANNAH \
- LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX}
-
-MAINTAINER= uzsolt@uzsolt.hu
-COMMENT= Local/remote mirroring+incremental backup
-
-LICENSE= GPLv2
-
-DEPRECATED= Uses deprecated version of python
-EXPIRATION_DATE= 2020-09-15
-
-LIB_DEPENDS= librsync.so:net/librsync
-
-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
-
-.include <bsd.port.mk>
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
deleted file mode 100644
index 4aba5732e717..000000000000
--- a/sysutils/rdiff-backup/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rdiff-backup-1.2.8.tar.gz) = 0d91a85b40949116fa8aaf15da165c34a2d15449b3cbe01c8026391310ac95db
-SIZE (rdiff-backup-1.2.8.tar.gz) = 196526
diff --git a/sysutils/rdiff-backup/files/patch-__librsyncmodule.c b/sysutils/rdiff-backup/files/patch-__librsyncmodule.c
deleted file mode 100644
index b47807dc5d57..000000000000
--- a/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;
- }
-
diff --git a/sysutils/rdiff-backup/files/patch-setup.py b/sysutils/rdiff-backup/files/patch-setup.py
deleted file mode 100644
index 8feddf8522f0..000000000000
--- a/sysutils/rdiff-backup/files/patch-setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
- })
-
-+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'])
diff --git a/sysutils/rdiff-backup/pkg-plist b/sysutils/rdiff-backup/pkg-plist
deleted file mode 100644
index 9ae3f9e886bb..000000000000
--- a/sysutils/rdiff-backup/pkg-plist
+++ /dev/null
@@ -1,112 +0,0 @@
-bin/rdiff-backup
-bin/rdiff-backup-statistics
-%%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/_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