Ticket #39129: patch-Portfile.diff

Portfile

@@ -4 +4 @@
 
 name                xinit
 version             1.3.2
-revision            4
+revision            5
 categories          x11
 platforms           darwin
 maintainers         jeremyhu openmaintainer
@@ -34 +34 @@
 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 +43 @@
         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 +74 @@
         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 "###############################################################################"