X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-xorg-server.git;a=blobdiff_plain;f=Makefile;h=779d34828020df0e7410d1330dbf60ac6a05c3cb;hp=e9d4d15f03b217ad14fc76b4c455ad3b0e8e0cd5;hb=HEAD;hpb=b2f3b0b6d35e6d1605cfdd8b3f6eddd31d2c1787

diff --git a/Makefile b/Makefile
index e9d4d15..779d348 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,11 @@ CONFIGURE_ARGS+=	--with-apple-applications-dir=${DARWIN_X11_APP_DIR:Q}
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
 
+# 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}
 
 DEPENDS+=		xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
@@ -77,7 +82,7 @@ pre-configure:
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXfont/buildlink3.mk"
+.include "../../wip/libXfont/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXxf86misc/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
@@ -103,4 +108,12 @@ pre-configure:
 .include "../../wip/libAppleWM/buildlink3.mk"
 .include "../../wip/applewmproto/buildlink3.mk"
 
+# X11.app requires xinit to be installed.
+DEPENDS+=	xinit-[0-9]*:../../x11/xinit
+
+# 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
+
 .include "../../mk/bsd.pkg.mk"