[135028] trunk/dports/x11/xinit/Portfile

larryv at macports.org larryv at macports.org
Mon Apr 13 08:41:14 PDT 2015


Revision: 135028
          https://trac.macports.org/changeset/135028
Author:   larryv at macports.org
Date:     2015-04-13 08:41:14 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
xinit: Fix `notes` formatting

Modified Paths:
--------------
    trunk/dports/x11/xinit/Portfile

Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile	2015-04-13 15:07:36 UTC (rev 135027)
+++ trunk/dports/x11/xinit/Portfile	2015-04-13 15:41:14 UTC (rev 135028)
@@ -58,29 +58,27 @@
 
 platform darwin {
     if {${os.major} > 9} {
-        notes-append {
-                        To choose MacPorts' X11 as the default server, you must install xorg-server,\
-        }
+        # NOTE: The first line of the note sets the indentation that
+        # base trims. The rest of the note should use the same indent.
+        set note {
+                To use MacPorts' X11 as the default server, install\
+                xorg-server, }
 
         # 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} {
-            notes-append {
-                            load the LaunchAgent, logout, and log back in.  To load the LaunchAgent,
-                            please execute the following:
+            append note {load the LaunchAgent with the following\
+                command, log out, and log back in.
 
-                            launchctl load -w /Library/LaunchAgents/org.macports.startx.plist
+                    $ launchctl load -w /Library/LaunchAgents/org.macports.startx.plist
 
-                            This will be remembered across port updates on Snow Leopard and later.
-
-                            Note that doing so on your OS version may make the Apple-provided version
-                            fail to launch.\
-            }
+                This will be remembered across port updates on Snow\
+                Leopard and later. Note that doing this may cause the\
+                Apple-provided X11 to fail to launch.}
         } else {
-            notes-append {
-                            logout, and log back in.\
-            }
+            append note {log out, and log back in.}
         }
+        notes $note
     }
 
     post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150413/030c4e03/attachment.html>


More information about the macports-changes mailing list