Update to 1.0.8:

Adam Jackson (1):
      xinit 1.0.8

David Nusinow (1):
      Unbreak installs on non-launchd systems

James Cloos (1):
      Add missing PHONY line for automatic ChangeLog generation

Jeremy Huddleston (19):
      Added some support for Xquartz on OS-X.
      Added Apple launchd support
      Changed x11-exec to actually start X11.app.  X11.app will be responsible for calling xinit.
      OS-X: Added argv[0] hack for finding Xquartz UI and icon as well as claiming its dock icon
      Added support for OS-X preferences to disable tcp/ip connections and xauth
      OS-X: Made defaults test more robust
      OS-X: Need to use bash --login to setup the environment from launchd.
      XQuartz doesn't need the -launchd command line argument anymore.
      OS-X: Properly set enable_xauth if the user has no defaults set and choose a valid $display for fast-user-switching.
      OS-X: Add bindir to $PATH in startx if it's not there
      OS-X: Fixed typo
      OS-X: Set fontpath in xinitrc to include system / user fonts.  Additionally fixed font scaling issues (trac #52)
      Apple: use -nocpp arg to xrdb if cpp is not installed
      Apple: Cleaned up font path setting and added font caching to xinitrc
      Apple: Support spaces in $HOME for font path, and remove duplicate entry
      Added org.x.X11.plist.cpp to EXTRA_DIST
      Apple: font caching and defaults
      Apple: Adding support for an xinitrc.d directory on OSX, so fink doesn't need to clobber files
      Apple: Use -c in the launchd plist, so broken .profile/.bashrc don't much up startx

Matthieu Herrb (1):
      Use /dev/arandom instead of /dev/urandom to generate the cookie

root (1):
      Define APPLE for the rest of us

3 files changed, 18 insertions, 19 deletions

diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index 5f67f6458c1..eeb767ce0f8 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2008/03/15 16:39:32 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/16 22:07:24 wiz Exp $
 #
 
-DISTNAME=		xinit-1.0.7
-PKGREVISION=		2
+DISTNAME=		xinit-1.0.8
 CATEGORIES=		x11
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index 5517e36ad91..2ce18a7f48e 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/03/15 16:39:32 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/04/16 22:07:24 wiz Exp $
 
-SHA1 (xinit-1.0.7.tar.bz2) = c2fcacba6ea45d5f9118cecc89e9e5fb5b41d7d8
-RMD160 (xinit-1.0.7.tar.bz2) = 1416911d68a9153846b14a3cc199b1b5397d3233
-Size (xinit-1.0.7.tar.bz2) = 110908 bytes
-SHA1 (patch-aa) = b6b8e4ad556b80f4b8a457688205724c40241b1e
+SHA1 (xinit-1.0.8.tar.bz2) = 0102d2fdc0df3d24077ba826cf57640da46140af
+RMD160 (xinit-1.0.8.tar.bz2) = d01b299e6e96c2b5318aaec479c81670b94e2129
+Size (xinit-1.0.8.tar.bz2) = 117049 bytes
+SHA1 (patch-aa) = 3d55478d3e2a6a00ff93c63f41cac9e684df0d68
diff --git a/x11/xinit/patches/patch-aa b/x11/xinit/patches/patch-aa
index 67f85176e4a..5fdc556a971 100644
--- a/x11/xinit/patches/patch-aa
+++ b/x11/xinit/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2008/03/15 16:39:32 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2008/04/16 22:07:24 wiz Exp $
 
---- startx.cpp.orig	2007-09-16 23:24:48.000000000 +0200
+--- startx.cpp.orig	2008-03-06 22:08:48.000000000 +0000
 +++ startx.cpp
-@@ -188,7 +188,11 @@ authdisplay=${display:-:0}
+@@ -243,7 +243,11 @@ if [ x"$enable_xauth" = x1 ] ; then
  #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)
- mcookie=`MK_COOKIE`
+     mcookie=`MK_COOKIE`
  #else
--mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
-+if [ -r /dev/urandom ]; then
+-    mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
++    if [ -r /dev/urandom ]; then
 +	mcookie=`dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
-+else
++    else
 +	mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"`
-+fi
- if test x"$mcookie" = x; then
-                 echo "Couldn't create cookie"
-                 exit 1
++    fi
+     if test x"$mcookie" = x; then
+         echo "Couldn't create cookie"
+         exit 1