<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4445532876934c8383a32f42e2d05e46329853cf">https://github.com/macports/macports-ports/commit/4445532876934c8383a32f42e2d05e46329853cf</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 4445532  xorg-server{-1.18}: Avoid conflicts with distfiles location
</span>4445532 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4445532876934c8383a32f42e2d05e46329853cf
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 4 09:24:37 2019 +0100

<span style='display:block; white-space:pre;color:#404040;'>    xorg-server{-1.18}: Avoid conflicts with distfiles location
</span>---
 x11/xorg-server-1.18/Portfile  | 5 +----
 x11/xorg-server-devel/Portfile | 1 -
 x11/xorg-server/Portfile       | 5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-1.18/Portfile b/x11/xorg-server-1.18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27faaf7..49a0251 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-1.18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-1.18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,6 @@ PortGroup       compiler_blacklist_versions 1.0
</span> 
 name            xorg-server-1.18
 conflicts       xorg-server xorg-server-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name     xorg-server
</span> version         1.18.4
 revision        0
 categories      x11 devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,12 +15,10 @@ homepage        https://www.x.org
</span> platforms       darwin macosx
 long_description The X.org X server allows you to run X11 applications on your computer.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#master_sites   http://xquartz.macosforge.org/downloads/src
</span> master_sites    http://xorg.freedesktop.org/archive/individual/xserver/
 #master_sites    xorg:individual/xserver/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir     ${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname        ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname        xorg-server-${version}
</span> 
 checksums       rmd160  6f58d84d3bbc59a773e6a2e1eafc208827a5923f \
                 sha256  278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b828ab..3ab0a04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,6 @@ PortGroup       compiler_blacklist_versions 1.0
</span> 
 name            xorg-server-devel
 conflicts       xorg-server xorg-server-1.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name     xorg-server
</span> version         1.20.4
 categories      x11 devel
 license         X11
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7aaa88f..c5fb95b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,6 @@ PortGroup       compiler_blacklist_versions 1.0
</span> 
 name            xorg-server
 conflicts       xorg-server-devel xorg-server-1.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name     xorg-server
</span> version         1.20.4
 revision        0
 categories      x11 devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,12 +15,10 @@ homepage        https://www.x.org
</span> platforms       darwin macosx
 long_description The X.org X server allows you to run X11 applications on your computer.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#master_sites   http://xquartz.macosforge.org/downloads/src
</span> master_sites    http://xorg.freedesktop.org/archive/individual/xserver/
 #master_sites    xorg:individual/xserver/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir     ${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname        ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname        xorg-server-${version}
</span> 
 checksums       rmd160  cad624e1d1ada0b46a76a1e5de6b12446f7c6dda \
                 sha256  fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee \
</pre><pre style='margin:0'>

</pre>