<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d7bf90bfbf020cb4e362c4470f0c11df66a7744">https://github.com/macports/macports-ports/commit/3d7bf90bfbf020cb4e362c4470f0c11df66a7744</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 3d7bf90bfbf samba4: Use the right perl and python
</span>3d7bf90bfbf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d7bf90bfbf020cb4e362c4470f0c11df66a7744
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 30 07:10:49 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> samba4: Use the right perl and python
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> and add conflict with samba3.
</span>---
net/samba3/Portfile | 2 +-
net/samba4/Portfile | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba3/Portfile b/net/samba3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18b59fa2616..7006e810c0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/samba3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/samba3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup conflicts_build 1.0
name samba3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts talloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts samba4 talloc
</span> version 3.6.25
revision 3
categories net
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/samba4/Portfile b/net/samba4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce9774362f3..d274226e8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/samba4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/samba4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,9 @@
</span> PortSystem 1.0
name samba4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts samba3
</span> version 4.13.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,10 +51,10 @@ patchfiles-append patch-no-xsltproc.diff
</span>
configure.ldflags-append -v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append YAPP=${prefix}/bin/yapp-5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${python} ./buildtools/bin/waf configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PERL=${prefix}/bin/perl5.28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ YAPP=${prefix}/bin/yapp-5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ${configure.python} ./buildtools/bin/waf configure
</span> configure.args -C \
--enable-fhs \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,11 +65,11 @@ configure.args -C \
</span> --with-gpgme \
--disable-spotlight
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ${python} ./buildtools/bin/waf -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${configure.python} ./buildtools/bin/waf -v
</span> build.pre_args
build.env-append DESTDIR=${destroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.cmd ${python} ./buildtools/bin/waf -v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd ${configure.python} ./buildtools/bin/waf -v
</span> destroot.env-append DESTDIR=${destroot}
destroot.destdir
</pre><pre style='margin:0'>
</pre>