<!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>[152441] 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/152441">152441</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-09-09 01:30:48 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Bump to 1.18.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverPortfile">trunk/dports/x11/xorg-server/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles0001XQuartzRemovewithlaunchdidprefixpatch">trunk/dports/x11/xorg-server/files/0001-XQuartz-Remove-with-launchd-id-prefix.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0002XQuartzFixthehelptextforwithbundleidprefixpatch">trunk/dports/x11/xorg-server/files/0002-XQuartz-Fix-the-help-text-for-with-bundle-id-prefix.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0003XQuartzUpdatereleasefeedURLtousenewhttpsURLpatch">trunk/dports/x11/xorg-server/files/0003-XQuartz-Update-release-feed-URL-to-use-new-https-URL.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0004XQuartzAddwithsparklefeedurlconfigureoptionpatch">trunk/dports/x11/xorg-server/files/0004-XQuartz-Add-with-sparkle-feed-url-configure-option.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0005XQuartzAddwithbundleversionandwithbundleverspatch">trunk/dports/x11/xorg-server/files/0005-XQuartz-Add-with-bundle-version-and-with-bundle-vers.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0006XQuartzUpdatecopyrightyearspatch">trunk/dports/x11/xorg-server/files/0006-XQuartz-Update-copyright-years.patch</a></li>
<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 (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/Portfile 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> name xorg-server
</span><span class="cx"> conflicts xorg-server-devel
</span><span class="cx"> set my_name xorg-server
</span><del>-version 1.18.3
-revision 1
</del><ins>+version 1.18.4
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -22,8 +21,8 @@
</span><span class="cx"> dist_subdir ${my_name}
</span><span class="cx"> distname ${my_name}-${version}
</span><span class="cx">
</span><del>-checksums rmd160 a09617c34be796aacd6edcbe470179b2abdcb188 \
- sha256 ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd
</del><ins>+checksums rmd160 6f58d84d3bbc59a773e6a2e1eafc208827a5923f \
+ sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -88,13 +87,6 @@
</span><span class="cx"> RAWCPP=${configure.cpp}
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><del>- 0001-XQuartz-Remove-with-launchd-id-prefix.patch \
- 0002-XQuartz-Fix-the-help-text-for-with-bundle-id-prefix.patch \
- 0003-XQuartz-Update-release-feed-URL-to-use-new-https-URL.patch \
- 0004-XQuartz-Add-with-sparkle-feed-url-configure-option.patch \
- 0005-XQuartz-Add-with-bundle-version-and-with-bundle-vers.patch \
- 0006-XQuartz-Update-copyright-years.patch \
- 1000-XQuartz-Fix-default-CFBundleVersion.patch \
</del><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="trunkdportsx11xorgserverfiles0001XQuartzRemovewithlaunchdidprefixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0001-XQuartz-Remove-with-launchd-id-prefix.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Remove-with-launchd-id-prefix.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Remove-with-launchd-id-prefix.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-From 3600f8600f1a876409c3a7f2b29f036156b2c7c6 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 May 2016 23:16:46 -0700
-Subject: [PATCH 1/6] XQuartz: Remove --with-launchd-id-prefix
-
-It's been deprecated for years.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 214a66b661dcb56ebb9776e34049753f65c7510a)
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 77cf234..c7b2258 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -555,9 +555,6 @@ AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name
- [ APPLE_APPLICATION_NAME="${withval}" ],
- [ APPLE_APPLICATION_NAME="X11" ])
- AC_SUBST([APPLE_APPLICATION_NAME])
--AC_ARG_WITH(launchd-id-prefix, AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Deprecated: Use --with-bundle-id-prefix.]),
-- [ BUNDLE_ID_PREFIX="${withval}" ],
-- [ BUNDLE_ID_PREFIX="org.x" ])
- AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=PATH], [Prefix to use for bundle identifiers (default: org.x)]),
- [ BUNDLE_ID_PREFIX="${withval}" ])
- AC_SUBST([BUNDLE_ID_PREFIX])
---
-2.8.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0002XQuartzFixthehelptextforwithbundleidprefixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0002-XQuartz-Fix-the-help-text-for-with-bundle-id-prefix.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0002-XQuartz-Fix-the-help-text-for-with-bundle-id-prefix.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-Fix-the-help-text-for-with-bundle-id-prefix.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-From ab5f69e5419b34f21cfd30d38374d14103a88f40 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 May 2016 23:24:44 -0700
-Subject: [PATCH 2/6] XQuartz: Fix the help text for --with-bundle-id-prefix
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 16d6733c63727d910eb516d7f6950f4675281f2d)
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c7b2258..857a181 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -555,7 +555,7 @@ AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name
- [ APPLE_APPLICATION_NAME="${withval}" ],
- [ APPLE_APPLICATION_NAME="X11" ])
- AC_SUBST([APPLE_APPLICATION_NAME])
--AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=PATH], [Prefix to use for bundle identifiers (default: org.x)]),
-+AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREFIX], [Prefix to use for bundle identifiers (default: org.x)]),
- [ BUNDLE_ID_PREFIX="${withval}" ])
- AC_SUBST([BUNDLE_ID_PREFIX])
- AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers])
---
-2.8.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0003XQuartzUpdatereleasefeedURLtousenewhttpsURLpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0003-XQuartz-Update-release-feed-URL-to-use-new-https-URL.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Update-release-feed-URL-to-use-new-https-URL.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Update-release-feed-URL-to-use-new-https-URL.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-From a1915ad14d89bdcd0f2a6607d6d1cb8f90201158 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 May 2016 23:14:24 -0700
-Subject: [PATCH 3/6] XQuartz: Update release feed URL to use new https URL
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 299b01eabf827a7435b5d6004d50637ac710bbc7)
----
- hw/xquartz/bundle/Info.plist.cpp | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
-index 06e33f8..d98eaa6 100644
---- a/hw/xquartz/bundle/Info.plist.cpp
-+++ b/hw/xquartz/bundle/Info.plist.cpp
-@@ -34,20 +34,7 @@
- <key>SUPublicDSAKeyFile</key>
- <string>sparkle.pem</string>
- <key>SUFeedURL</key>
-- <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
-- <key>NSAppTransportSecurity</key>
-- <dict>
-- <key>NSExceptionDomains</key>
-- <dict>
-- <key>macosforge.org</key>
-- <dict>
-- <key>NSIncludesSubdomains</key>
-- <true/>
-- <key>NSExceptionAllowsInsecureHTTPLoads</key>
-- <true/>
-- </dict>
-- </dict>
-- </dict>
-+ <string>https://www.xquartz.org/releases/sparkle/release.xml</string>
- #endif
- <key>LSApplicationCategoryType</key>
- <string>public.app-category.utilities</string>
---
-2.8.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0004XQuartzAddwithsparklefeedurlconfigureoptionpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0004-XQuartz-Add-with-sparkle-feed-url-configure-option.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0004-XQuartz-Add-with-sparkle-feed-url-configure-option.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/0004-XQuartz-Add-with-sparkle-feed-url-configure-option.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-From bab72d3905bdafe4815ab1dc5509988c8e467769 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 May 2016 23:21:38 -0700
-Subject: [PATCH 4/6] XQuartz: Add --with-sparkle-feed-url configure option
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit c1614928c10a8f8400f99acfd1b7f96d503af7ec)
----
- configure.ac | 4 ++++
- hw/xquartz/bundle/Info.plist.cpp | 2 +-
- hw/xquartz/bundle/Makefile.am | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 857a181..2ec734c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -563,6 +563,10 @@ AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11
- [ XQUARTZ_SPARKLE="${enableval}" ],
- [ XQUARTZ_SPARKLE="no" ])
- AC_SUBST([XQUARTZ_SPARKLE])
-+AC_ARG_WITH(sparkle-feed-url, AS_HELP_STRING([--with-sparkle-feed-url=URL], [URL for the Sparkle feed (default: https://www.xquartz.org/releases/sparkle/release.xml)]),
-+ [ XQUARTZ_SPARKLE_FEED_URL="${withval}" ],
-+ [ XQUARTZ_SPARKLE_FEED_URL="https://www.xquartz.org/releases/sparkle/release.xml" ])
-+AC_SUBST([XQUARTZ_SPARKLE_FEED_URL])
- AC_ARG_ENABLE(visibility, AS_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
- [SYMBOL_VISIBILITY=$enableval],
- [SYMBOL_VISIBILITY=auto])
-diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
-index d98eaa6..8d543a1 100644
---- a/hw/xquartz/bundle/Info.plist.cpp
-+++ b/hw/xquartz/bundle/Info.plist.cpp
-@@ -34,7 +34,7 @@
- <key>SUPublicDSAKeyFile</key>
- <string>sparkle.pem</string>
- <key>SUFeedURL</key>
-- <string>https://www.xquartz.org/releases/sparkle/release.xml</string>
-+ <string>XQUARTZ_SPARKLE_FEED_URL</string>
- #endif
- <key>LSApplicationCategoryType</key>
- <string>public.app-category.utilities</string>
-diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
-index 0740752..ac293db 100644
---- a/hw/xquartz/bundle/Makefile.am
-+++ b/hw/xquartz/bundle/Makefile.am
-@@ -5,7 +5,7 @@ CPP_FILES_FLAGS = \
- -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)"
-
- if XQUARTZ_SPARKLE
--CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE
-+CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE -DXQUARTZ_SPARKLE_FEED_URL="$(XQUARTZ_SPARKLE_FEED_URL)"
- endif
-
- install-data-hook:
---
-2.8.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0005XQuartzAddwithbundleversionandwithbundleverspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0005-XQuartz-Add-with-bundle-version-and-with-bundle-vers.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0005-XQuartz-Add-with-bundle-version-and-with-bundle-vers.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/0005-XQuartz-Add-with-bundle-version-and-with-bundle-vers.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,70 +0,0 @@
</span><del>-From 73987379d73cd6ef2701dad7e3027f9363cb81b4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 May 2016 23:42:34 -0700
-Subject: [PATCH 5/6] XQuartz: Add --with-bundle-version and
- --with-bundle-version-string configure options
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit d6ba4f2c52da150a9a92bdb00efe7902d17033bd)
----
- configure.ac | 10 ++++++++++
- hw/xquartz/bundle/Info.plist.cpp | 4 ++--
- hw/xquartz/bundle/Makefile.am | 4 +++-
- 3 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2ec734c..a3c6382 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -559,6 +559,16 @@ 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.]))
-+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}" ])
-+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}" ],
-+ [ BUNDLE_VERSION_STRING="${PACKAGE_VERSION}" ])
-+AC_SUBST([BUNDLE_VERSION_STRING])
- AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]),
- [ XQUARTZ_SPARKLE="${enableval}" ],
- [ XQUARTZ_SPARKLE="no" ])
-diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
-index 8d543a1..f6a72af 100644
---- a/hw/xquartz/bundle/Info.plist.cpp
-+++ b/hw/xquartz/bundle/Info.plist.cpp
-@@ -19,9 +19,9 @@
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
-- <string>2.7.7</string>
-+ <string>BUNDLE_VERSION_STRING</string>
- <key>CFBundleVersion</key>
-- <string>2.7.7</string>
-+ <string>BUNDLE_VERSION</string>
- <key>CFBundleSignature</key>
- <string>x11a</string>
- <key>CSResourcesFileMapped</key>
-diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
-index ac293db..424a747 100644
---- a/hw/xquartz/bundle/Makefile.am
-+++ b/hw/xquartz/bundle/Makefile.am
-@@ -1,8 +1,10 @@
- include cpprules.in
-
- CPP_FILES_FLAGS = \
-+ -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" \
- -DBUNDLE_ID_PREFIX="$(BUNDLE_ID_PREFIX)" \
-- -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)"
-+ -DBUNDLE_VERSION="$(BUNDLE_VERSION)" \
-+ -DBUNDLE_VERSION_STRING="$(BUNDLE_VERSION_STRING)"
-
- if XQUARTZ_SPARKLE
- CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE -DXQUARTZ_SPARKLE_FEED_URL="$(XQUARTZ_SPARKLE_FEED_URL)"
---
-2.8.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0006XQuartzUpdatecopyrightyearspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0006-XQuartz-Update-copyright-years.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0006-XQuartz-Update-copyright-years.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/0006-XQuartz-Update-copyright-years.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-From 1a81f2a51955e5c8a9d1d80cc008e2927ddd0123 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 3 May 2016 23:43:06 -0700
-Subject: [PATCH 6/6] XQuartz: Update copyright years
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 059d5ef30490233f410ca87084c7697b87e5b05e)
----
- hw/xquartz/bundle/Info.plist.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
-index f6a72af..3742353 100644
---- a/hw/xquartz/bundle/Info.plist.cpp
-+++ b/hw/xquartz/bundle/Info.plist.cpp
-@@ -39,9 +39,9 @@
- <key>LSApplicationCategoryType</key>
- <string>public.app-category.utilities</string>
- <key>NSHumanReadableCopyright</key>
-- <string>© 2003-2013 Apple Inc.
-+ <string>© 2003-2016 Apple Inc.
- © 2003 XFree86 Project, Inc.
--© 2003-2013 X.org Foundation, Inc.
-+© 2003-2016 X.org Foundation, Inc.
- </string>
- <key>NSMainNibFile</key>
- <string>main</string>
---
-2.8.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles1000XQuartzFixdefaultCFBundleVersionpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch (152440 => 152441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch 2016-09-09 04:28:04 UTC (rev 152440)
+++ trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch 2016-09-09 08:30:48 UTC (rev 152441)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-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
-
</del></span></pre>
</div>
</div>
</body>
</html>