Tue Nov 22 16:02:54 2016 UTC ()
Remove obsolete configure argument.


(wiz)
diff -r1.15 -r1.16 pkgsrc/x11/modular-xorg-server/options.mk
cvs diff -r1.15 -r1.16 pkgsrc/x11/modular-xorg-server/options.mk (switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/options.mk 2016/03/14 02:13:33 1.15
+++ pkgsrc/x11/modular-xorg-server/options.mk 2016/11/22 16:02:54 1.16
@@ -1,65 +1,64 @@ @@ -1,65 +1,64 @@
1# $NetBSD: options.mk,v 1.15 2016/03/14 02:13:33 tnn Exp $ 1# $NetBSD: options.mk,v 1.16 2016/11/22 16:02:54 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
4PKG_SUPPORTED_OPTIONS= inet6 debug dtrace 4PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
5PKG_SUGGESTED_OPTIONS= inet6 5PKG_SUGGESTED_OPTIONS= inet6
6.if ${X11_TYPE} == "modular" 6.if ${X11_TYPE} == "modular"
7PKG_SUPPORTED_OPTIONS+= dri 7PKG_SUPPORTED_OPTIONS+= dri
8PKG_SUGGESTED_OPTIONS+= dri 8PKG_SUGGESTED_OPTIONS+= dri
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= dri dtrace 13PLIST_VARS+= dri dtrace
14 14
15.if !empty(PKG_OPTIONS:Mdri) 15.if !empty(PKG_OPTIONS:Mdri)
16.include "../../graphics/libepoxy/buildlink3.mk" 16.include "../../graphics/libepoxy/buildlink3.mk"
17BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11 17BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
18.include "../../graphics/MesaLib/buildlink3.mk" 18.include "../../graphics/MesaLib/buildlink3.mk"
19.include "../../x11/glproto/buildlink3.mk" 19.include "../../x11/glproto/buildlink3.mk"
20.include "../../x11/dri2proto/buildlink3.mk" 20.include "../../x11/dri2proto/buildlink3.mk"
21.include "../../x11/dri3proto/buildlink3.mk" 21.include "../../x11/dri3proto/buildlink3.mk"
22.include "../../x11/libdrm/buildlink3.mk" 22.include "../../x11/libdrm/buildlink3.mk"
23.include "../../x11/libxshmfence/buildlink3.mk" 23.include "../../x11/libxshmfence/buildlink3.mk"
24.include "../../x11/presentproto/buildlink3.mk" 24.include "../../x11/presentproto/buildlink3.mk"
25.include "../../x11/xf86driproto/buildlink3.mk" 25.include "../../x11/xf86driproto/buildlink3.mk"
26PLIST.dri= yes 26PLIST.dri= yes
27CONFIGURE_ARGS+= --enable-dri 27CONFIGURE_ARGS+= --enable-dri
28CONFIGURE_ARGS+= --enable-dri2 28CONFIGURE_ARGS+= --enable-dri2
29CONFIGURE_ARGS+= --enable-dri3 29CONFIGURE_ARGS+= --enable-dri3
30CONFIGURE_ARGS+= --enable-glx 30CONFIGURE_ARGS+= --enable-glx
31CONFIGURE_ARGS+= --enable-aiglx 
32CONFIGURE_ARGS+= --enable-glamor 31CONFIGURE_ARGS+= --enable-glamor
33CONFIGURE_ARGS+= --enable-present 32CONFIGURE_ARGS+= --enable-present
34.else 33.else
35### 34###
36### XXX Perhaps we should allow for a built-in glx without dri enabled? 35### XXX Perhaps we should allow for a built-in glx without dri enabled?
37### 36###
38CONFIGURE_ARGS+= --disable-dri 37CONFIGURE_ARGS+= --disable-dri
39CONFIGURE_ARGS+= --disable-dri2 38CONFIGURE_ARGS+= --disable-dri2
40CONFIGURE_ARGS+= --disable-dri3 39CONFIGURE_ARGS+= --disable-dri3
41CONFIGURE_ARGS+= --disable-glx 40CONFIGURE_ARGS+= --disable-glx
42CONFIGURE_ARGS+= --disable-present 41CONFIGURE_ARGS+= --disable-present
43pre-build: disable-modesetting 42pre-build: disable-modesetting
44.PHONY: disable-modesetting 43.PHONY: disable-modesetting
45disable-modesetting: 44disable-modesetting:
46 (${ECHO} "all:"; ${ECHO} "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile 45 (${ECHO} "all:"; ${ECHO} "install:") > ${WRKSRC}/hw/xfree86/drivers/modesetting/Makefile
47.endif 46.endif
48 47
49.if !empty(PKG_OPTIONS:Minet6) 48.if !empty(PKG_OPTIONS:Minet6)
50CONFIGURE_ARGS+= --enable-ipv6 49CONFIGURE_ARGS+= --enable-ipv6
51.else 50.else
52CONFIGURE_ARGS+= --disable-ipv6 51CONFIGURE_ARGS+= --disable-ipv6
53.endif 52.endif
54 53
55.if !empty(PKG_OPTIONS:Mdebug) 54.if !empty(PKG_OPTIONS:Mdebug)
56CONFIGURE_ARGS+= --enable-debug 55CONFIGURE_ARGS+= --enable-debug
57CFLAGS+= -ggdb 56CFLAGS+= -ggdb
58.endif 57.endif
59 58
60.if !empty(PKG_OPTIONS:Mdtrace) 59.if !empty(PKG_OPTIONS:Mdtrace)
61PLIST.dtrace= yes 60PLIST.dtrace= yes
62CONFIGURE_ARGS+= --with-dtrace 61CONFIGURE_ARGS+= --with-dtrace
63.else 62.else
64CONFIGURE_ARGS+= --without-dtrace 63CONFIGURE_ARGS+= --without-dtrace
65.endif 64.endif