<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148397] trunk/dports/x11/xorg-server</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148397">148397</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-05-07 00:52:00 -0700 (Sat, 07 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Ensure CFBundleVersion is set</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverPortfile">trunk/dports/x11/xorg-server/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles1000XQuartzFixdefaultCFBundleVersionpatch">trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/Portfile (148396 => 148397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2016-05-07 07:24:09 UTC (rev 148396)
+++ trunk/dports/x11/xorg-server/Portfile 2016-05-07 07:52:00 UTC (rev 148397)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> conflicts xorg-server-devel
</span><span class="cx"> set my_name xorg-server
</span><span class="cx"> version 1.18.3
</span><ins>+revision 1
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -93,6 +94,7 @@
</span><span class="cx"> 0004-XQuartz-Add-with-sparkle-feed-url-configure-option.patch \
</span><span class="cx"> 0005-XQuartz-Add-with-bundle-version-and-with-bundle-vers.patch \
</span><span class="cx"> 0006-XQuartz-Update-copyright-years.patch \
</span><ins>+ 1000-XQuartz-Fix-default-CFBundleVersion.patch \
</ins><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
</span><span class="cx"> 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles1000XQuartzFixdefaultCFBundleVersionpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch (0 => 148397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch 2016-05-07 07:52:00 UTC (rev 148397)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+From eb7c1e7fb16338d8fc03a0bb0f9bb53eb99ee139 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 7 May 2016 00:43:33 -0700
+Subject: [PATCH] XQuartz: Fix default CFBundleVersion
+
+m4/shell variable name collision broke the case when the configure option was not used
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ configure.ac | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2633f4e..cf13123 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -559,11 +559,10 @@ AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREF
+ [ BUNDLE_ID_PREFIX="${withval}" ])
+ AC_SUBST([BUNDLE_ID_PREFIX])
+ AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers])
+-DEFAULT_BUNDLE_VERSION=`echo ${PACKAGE_VERSION} | cut -f1-3 -d.`
+-m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d.]))
++m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d. | tr -d '\n']))
+ AC_ARG_WITH(bundle-version, AS_HELP_STRING([--with-bundle-version=VERSION], [Version to use for X11.app's CFBundleVersion (default: ]DEFAULT_BUNDLE_VERSION[)]),
+ [ BUNDLE_VERSION="${withval}" ],
+- [ BUNDLE_VERSION="${DEFAULT_BUNDLE_VERSION}" ])
++ [ BUNDLE_VERSION="DEFAULT_BUNDLE_VERSION" ])
+ AC_SUBST([BUNDLE_VERSION])
+ AC_ARG_WITH(bundle-version-string, AS_HELP_STRING([--with-bundle-version-string=VERSION], [Version to use for X11.app's CFBundleShortVersionString (default: ]AC_PACKAGE_VERSION[)]),
+ [ BUNDLE_VERSION_STRING="${withval}" ],
+--
+2.8.2
+
</ins></span></pre>
</div>
</div>
</body>
</html>