[106166] trunk/dports/x11/xinit/Portfile
aronnax at macports.org
aronnax at macports.org
Fri May 17 10:48:14 PDT 2013
Revision: 106166
https://trac.macports.org/changeset/106166
Author: aronnax at macports.org
Date: 2013-05-17 10:48:14 -0700 (Fri, 17 May 2013)
Log Message:
-----------
xinit: make LaunchAgent enabled by default
On OS X 10.6.3 and later, now the MacPorts X11.app will start automatically as needed. Fixes #39129.
Modified Paths:
--------------
trunk/dports/x11/xinit/Portfile
Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile 2013-05-17 17:15:39 UTC (rev 106165)
+++ trunk/dports/x11/xinit/Portfile 2013-05-17 17:48:14 UTC (rev 106166)
@@ -4,7 +4,7 @@
name xinit
version 1.3.2
-revision 4
+revision 5
categories x11
platforms darwin
maintainers jeremyhu openmaintainer
@@ -34,7 +34,6 @@
depends_lib port:xorg-libX11
patchfiles \
- disable-launchagent.patch \
0001-launchd-privileged_startx-Improved-error-resolution.patch \
0002-launchd-Don-t-provide-the-LaunchAgent-on-Tiger.patch \
0003-launchd-Provide-more-verbose-error-reporting-for-lau.patch \
@@ -44,6 +43,10 @@
0007-laucnhd-Silence-some-syslog-spam.patch \
0008-Annotate-Fatal-and-Fatalx-as-_X_NORETURN.patch
+if {[vercmp ${os.version} 10.3.0] < 0} {
+ patchfiles-append disable-launchagent.patch
+}
+
patch.pre_args -p1
use_autoreconf yes
@@ -71,25 +74,21 @@
if {${os.major} > 9} {
ui_msg "###############################################################################"
ui_msg "# To choose MacPorts' X11 as the default server, you must install xorg-server,"
- ui_msg "# load the LaunchAgent, logout, and log back in. To load the LaunchAgent,"
- ui_msg "# please execute the following:"
- if { ${os.major} < 10 } {
- ui_msg "# sudo launchctl load -w /Library/LaunchAgents/org.macports.startx.plist"
+ # OS X 10.6.3 was the first version whose native X11 allowed the modern socket naming
+ # for better X11 server coexistence, so we require it for installing the LaunchAgent
+ if {[vercmp ${os.version} 10.3.0] < 0} {
+ ui_msg "# load the LaunchAgent, logout, and log back in. To load the LaunchAgent,"
+ ui_msg "# please execute the following:"
ui_msg "# "
- ui_msg "# This will be required after every upgrade of the xinit port on Leopard"
- } else {
ui_msg "# launchctl load -w /Library/LaunchAgents/org.macports.startx.plist"
ui_msg "# "
ui_msg "# This will be remembered across port updates on Snow Leopard and later."
- }
-
- # OS X 10.6.3 was the first version whose native X11 allowed the modern socket naming
- # for better X11 server coexistence, so we require it for installing the LaunchAgent
- if {[vercmp ${os.version} 10.3.0] < 0} {
ui_msg "# "
ui_msg "# Note that doing so on your OS version may make the Apple-provided version"
ui_msg "# fail to launch."
+ } else {
+ ui_msg "# logout, and log back in."
}
ui_msg "###############################################################################"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130517/9795cfe9/attachment.html>
More information about the macports-changes
mailing list