[148397] trunk/dports/x11/xorg-server

[jeremyhu at macports.org]

Revision: 148397
          https://trac.macports.org/changeset/148397
Author:   jeremyhu at macports.org
Date:     2016-05-07 00:52:00 -0700 (Sat, 07 May 2016)
Log Message:
-----------
xorg-server: Ensure CFBundleVersion is set

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- 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)
@@ -6,6 +6,7 @@
 conflicts       xorg-server-devel
 set my_name	xorg-server
 version		1.18.3
+revision        1
 categories	x11 devel
 license		X11
 maintainers	jeremyhu openmaintainer
@@ -93,6 +94,7 @@
 	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 \
 	5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
 	5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
 	5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \

Added: trunk/dports/x11/xorg-server/files/1000-XQuartz-Fix-default-CFBundleVersion.patch
===================================================================
--- 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)
@@ -0,0 +1,33 @@
+From eb7c1e7fb16338d8fc03a0bb0f9bb53eb99ee139 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160507/4b4ca1e9/attachment.html>