<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e1728c7b4c6db58af6e02ff89063ca60673da5bc">https://github.com/macports/macports-ports/commit/e1728c7b4c6db58af6e02ff89063ca60673da5bc</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 e1728c7b4c6 xorg-server-legacy: Add an X11 server port that will be maintained for Tiger through Mountain Lion hosts
</span>e1728c7b4c6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e1728c7b4c6db58af6e02ff89063ca60673da5bc
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Mon Mar 15 14:58:15 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> xorg-server-legacy: Add an X11 server port that will be maintained for Tiger through Mountain Lion hosts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
x11/xorg-server-1.18/Portfile | 2 +-
x11/xorg-server-devel/Portfile | 2 +-
.../Portfile | 23 +++++++++++-----------
.../2001-enable-automake-subdir-objects.patch | 11 +++++++++++
...-patch-xorg-server-dont-redefine-GLXscreen.diff | 18 +++++++++++++++++
x11/xorg-server/Portfile | 2 +-
6 files changed, 43 insertions(+), 15 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 0f4868d9394..2ce085dd300 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name xorg-server-1.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xorg-server xorg-server-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xorg-server-legacy xorg-server xorg-server-devel
</span> version 1.18.4
revision 0
categories x11 devel
<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 c2efe70fd80..a5d54a0f37d 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;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> github.setup XQuartz xorg-server 2630bc4040843ac000c397f1718844cf3e1c6472
name xorg-server-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xorg-server xorg-server-1.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xorg-server-legacy xorg-server xorg-server-1.18
</span> version 1.20.99.1
revision 0
categories x11 devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-legacy/Portfile
</span>similarity index 86%
copy from x11/xorg-server-devel/Portfile
copy to x11/xorg-server-legacy/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index c2efe70fd80..265c9dff244 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-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup XQuartz xorg-server 2630bc4040843ac000c397f1718844cf3e1c6472
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup XQuartz xorg-server b8c9877a416233985755393d6fffb481a93f7011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name xorg-server-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xorg-server xorg-server-1.18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.20.99.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name xorg-server-legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xorg-server-1.18 xorg-server xorg-server-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20.10
</span> revision 0
categories x11 devel
license X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ 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;'>-checksums rmd160 c3fea4d4a1711b2c705fee3a0156ad00a9b7e1fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b3882e4f9a60d268bda7c17841619e255492b2bae0de06fa43affa9a95b5b30f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5841795
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bd274d43ced76375d1fce696411260cc848976be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 71770e90f1c3da1ecdbe53b182c5e6c5db31f333bc44eccfe7ead78af974b9e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5843464
</span>
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,10 +102,9 @@ post-destroot {
</span> }
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$name requires macOS 10.9 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$name is intended for OS X 10.4 through 10.8 and has known issues running on macOS 10.15 and later."
</span> error "unsupported OS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +129,7 @@ variant docs description "Install extra documentation" {
</span> --without-doxygen \
--without-fop \
--without-xmlto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs
</span>
configure.args-append \
--with-doxygen \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-legacy/files/2001-enable-automake-subdir-objects.patch b/x11/xorg-server-legacy/files/2001-enable-automake-subdir-objects.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7407b136723
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-legacy/files/2001-enable-automake-subdir-objects.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RELEASE_NAME="Chestnut Tortelloni"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_SRCDIR([Makefile.am])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_MACRO_DIR([m4])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AM_INIT_AUTOMAKE([foreign dist-bzip2])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_USE_SYSTEM_EXTENSIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-legacy/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff b/x11/xorg-server-legacy/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..19c8878adae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-legacy/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git xorg-server-devel-1.20.3/include/glx_extinit.h.old xorg-server-devel-1.20.3/include/glx_extinit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 07f3cc8..56a66e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xorg-server-devel-1.20.3/include/glx_extinit.h.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xorg-server-devel-1.20.3/include/glx_extinit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* XXX this comment no longer makes sense i think */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GLXEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __GLXprovider __GLXprovider;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _GLX_screens_h_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* this identical struct is also defined in glx/glxscreens.h and this causes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* redefinition errors on compilers that don't support C11 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __GLXscreen __GLXscreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct __GLXprovider {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __GLXscreen *(*screenProbe) (ScreenPtr pScreen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *name;
</span><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 f2e988378a6..43fe880c81a 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name xorg-server
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xorg-server-devel xorg-server-1.18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xorg-server-legacy xorg-server-devel xorg-server-1.18
</span> version 1.20.10
revision 0
categories x11 devel
</pre><pre style='margin:0'>
</pre>