Mon Jun 8 08:31:31 2009 UTC ()
Add workaround for build failure on NetBSD, PR#41556.
Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.


(obache)
diff -r1.43 -r1.44 pkgsrc/x11/modular-xorg-server/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2009/06/08 05:27:41 1.43
+++ pkgsrc/x11/modular-xorg-server/Makefile 2009/06/08 08:31:31 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.43 2009/06/08 05:27:41 obache Exp $ 1# $NetBSD: Makefile,v 1.44 2009/06/08 08:31:31 obache Exp $
2# 2#
3 3
4DISTNAME= xorg-server-1.6.1.901 4DISTNAME= xorg-server-1.6.1.901
5PKGNAME= modular-${DISTNAME} 5PKGNAME= modular-${DISTNAME}
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} 7MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= bjs@NetBSD.org 10MAINTAINER= bjs@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Modular X11 server from modular X.org 12COMMENT= Modular X11 server from modular X.org
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -58,26 +58,32 @@ CONFIGURE_ARGS+= --disable-xwin @@ -58,26 +58,32 @@ CONFIGURE_ARGS+= --disable-xwin
58CONFIGURE_ARGS+= --disable-xephyr 58CONFIGURE_ARGS+= --disable-xephyr
59CONFIGURE_ARGS+= --disable-kdrive 59CONFIGURE_ARGS+= --disable-kdrive
60CONFIGURE_ARGS+= --disable-kdrive-vesa 60CONFIGURE_ARGS+= --disable-kdrive-vesa
61CONFIGURE_ARGS+= --disable-xfake 61CONFIGURE_ARGS+= --disable-xfake
62CONFIGURE_ARGS+= --disable-xsdl 62CONFIGURE_ARGS+= --disable-xsdl
63CONFIGURE_ARGS+= --disable-xfbdev 63CONFIGURE_ARGS+= --disable-xfbdev
64CONFIGURE_ARGS+= --disable-kbd_mode # deprecated 64CONFIGURE_ARGS+= --disable-kbd_mode # deprecated
65CONFIGURE_ARGS+= --disable-xorgcfg # deprecated 65CONFIGURE_ARGS+= --disable-xorgcfg # deprecated
66 66
67CONFIGURE_ARGS+= --with-int10=x86emu 67CONFIGURE_ARGS+= --with-int10=x86emu
68 68
69CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5 69CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
70 70
 71# Workaround for PR#41556.
 72# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
 73.if ${OPSYS} == "NetBSD"
 74CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
 75.endif
 76
71INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 77INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
72 78
73BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0 79BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0
74BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 80BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
75BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 81BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0
76BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9 82BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9
77BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 83BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5
78BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 84BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
79BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1 85BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1
80BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3 86BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3
81BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 87BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
82BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 88BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
83 89