XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite

(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)

63 files changed, 128 insertions, 26 deletions

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index b2674be4f..bbd21f816 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -9,16 +9,12 @@ AM_CPPFLAGS = \
 	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless
 
-if X11APP
-X11APP_SUBDIRS = bundle
-endif
-
-SUBDIRS = . GL xpr $(X11APP_SUBDIRS)
-DIST_SUBDIRS = GL xpr bundle
+SUBDIRS = bundle . GL xpr stub
 
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/fb/fbcmap_mi.c \
 	$(top_srcdir)/mi/miinitext.c \
+	bundle/bundle-main.c \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 801fdc7d8..b7776967f 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -1,20 +1,11 @@
-bin_SCRIPTS = x11app
-
-.PHONY: x11app
-
-x11app:
-	xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)"
-
 install-data-hook:
-	xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
-
-clean-local:
-	rm -rf build
+	./mk_bundke.sh $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/X11.app
 
 resourcedir=$(libdir)/X11/xserver
 resource_DATA = Xquartz.plist
 
 EXTRA_DIST = \
+	mk_bundke.sh \
 	$(resource_DATA) \
 	Info.plist \
 	X11.icns \
diff --git a/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings
index 8f978d63f..8f978d63f 100644
--- a/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/Dutch.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings
index 1ff39fe67..1ff39fe67 100644
--- a/hw/xquartz/bundle/Dutch.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/Dutch.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib
index 95c26d7b3..95c26d7b3 100644
--- a/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
index 88e1f04ac..88e1f04ac 100644
--- a/hw/xquartz/bundle/English.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/English.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
index 63a135255..63a135255 100644
--- a/hw/xquartz/bundle/English.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
index c93d02372..c93d02372 100644
--- a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
index 066fdbe9e..066fdbe9e 100644
--- a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/French.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings
index 88e1f04ac..88e1f04ac 100644
--- a/hw/xquartz/bundle/French.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/French.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings
index 2770dfb8c..2770dfb8c 100644
--- a/hw/xquartz/bundle/French.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/French.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib
index 9f9a7da67..9f9a7da67 100644
--- a/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/German.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings
index aa37e7555..aa37e7555 100644
--- a/hw/xquartz/bundle/German.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/German.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings
index a5489ab5c..a5489ab5c 100644
--- a/hw/xquartz/bundle/German.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/German.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib
index 19532a9c2..19532a9c2 100644
--- a/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings
index 412169880..412169880 100644
--- a/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/Italian.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings
index d05d73d44..d05d73d44 100644
--- a/hw/xquartz/bundle/Italian.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib
index b6e2e1bb1..b6e2e1bb1 100644
--- a/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings
index 2d6330fa7..2d6330fa7 100644
--- a/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/Japanese.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings
index 99821ea1f..99821ea1f 100644
--- a/hw/xquartz/bundle/Japanese.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/Japanese.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib
index 523fd0856..523fd0856 100644
--- a/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings
index 0e4287d14..0e4287d14 100644
--- a/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/Spanish.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings
index 652f432a5..652f432a5 100644
--- a/hw/xquartz/bundle/Spanish.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
index 029349dd0..029349dd0 100644
--- a/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/X11.icns b/hw/xquartz/bundle/Resources/X11.icns
index d770e617d..d770e617d 100644
--- a/hw/xquartz/bundle/X11.icns
+++ b/hw/xquartz/bundle/Resources/X11.icns
diff --git a/hw/xquartz/bundle/da.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings
index 88e1f04ac..88e1f04ac 100644
--- a/hw/xquartz/bundle/da.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/da.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings
index 9608a2e6b..9608a2e6b 100644
--- a/hw/xquartz/bundle/da.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/da.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
index 4a2bd4bde..4a2bd4bde 100644
--- a/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/fi.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings
index 8e4f6474f..8e4f6474f 100644
--- a/hw/xquartz/bundle/fi.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/fi.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings
index e8420fbaa..e8420fbaa 100644
--- a/hw/xquartz/bundle/fi.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/fi.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib
index b5039fd44..b5039fd44 100644
--- a/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/ko.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings
index 4c738f8b2..4c738f8b2 100644
--- a/hw/xquartz/bundle/ko.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/ko.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings
index 56a335859..56a335859 100644
--- a/hw/xquartz/bundle/ko.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/ko.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib
index 925945c4d..925945c4d 100644
--- a/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/no.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings
index eb1cfb002..eb1cfb002 100644
--- a/hw/xquartz/bundle/no.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/no.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings
index 5157a67de..5157a67de 100644
--- a/hw/xquartz/bundle/no.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/no.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib
index ca25327f5..ca25327f5 100644
--- a/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/pl.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings
index b9c950214..b9c950214 100644
--- a/hw/xquartz/bundle/pl.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/pl.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings
index 4ae12d77f..4ae12d77f 100644
--- a/hw/xquartz/bundle/pl.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/pl.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib
index e9ca5404b..e9ca5404b 100644
--- a/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/pt.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings
index 33c637448..33c637448 100644
--- a/hw/xquartz/bundle/pt.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/pt.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings
index 23ea96847..23ea96847 100644
--- a/hw/xquartz/bundle/pt.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/pt.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib
index e88cccdba..e88cccdba 100644
--- a/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings
index 33c637448..33c637448 100644
--- a/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings
index 71c33ad14..71c33ad14 100644
--- a/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib
index a61933475..a61933475 100644
--- a/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/ru.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings
index 7f722e4b6..7f722e4b6 100644
--- a/hw/xquartz/bundle/ru.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/ru.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings
index 3b3811234..3b3811234 100644
--- a/hw/xquartz/bundle/ru.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/ru.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib
index 9354e0264..9354e0264 100644
--- a/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/sv.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings
index 655d5ff63..655d5ff63 100644
--- a/hw/xquartz/bundle/sv.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/sv.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings
index 796f06c21..796f06c21 100644
--- a/hw/xquartz/bundle/sv.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/sv.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib
index bd01c2dac..bd01c2dac 100644
--- a/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings
index b5df36885..b5df36885 100644
--- a/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings
index f88a6da4b..f88a6da4b 100644
--- a/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
index e36c15fb6..e36c15fb6 100644
--- a/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings
index 92d5473b0..92d5473b0 100644
--- a/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings
+++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings
diff --git a/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings
index f009302c2..f009302c2 100644
--- a/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings
+++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/Localizable.strings
diff --git a/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib
index 36602c53e..36602c53e 100644
--- a/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib
+++ b/hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib
diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index e97770a55..042fa3ab8 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -43,7 +43,9 @@
 static int execute(const char *command);
 static char *command_from_prefs(const char *key, const char *default_value);
 
