Mon Jun 8 05:27:41 2009 UTC ()
Require MesaLib>=7.1.0.


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

--- pkgsrc/x11/modular-xorg-server/Makefile 2009/06/07 11:23:46 1.42
+++ pkgsrc/x11/modular-xorg-server/Makefile 2009/06/08 05:27:41 1.43
@@ -1,132 +1,133 @@ @@ -1,132 +1,133 @@
1# $NetBSD: Makefile,v 1.42 2009/06/07 11:23:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.43 2009/06/08 05:27:41 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
15SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 15SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20 20
21PKGCONFIG_OVERRIDE+= xorg-server.pc.in 21PKGCONFIG_OVERRIDE+= xorg-server.pc.in
22SHLIBTOOL_OVERRIDE= # empty 22SHLIBTOOL_OVERRIDE= # empty
23 23
24BUILD_DEFS+= VARBASE 24BUILD_DEFS+= VARBASE
25BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR 25BUILD_DEFS_EFFECTS+= XKB_OUTPUT_DIR
26 26
27OWN_DIRS+= ${XKB_OUTPUT_DIR} 27OWN_DIRS+= ${XKB_OUTPUT_DIR}
28XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config 28XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
29 29
30CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
31CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q} 31CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
32 32
33.if !empty(USE_TOOLS:Mauto*) 33.if !empty(USE_TOOLS:Mauto*)
34BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros 34BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
35.endif 35.endif
36 36
37DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 37DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
38DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config 38DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q} 42CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q}
43CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation" 43CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation"
44CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc" 44CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc"
45.if ${OPSYS} == "NetBSD" 45.if ${OPSYS} == "NetBSD"
46CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" 46CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
47CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" 47CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
48.endif 48.endif
49CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 49CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
50CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/" 50CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/"
51 51
52CONFIGURE_ARGS+= --enable-xorg 52CONFIGURE_ARGS+= --enable-xorg
53 53
54CONFIGURE_ARGS+= --disable-config-hal 54CONFIGURE_ARGS+= --disable-config-hal
55CONFIGURE_ARGS+= --disable-dmx 55CONFIGURE_ARGS+= --disable-dmx
56CONFIGURE_ARGS+= --disable-xprint 56CONFIGURE_ARGS+= --disable-xprint
57CONFIGURE_ARGS+= --disable-xwin 57CONFIGURE_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
71INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input 71INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
72 72
 73BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.1.0
73BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 74BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
74BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 75BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0
75BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9 76BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9
76BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 77BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5
77BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3 78BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
78BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1 79BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1
79BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3 80BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3
80BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3 81BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
81BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4 82BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
82 83
83.include "options.mk" 84.include "options.mk"
84 85
85.include "../../devel/ncurses/buildlink3.mk" 86.include "../../devel/ncurses/buildlink3.mk"
86.include "../../devel/zlib/buildlink3.mk" 87.include "../../devel/zlib/buildlink3.mk"
87.include "../../fonts/libfontenc/buildlink3.mk" 88.include "../../fonts/libfontenc/buildlink3.mk"
88.include "../../graphics/MesaLib/buildlink3.mk" 89.include "../../graphics/MesaLib/buildlink3.mk"
89.include "../../security/openssl/buildlink3.mk" 90.include "../../security/openssl/buildlink3.mk"
90.include "../../sysutils/libpciaccess/buildlink3.mk" 91.include "../../sysutils/libpciaccess/buildlink3.mk"
91.include "../../x11/bigreqsproto/buildlink3.mk" 92.include "../../x11/bigreqsproto/buildlink3.mk"
92.include "../../x11/compositeproto/buildlink3.mk" 93.include "../../x11/compositeproto/buildlink3.mk"
93.include "../../x11/damageproto/buildlink3.mk" 94.include "../../x11/damageproto/buildlink3.mk"
94.include "../../x11/dri2proto/buildlink3.mk" 95.include "../../x11/dri2proto/buildlink3.mk"
95.include "../../x11/evieext/buildlink3.mk" 96.include "../../x11/evieext/buildlink3.mk"
96.include "../../x11/fixesproto/buildlink3.mk" 97.include "../../x11/fixesproto/buildlink3.mk"
97.include "../../x11/fontsproto/buildlink3.mk" 98.include "../../x11/fontsproto/buildlink3.mk"
98.include "../../x11/glproto/buildlink3.mk" 99.include "../../x11/glproto/buildlink3.mk"
99.include "../../x11/inputproto/buildlink3.mk" 100.include "../../x11/inputproto/buildlink3.mk"
100.include "../../x11/libX11/buildlink3.mk" 101.include "../../x11/libX11/buildlink3.mk"
101.include "../../x11/libXau/buildlink3.mk" 102.include "../../x11/libXau/buildlink3.mk"
102.include "../../x11/libXaw/buildlink3.mk" 103.include "../../x11/libXaw/buildlink3.mk"
103.include "../../x11/libXext/buildlink3.mk" 104.include "../../x11/libXext/buildlink3.mk"
104.include "../../x11/libXfixes/buildlink3.mk" 105.include "../../x11/libXfixes/buildlink3.mk"
105.include "../../x11/libXfont/buildlink3.mk" 106.include "../../x11/libXfont/buildlink3.mk"
106.include "../../x11/libXinerama/buildlink3.mk" 107.include "../../x11/libXinerama/buildlink3.mk"
107.include "../../x11/libXt/buildlink3.mk" 108.include "../../x11/libXt/buildlink3.mk"
108.include "../../x11/libXxf86misc/buildlink3.mk" 109.include "../../x11/libXxf86misc/buildlink3.mk"
109.include "../../x11/libXxf86vm/buildlink3.mk" 110.include "../../x11/libXxf86vm/buildlink3.mk"
110.include "../../x11/libdrm/buildlink3.mk" 111.include "../../x11/libdrm/buildlink3.mk"
111.include "../../x11/libxkbfile/buildlink3.mk" 112.include "../../x11/libxkbfile/buildlink3.mk"
112.include "../../x11/libxkbui/buildlink3.mk" 113.include "../../x11/libxkbui/buildlink3.mk"
113.include "../../x11/pixman/buildlink3.mk" 114.include "../../x11/pixman/buildlink3.mk"
114.include "../../x11/randrproto/buildlink3.mk" 115.include "../../x11/randrproto/buildlink3.mk"
115.include "../../x11/recordproto/buildlink3.mk" 116.include "../../x11/recordproto/buildlink3.mk"
116.include "../../x11/renderproto/buildlink3.mk" 117.include "../../x11/renderproto/buildlink3.mk"
117.include "../../x11/resourceproto/buildlink3.mk" 118.include "../../x11/resourceproto/buildlink3.mk"
118.include "../../x11/scrnsaverproto/buildlink3.mk" 119.include "../../x11/scrnsaverproto/buildlink3.mk"
119.include "../../x11/trapproto/buildlink3.mk" 120.include "../../x11/trapproto/buildlink3.mk"
120.include "../../x11/videoproto/buildlink3.mk" 121.include "../../x11/videoproto/buildlink3.mk"
121.include "../../x11/xcmiscproto/buildlink3.mk" 122.include "../../x11/xcmiscproto/buildlink3.mk"
122.include "../../x11/xextproto/buildlink3.mk" 123.include "../../x11/xextproto/buildlink3.mk"
123.include "../../x11/xf86bigfontproto/buildlink3.mk" 124.include "../../x11/xf86bigfontproto/buildlink3.mk"
124.include "../../x11/xf86dgaproto/buildlink3.mk" 125.include "../../x11/xf86dgaproto/buildlink3.mk"
125.include "../../x11/xf86driproto/buildlink3.mk" 126.include "../../x11/xf86driproto/buildlink3.mk"
126.include "../../x11/xf86miscproto/buildlink3.mk" 127.include "../../x11/xf86miscproto/buildlink3.mk"
127.include "../../x11/xf86vidmodeproto/buildlink3.mk" 128.include "../../x11/xf86vidmodeproto/buildlink3.mk"
128.include "../../x11/xineramaproto/buildlink3.mk" 129.include "../../x11/xineramaproto/buildlink3.mk"
129.include "../../x11/xproto/buildlink3.mk" 130.include "../../x11/xproto/buildlink3.mk"
130.include "../../x11/xtrans/buildlink3.mk" 131.include "../../x11/xtrans/buildlink3.mk"
131 132
132.include "../../mk/bsd.pkg.mk" 133.include "../../mk/bsd.pkg.mk"