<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a450881fc1846f506c69cd9c4f30747d5da988e5">https://github.com/macports/macports-ports/commit/a450881fc1846f506c69cd9c4f30747d5da988e5</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 a450881 xorg-server: Add modeline, fix whitespace. No substantive change.
</span>a450881 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a450881fc1846f506c69cd9c4f30747d5da988e5
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Fri Aug 24 18:24:08 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> xorg-server: Add modeline, fix whitespace. No substantive change.
</span>---
x11/xorg-server/Portfile | 194 ++++++++++++++++++++++++-----------------------
1 file changed, 98 insertions(+), 96 deletions(-)
<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 4beca30..21057f9 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;'>@@ -1,20 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name xorg-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name xorg-server
</span> conflicts xorg-server-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name xorg-server
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.18.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name xorg-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.18.4
</span> revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11 devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The X.org / Xquartz X server.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11 devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description The X.org / Xquartz X server.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin macosx
</span> 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+#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:#e0e0e0;'>@@ -24,47 +26,47 @@ distname ${my_name}-${version}
</span> checksums rmd160 6f58d84d3bbc59a773e6a2e1eafc208827a5923f \
sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span> use_parallel_build yes
# Yes, mesa is a *BUILD* dependency
depends_build \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-applewmproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-bigreqsproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-damageproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fixesproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fontsproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-glproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-inputproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-presentproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-randrproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-recordproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-renderproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-resourceproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-scrnsaverproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-videoproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xcmiscproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xextproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xineramaproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xtrans
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-applewmproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-bigreqsproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-damageproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-fixesproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-fontsproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-glproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-inputproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-presentproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-randrproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-recordproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-renderproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-resourceproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-scrnsaverproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-videoproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xcmiscproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xextproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xineramaproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xtrans
</span>
# This xinit dependency needs to be port: not bin: because we specifically run ${prefix}/bin/startx from bundle-main.c
depends_run \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xinit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:quartz-wm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fonts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xkeyboard-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xinit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:quartz-wm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-fonts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xkeyboard-config
</span>
depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/pixman-1.pc:libpixman \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxkbfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfont \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libAppleWM \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pixman-1.pc:libpixman \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxkbfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfont \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libAppleWM \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfixes
</span>
# https://trac.macports.org/ticket/36055
# https://llvm.org/bugs/show_bug.cgi?id=30346
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,33 +82,33 @@ platform darwin {
</span> }
configure.args --with-apple-applications-dir=${applications_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-bundle-id-prefix=org.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-dtrace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sha1=CommonCrypto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dri2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dri3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bundle-id-prefix=org.macports \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-dtrace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sha1=CommonCrypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dri2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dri3
</span>
# GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
configure.cppflags-append -I/usr/include -I${filespath}/dri -F${configure.sdkroot}/System/Library/Frameworks/ApplicationServices.framework/Frameworks
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- RAWCPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RAWCPP=${configure.cpp}
</span>
patchfiles \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-os-connection-Improve-abstraction-for-launchd-secure.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5003-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-os-connection-Improve-abstraction-for-launchd-secure.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1001-XQuartz-Hack-around-an-issue-that-can-occur-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5003-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,47 +118,47 @@ autoreconf.args -fvi
</span> build.args V=1
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-font-util
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-font-util
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s Xquartz ${destroot}${prefix}/bin/X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s Xquartz ${destroot}${prefix}/bin/X
</span> }
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xplugin.h is missing on Tiger and incorrect on Leopard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${filespath}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xplugin.h is missing on Tiger and incorrect on Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -I${filespath}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant docs description "Install extra documentation" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-sgml-doctools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOXYGEN="${prefix}/bin/doxygen" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP="${prefix}/bin/fop" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO="${prefix}/bin/xmlto"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-sgml-doctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOXYGEN="${prefix}/bin/doxygen" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP="${prefix}/bin/fop" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO="${prefix}/bin/xmlto"
</span> }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>