--- a/open-src/xserver/xorg/cli-nobanner.patch Mon May 09 10:12:33 2011 -0700
+++ b/open-src/xserver/xorg/cli-nobanner.patch Mon May 09 14:58:28 2011 -0700
@@ -18,11 +18,12 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c
-diff -Nurp -x '*~' -x '*.orig' os/utils.c os/utils.c
---- os/utils.c 2011-02-15 15:53:10.744333673 -0800
-+++ os/utils.c 2011-02-15 15:53:12.747548720 -0800
-@@ -772,6 +772,12 @@ ProcessCommandLine(int argc, char *argv[
+
+diff --git a/os/utils.c b/os/utils.c
+index 0cf4d37..55c0ecf 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -770,6 +770,12 @@ ProcessCommandLine(int argc, char *argv[])
nolock = TRUE;
}
#endif
@@ -32,6 +33,6 @@
+ /* ignore - just maintaining compatibility with Xsun CLI */
+ }
+#endif
- #ifndef NOLOGOHACK
- else if ( strcmp( argv[i], "-logo") == 0)
+ else if ( strcmp( argv[i], "-nolisten") == 0)
{
+ if(++i < argc) {