X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-xorg-server.git;a=blobdiff_plain;f=Makefile;h=4eb755d60733a0751e823c8eb5da24ed59b30ffe;hp=17ed2a780a52b2b1565cbd6e3f996a9f3f9528b3;hb=cca991fae99c7e9c467351d703e5bce4c4588ef4;hpb=54ae9c00c2954ae6a86b8d469f077929f58ed3a5

diff --git a/Makefile b/Makefile
index 17ed2a7..4eb755d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,21 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
 
-PATCHFILES=		xserver-1.4.2-pkgsrc.patch
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+DISTFILES+=		xserver-1.4.2-pkgsrc.patch
+.else
+PATCHFILES+=	xserver-1.4.2-pkgsrc.patch
 PATCH_DIST_STRIP=	-p1
+.endif
 SITES.xserver-1.4.2-pkgsrc.patch=\
 			ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
 
+DISTFILES+=		xorg-server-1.4.2-apple35.tar.bz2
+SITES.xorg-server-1.4.2-apple35.tar.bz2=\
+	http://static.macosforge.org/xquartz/downloads/src/
+
 SPECIAL_PERMS+=		bin/Xorg ${SETUID_ROOT_PERMS}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -20,14 +30,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 MAINTAINER=		bjs@NetBSD.org
 COMMENT=		Xorg X11 Server from modular X.org X11
 
-# 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
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS_EFFECTS+=	XKB_OUTPUT_DIR
@@ -38,9 +46,13 @@ XKB_OUTPUT_DIR?=	${VARBASE}/db/xkb
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--with-xkb-output=${XKB_OUTPUT_DIR:Q}
 
+.if ${OPSYS} == "Darwin"
+EXTRACT_ONLY=	xorg-server-1.4.2-apple35.tar.bz2
+WRKSRC=			${WRKDIR}/xorg-server-1.4.2-apple35
+.else
+EXTRACT_ONLY=	xorg-server-1.4.2.tar.bz2
 WRKSRC=			${WRKDIR}/xorg-server-1.4.2
-
-.include "../../mk/bsd.prefs.mk"
+.endif
 
 CONFIGURE_ARGS+=	--with-release-version=${PKGNAME}
 CONFIGURE_ARGS+=	--with-vendor-name="The NetBSD Foundation"
@@ -52,7 +64,9 @@ CONFIGURE_ARGS+=	--with-os-vendor="The NetBSD Foundation"
 CONFIGURE_ARGS+=	--with-os-name=${MACHINE_PLATFORM}
 CONFIGURE_ARGS+=	--with-vendor-web="http://www.pkgsrc.org/"
 
+.if ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=	--enable-xorg
+.endif
 CONFIGURE_ARGS+=	--disable-config-hal
 CONFIGURE_ARGS+=	--disable-dmx
 CONFIGURE_ARGS+=	--disable-xprint
@@ -91,6 +105,8 @@ BUILDLINK_API_DEPENDS.inputproto+=	inputproto>=1.4.2
 
 post-extract: dri-post-extract
 	${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common
+#	${CP} ${FILESDIR}/Xplugin.h ${WRKSRC}/miext/rootless/
+	${CP} ${FILESDIR}/Xplugin.h ${WRKSRC}/hw/xquartz/xpr/
 #	${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/
@@ -139,7 +155,9 @@ post-extract: dri-post-extract
 .include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/xtrans/buildlink3.mk"
 
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -v -i -f
+.if ${OPSYS} == "Darwin"
+.include "../../wip/libAppleWM/buildlink3.mk"
+.include "../../wip/applewmproto/buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"