Yay! It at least reboots!!! ...but keymaps are broken.

diff --git a/Makefile b/Makefile
index 1bf4d7aa865d2cba04e58d70ea18786e813ca331..779d34828020df0e7410d1330dbf60ac6a05c3cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,9 @@ CONFIGURE_ARGS+=      --with-apple-applications-dir=${DARWIN_X11_APP_DIR:Q}
 
 CONFIGURE_ENV+=                APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
 
 
 CONFIGURE_ENV+=                APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
 

-#CONFIGURE_ARGS+=      CFLAGS=-g CXXFLAGS=-g
+# We don't want installed binaries to be stripped because of weak
+# definitions.
+CONFIGURE_ARGS+=       INSTALL_PROGRAM="${INSTALL} -m 555"

 
 FILES_SUBST+=          PREFIX=${PREFIX}
 FILES_SUBST+=          DARWIN_X11_APP_DIR=${DARWIN_X11_APP_DIR}
 
 FILES_SUBST+=          PREFIX=${PREFIX}
 FILES_SUBST+=          DARWIN_X11_APP_DIR=${DARWIN_X11_APP_DIR}


@@ -109,7 +111,8 @@ pre-configure:
 # X11.app requires xinit to be installed.
 DEPENDS+=      xinit-[0-9]*:../../x11/xinit
 
 # X11.app requires xinit to be installed.
 DEPENDS+=      xinit-[0-9]*:../../x11/xinit
 

-# X11.app requires 'misc' font.
+# X11.app requires these fonts to start.
+DEPENDS+=      font-cursor-misc-[0-9]*:../../fonts/font-cursor-misc

 DEPENDS+=      font-misc-misc-[0-9]*:../../fonts/font-misc-misc
 DEPENDS+=      font-alias-[0-9]*:../../fonts/font-alias
 
 DEPENDS+=      font-misc-misc-[0-9]*:../../fonts/font-misc-misc
 DEPENDS+=      font-alias-[0-9]*:../../fonts/font-alias