<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dae77614118b02e7f64fecd606e311ab53228aac">https://github.com/macports/macports-ports/commit/dae77614118b02e7f64fecd606e311ab53228aac</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dae77614118 rdiff-backup: update to 2.2.0, add py311 subport
</span>dae77614118 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dae77614118b02e7f64fecd606e311ab53228aac
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Thu Dec 22 09:55:34 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> rdiff-backup: update to 2.2.0, add py311 subport
</span>---
python/rdiff-backup/Portfile | 35 ++++++++---------
.../rdiff-backup/files/patch-rdiff-backup.1.diff | 11 ------
python/rdiff-backup/files/patch-setup.py.diff | 45 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/rdiff-backup/Portfile b/python/rdiff-backup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec801b62cdb..69996bc6524 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/rdiff-backup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/rdiff-backup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup rdiff-backup rdiff-backup 2.0.5 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2963cd82779472909f5fd00423bbae0988dd256a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2bb7837b4a9712b6efaebfa7da8ed6348ffcb02fcecff0e19d8fff732e933b87 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 456115
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup rdiff-backup rdiff-backup 2.2.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 22552cd92247b4f7c327c9fc75423b8f96251579 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 951779e051f5f0a1da8c6608e4aa87e60649751c8f291e388f6292577eb1f494 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 903121
</span>
categories-append net sysutils
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,21 +17,22 @@ license GPL-2+
</span>
description rdiff-backup backs up one directory to another, possibly \
over a network.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
homepage https://rdiff-backup.net/
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python38 python39 python310 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python37 python39 python310 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python37 python38 python310 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python37 python38 python39 description {Use Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 python39 python310 python311 description {Use Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python37 python39 python310 python311 description {Use Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python37 python38 python310 python311 description {Use Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python37 python38 python39 python311 description {Use Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python37 python38 python39 python310 description {Use Python 3.11} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python37] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python311]} {
</span> default_variants +python310
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach pv {310 39 38 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv {311 310 39 38 37} {
</span> if {[variant_isset python${pv}]} {
python.default_version ${pv}
break
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,17 +40,15 @@ foreach pv {310 39 38 37} {
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:asciidoctor \
</span> port:py${python.version}-setuptools_scm \
port:py${python.version}-wheel
depends_lib-append port:librsync \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-xattr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-xattr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsync
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-rdiff-backup.1.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/docs/rdiff-backup.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-setup.py.diff
</span>
build.env "LIBRSYNC_DIR=${prefix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/rdiff-backup/files/patch-rdiff-backup.1.diff b/python/rdiff-backup/files/patch-rdiff-backup.1.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a2788cb6b30..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/rdiff-backup/files/patch-rdiff-backup.1.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- docs/rdiff-backup.1.orig 2010-05-08 19:40:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/rdiff-backup.1 2010-05-08 19:43:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Finally, this man page is intended more as a precise description of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the behavior and syntax of rdiff-backup. New users may want to check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--out the examples.html file included in the rdiff-backup distribution.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+out @PREFIX@/share/doc/rdiff-backup/examples.html.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .SH OPTIONS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .TP
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/rdiff-backup/files/patch-setup.py.diff b/python/rdiff-backup/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3c8404fc9ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/rdiff-backup/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-12-18 02:19:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-12-22 09:41:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,24 +42,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if LFLAGS or LIBS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lflags_arg = LFLAGS + LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if LIBRSYNC_DIR and len(sys.argv) > 1: # should only be under Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- incdir_list = [os.path.join(LIBRSYNC_DIR, "include")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libdir_list = [os.path.join(LIBRSYNC_DIR, "lib")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rsyncdll_src = os.path.join(LIBRSYNC_DIR, "bin", "rsync.dll")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rsyncdll_dst = os.path.join("src", "rdiff_backup", "rsync.dll")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # rather ugly workaround, but it should be good enough
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "clean" in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if os.path.exists(rsyncdll_dst) and "--all" in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f"removing {rsyncdll_dst}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "--dry-run" not in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.remove(rsyncdll_dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif ("--version" not in sys.argv and "-V" not in sys.argv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- and "--help" not in sys.argv):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (not os.path.exists(rsyncdll_dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- or not filecmp.cmp(rsyncdll_src, rsyncdll_dst)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(f"copying {rsyncdll_src} -> {rsyncdll_dst}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if "--dry-run" not in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- shutil.copyfile(rsyncdll_src, rsyncdll_dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if LIBRSYNC_DIR and len(sys.argv) > 1: # should only be under Windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# incdir_list = [os.path.join(LIBRSYNC_DIR, "include")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# libdir_list = [os.path.join(LIBRSYNC_DIR, "lib")]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# rsyncdll_src = os.path.join(LIBRSYNC_DIR, "bin", "rsync.dll")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# rsyncdll_dst = os.path.join("src", "rdiff_backup", "rsync.dll")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # rather ugly workaround, but it should be good enough
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if "clean" in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if os.path.exists(rsyncdll_dst) and "--all" in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# print(f"removing {rsyncdll_dst}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if "--dry-run" not in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# os.remove(rsyncdll_dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ("--version" not in sys.argv and "-V" not in sys.argv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# and "--help" not in sys.argv):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if (not os.path.exists(rsyncdll_dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# or not filecmp.cmp(rsyncdll_src, rsyncdll_dst)):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# print(f"copying {rsyncdll_src} -> {rsyncdll_dst}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if "--dry-run" not in sys.argv:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# shutil.copyfile(rsyncdll_src, rsyncdll_dst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if "-lrsync" in LIBS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libname = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>