-int main(int argc, char **argv) {
+int server_main(int argc, char **argv, char **envp);
+
+int main(int argc, char **argv, char **envp) {
     Display *display;
     const char *s;
 
@@ -52,7 +54,12 @@ int main(int argc, char **argv) {
     for(i=0; i < argc; i++) {
         fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);
     }
-
+    
+    /* Take care of the case where we're called like a normal DDX */
+    if(argc > 1 && argv[1][0] == ':') {
+        exit(server_main(argc, argv, envp));
+    }
+    
     /* If we have a process serial number and it's our only arg, act as if
      * the user double clicked the app bundle: launch app_to_run if possible
      */
@@ -73,7 +80,7 @@ int main(int argc, char **argv) {
     }
 
     /* Start the server */
-    if(s = getenv("DISPLAY")) {
+    if((s = getenv("DISPLAY"))) {
         fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n", s);
         unsetenv("DISPLAY");
     } else {
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index a4472e659..43f1502a1 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -94,7 +94,7 @@ void QuartzInitServer(int argc, char **argv, char **envp) {
     }
 }
 
-int main(int argc, char **argv, char **envp) {
+int server_main(int argc, char **argv, char **envp) {
     int         i;
     int         fd[2];
 
diff --git a/hw/xquartz/stub/Makefile.am b/hw/xquartz/stub/Makefile.am
new file mode 100644
index 000000000..3752dc111
--- /dev/null
+++ b/hw/xquartz/stub/Makefile.am
@@ -0,0 +1,11 @@
+AM_CPPFLAGS = \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DXSERVER_VERSION=\"$(VERSION)\"
+
+bin_PROGRAMS = Xquartz
+
+Xquartz_SOURCES = \
+	stub.c
+
+Xquartz_LDFLAGS =  \
+	-framework CoreServices
diff --git a/hw/xquartz/stub/stub.c b/hw/xquartz/stub/stub.c
new file mode 100644
index 000000000..70f222c27
--- /dev/null
+++ b/hw/xquartz/stub/stub.c
@@ -0,0 +1,96 @@
+/* Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ * HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 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.
+ *
+ * Except as contained in this notice, the name(s) of the above
+ * copyright holders shall not be used in advertising or otherwise to
+ * promote the sale, use or other dealings in this Software without
+ * prior written authorization.
+ */
+
+#include <CoreServices/CoreServices.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#define kX11AppBundleId "org.x.X11"
+#define kX11AppBundlePath "/Contents/MacOS/X11"
+
+static char x11_path[PATH_MAX + 1];
+
+static void set_x11_path() {
+    CFURLRef appURL = NULL;
+    OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
+    
+    switch (osstatus) {
+        case noErr:
+            if (appURL == NULL) {
+                fprintf(stderr, "xinit: Invalid response from LSFindApplicationForInfo(%s)\n", 
+                        kX11AppBundleId);
+                exit(1);
+            }
+            
+            if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
+                fprintf(stderr, "xinit: Error resolving URL for %s\n", kX11AppBundleId);
+                exit(2);
+            }
+            
+            strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
+#ifdef DEBUG
+            fprintf(stderr, "XQuartz: X11.app = %s\n", x11_path);
+#endif
+            break;
+        case kLSApplicationNotFoundErr:
+            fprintf(stderr, "XQuartz: Unable to find application for %s\n", kX11AppBundleId);
+            exit(4);
+        default:
+            fprintf(stderr, "XQuartz: Unable to find application for %s, error code = %d\n", 
+                    kX11AppBundleId, (int)osstatus);
+            exit(5);
+    }
+}
+
+#ifndef BUILD_DATE
+#define BUILD_DATE "?"
+#endif
+#ifndef XSERVER_VERSION
+#define XSERVER_VERSION "?"
+#endif
+
+int main(int argc, char **argv) {
+    
+    if(argc == 2 && !strcmp(argv[1], "-version")) {
+        fprintf(stderr, "X.org Release 7.3\n");
+        fprintf(stderr, "X.Org X Server %s\n", XSERVER_VERSION);
+        fprintf(stderr, "Build Date: %s\n", BUILD_DATE);
+        return 0;
+    }
+    
+    set_x11_path();
+    
+    argv[0] = x11_path;
+    return execvp(x11_path, argv);
+}
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 41f2b8655..6bf99a402 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -1,4 +1,5 @@
-bin_PROGRAMS = Xquartz
+x11appdir = $(APPLE_APPLICATIONS_DIR)/X11.app/Contents/MacOS
+x11app_PROGRAMS = X11
 
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
@@ -6,7 +7,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/miext \
 	-I$(top_srcdir)/miext/rootless
 
-Xquartz_SOURCES = \
+X11_SOURCES = \
 	appledri.c \
 	dri.c \
 	xprAppleWM.c \
@@ -18,13 +19,13 @@ Xquartz_SOURCES = \
 	x-hook.c \
 	x-list.c
 
-Xquartz_LDADD = \
+X11_LDADD = \
 	$(top_builddir)/hw/xquartz/libXquartz.la \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/miext/rootless/librootless.la \
-	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
+	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
 
-Xquartz_LDFLAGS =  \
+X11_LDFLAGS =  \
 	-XCClinker -Objc \
 	-Wl,-u,_miDCInitialize \
 	-Wl,-framework,Carbon \