View | Details | Raw Unified | Return to bug 222609 | Differences between
and this patch

Collapse All | Expand All

(-)w/x11-servers/xorg-server/Makefile (-2 / +10 lines)
Lines 23-31 SLAVE_PORT?= no Link Here
23
OPTIONS_SUB=	yes
23
OPTIONS_SUB=	yes
24
OPTIONS_DEFINE=	SUID
24
OPTIONS_DEFINE=	SUID
25
OPTIONS_RADIO=	CONF
25
OPTIONS_RADIO=	CONF
26
OPTIONS_RADIO_CONF=	DEVD HAL
26
OPTIONS_RADIO_CONF=	DEVD HAL UDEV
27
DEVD_DESC=	Use devd for autoconfiguration of input devices
27
DEVD_DESC=	Use devd for autoconfiguration of input devices
28
HAL_DESC=	Use hald for autoconfiguration of input devices
28
HAL_DESC=	Use hald for autoconfiguration of input devices
29
UDEV_DESC=	Use udev for autoconfiguration of input devices
29
SUID_DESC=	Install the Xorg server with setuid bit set
30
SUID_DESC=	Install the Xorg server with setuid bit set
30
OPTIONS_DEFAULT=DEVD SUID
31
OPTIONS_DEFAULT=DEVD SUID
31
32
Lines 44-50 USE_XORG+= bigreqsproto compositeproto damageproto dri2proto dri3proto \ Link Here
44
		xineramaproto xkbfile xproto xshmfence xtrans
45
		xineramaproto xkbfile xproto xshmfence xtrans
45
CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
46
CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
46
		--localstatedir=/var --with-shared-memory-dir=/tmp \
47
		--localstatedir=/var --with-shared-memory-dir=/tmp \
47
		--disable-config-udev --disable-config-udev-kms \
48
		--disable-config-udev-kms --disable-systemd-logind \
48
		--without-dtrace --enable-glamor
49
		--without-dtrace --enable-glamor
49
INSTALL_TARGET=	install-strip
50
INSTALL_TARGET=	install-strip
50
51
Lines 84-89 CONFIGURE_ARGS+= --enable-config-hal Link Here
84
CONFIGURE_ARGS+=	--disable-config-hal
85
CONFIGURE_ARGS+=	--disable-config-hal
85
.endif
86
.endif
86
87
88
.if ${PORT_OPTIONS:MUDEV}
89
LIB_DEPENDS+=	libudev.so:devel/libudev-devd
90
CONFIGURE_ARGS+= --enable-config-udev
91
.else
92
CONFIGURE_ARGS+= --disable-config-udev
93
.endif
94
87
# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
95
# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
88
CONFIGURE_ARGS+=--disable-install-setuid
96
CONFIGURE_ARGS+=--disable-install-setuid
89
97

Return to bug 222609