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

[pkgsrc-xorg-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 17ed2a780a52b2b1565cbd6e3f996a9f3f9528b3..779d34828020df0e7410d1330dbf60ac6a05c3cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,25 @@
 # $NetBSD$
 
-DISTNAME=      xorg-server-1.4.2
+DISTNAME=      xorg-server-1.4.2-apple35
 PKGNAME=       modular-${DISTNAME}
-PKGREVISION=   4
 CATEGORIES=    x11
 
-MASTER_SITES=  ${MASTER_SITE_XORG:=xserver/}
+MASTER_SITES=  http://static.macosforge.org/xquartz/downloads/src/
 EXTRACT_SUFX=  .tar.bz2
 
-PATCHFILES=            xserver-1.4.2-pkgsrc.patch
-PATCH_DIST_STRIP=      -p1
-SITES.xserver-1.4.2-pkgsrc.patch=\
-                       ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
-
-SPECIAL_PERMS+=                bin/Xorg ${SETUID_ROOT_PERMS}
+ONLY_FOR_PLATFORM= Darwin-*-*
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-MAINTAINER=            bjs@NetBSD.org
-COMMENT=               Xorg X11 Server from modular X.org X11
+MAINTAINER=            pho@cielonegro.org
+COMMENT=               Xorg X11 Server from modular X.org X11 for MacOS X
 
-# XXX this package should be upgraded to 1.1.6, I think.
-BUILD_DEPENDS+=                xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
 DEPENDS+=              xkbcomp-[0-9]*:../../x11/xkbcomp
 
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 PKGCONFIG_OVERRIDE+=   xorg-server.pc.in
-USE_TOOLS+=            gmake pkg-config autoconf automake
+USE_TOOLS+=            gmake pkg-config perl
 
 BUILD_DEFS+=           VARBASE
 BUILD_DEFS_EFFECTS+=   XKB_OUTPUT_DIR
@@ -35,41 +27,20 @@ BUILD_DEFS_EFFECTS+=        XKB_OUTPUT_DIR
 OWN_DIRS+=             ${XKB_OUTPUT_DIR}
 XKB_OUTPUT_DIR?=       ${VARBASE}/db/xkb
 
+DARWIN_X11_APP_DIR?= ${PREFIX}/libexec/modular-xorg-server/
+
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=       --with-xkb-output=${XKB_OUTPUT_DIR:Q}
+CONFIGURE_ARGS+=       --with-apple-applications-dir=${DARWIN_X11_APP_DIR:Q}
 
-WRKSRC=                        ${WRKDIR}/xorg-server-1.4.2
+CONFIGURE_ENV+=                APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
 
-.include "../../mk/bsd.prefs.mk"
+# We don't want installed binaries to be stripped because of weak
+# definitions.
+CONFIGURE_ARGS+=       INSTALL_PROGRAM="${INSTALL} -m 555"
 
-CONFIGURE_ARGS+=       --with-release-version=${PKGNAME}
-CONFIGURE_ARGS+=       --with-vendor-name="The NetBSD Foundation"
-CONFIGURE_ARGS+=       --with-vendor-name-short="pkgsrc"
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=       --with-builder-addr="tech-x11@NetBSD.org"
-CONFIGURE_ARGS+=       --with-os-vendor="The NetBSD Foundation"
-.endif
-CONFIGURE_ARGS+=       --with-os-name=${MACHINE_PLATFORM}
-CONFIGURE_ARGS+=       --with-vendor-web="http://www.pkgsrc.org/"
-
-CONFIGURE_ARGS+=       --enable-xorg
-CONFIGURE_ARGS+=       --disable-config-hal
-CONFIGURE_ARGS+=       --disable-dmx
-CONFIGURE_ARGS+=       --disable-xprint
-CONFIGURE_ARGS+=       --disable-xwin
-CONFIGURE_ARGS+=       --disable-xephyr
-CONFIGURE_ARGS+=       --disable-kdrive
-CONFIGURE_ARGS+=       --disable-kdrive-vesa
-CONFIGURE_ARGS+=       --disable-xfake
-CONFIGURE_ARGS+=       --disable-xsdl
-CONFIGURE_ARGS+=       --disable-xfbdev
-CONFIGURE_ARGS+=       --disable-kbd_mode      # deprecated
-CONFIGURE_ARGS+=       --enable-builtin-fonts
-CONFIGURE_ARGS+=       --enable-dri
-
-CONFIGURE_ARGS+=       --with-int10=x86emu
-
-CONFIGURE_ENV+=                APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
+FILES_SUBST+=          PREFIX=${PREFIX}
+FILES_SUBST+=          DARWIN_X11_APP_DIR=${DARWIN_X11_APP_DIR}
 
 DEPENDS+=              xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
 
@@ -89,11 +60,9 @@ BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
 .endif
 BUILDLINK_API_DEPENDS.inputproto+=     inputproto>=1.4.2
 
-post-extract: dri-post-extract
-       ${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common
-#      ${RM} -f ${WRKDIR}/Mesa-7.0.2/src/mesa/Makefile.orig
-#      ${RM} -f ${WRKDIR}/Mesa-7.0.2/docs/README.MINGW32.orig
-#      ${CP} ${FILESDIR}/prim_x86_gcc.h ${WRKSRC}/hw/xfree86/x86emu/x86emu/
+# Workaround for missing Xplugin.h
+pre-configure:
+       ${CP} ${FILESDIR}/Xplugin.h ${BUILDLINK_DIR}/include
 
 .include "options.mk"
 
@@ -113,11 +82,10 @@ post-extract: dri-post-extract
 .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"
-.include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libxkbui/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
@@ -132,14 +100,20 @@ post-extract: dri-post-extract
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86bigfontproto/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
 .include "../../x11/xf86miscproto/buildlink3.mk"
 .include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .include "../../x11/xineramaproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
+.include "../../wip/libAppleWM/buildlink3.mk"
+.include "../../wip/applewmproto/buildlink3.mk"
 
-pre-configure:
-       cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -v -i -f
+# 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"