View | Details | Raw Unified | Return to bug 196858
Collapse All | Expand All

(-)x11-drivers/xorg-drivers/Makefile (-6 / +5 lines)
Lines 30-37 Link Here
30
			void \
30
			void \
31
			wacom
31
			wacom
32
32
33
VIDEO_DRIVERS=		ati \
33
VIDEO_DRIVERS=		mach64 \
34
			mach64 \
35
			nv \
34
			nv \
36
			r128 \
35
			r128 \
37
			vesa \
36
			vesa \
Lines 60-66 Link Here
60
59
61
OPTIONS_DEFAULT=	MOUSE \
60
OPTIONS_DEFAULT=	MOUSE \
62
			KEYBOARD \
61
			KEYBOARD \
63
			ATI \
64
			MACH64 \
62
			MACH64 \
65
			NV \
63
			NV \
66
			R128 \
64
			R128 \
Lines 73-80 Link Here
73
. endfor
71
. endfor
74
.endfor
72
.endfor
75
73
76
OPTIONS_DEFINE_i386=	INTEL OPENCHROME
74
OPTIONS_DEFINE_i386=	ATI INTEL OPENCHROME
77
OPTIONS_DEFAULT_i386=	INTEL OPENCHROME
75
OPTIONS_DEFAULT_i386=	ATI INTEL OPENCHROME
78
76
79
OPTIONS_DEFINE_amd64:=	${OPTIONS_DEFINE_i386}
77
OPTIONS_DEFINE_amd64:=	${OPTIONS_DEFINE_i386}
80
OPTIONS_DEFAULT_amd64:=	${OPTIONS_DEFAULT_i386}
78
OPTIONS_DEFAULT_amd64:=	${OPTIONS_DEFAULT_i386}
Lines 85-90 Link Here
85
OPTIONS_DEFINE_ia64=	OPENCHROME
83
OPTIONS_DEFINE_ia64=	OPENCHROME
86
OPTIONS_DEFAULT_ia64=	OPENCHROME
84
OPTIONS_DEFAULT_ia64=	OPENCHROME
87
85
86
ATI_DESC=		Install ati video driver
88
INTEL_DESC=		Install intel video driver
87
INTEL_DESC=		Install intel video driver
89
OPENCHROME_DESC=	Install openchrome video driver
88
OPENCHROME_DESC=	Install openchrome video driver
90
SUNFFB_DESC=		Install sunffb video driver
89
SUNFFB_DESC=		Install sunffb video driver
Lines 96-102 Link Here
96
95
97
# Manual add arch specific drivers so they be added to depend lines.
96
# Manual add arch specific drivers so they be added to depend lines.
98
.if ${ARCH}==i386 || ${ARCH}==amd64
97
.if ${ARCH}==i386 || ${ARCH}==amd64
99
VIDEO_DRIVERS+=	intel openchrome
98
VIDEO_DRIVERS+=	ati intel openchrome
100
.endif
99
.endif
101
100
102
.if ${ARCH}==sparc64
101
.if ${ARCH}==sparc64

Return to bug 196858