1 files changed, 34 insertions, 28 deletions

diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 916852f39f66..af0d99c3e2fe 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xorg-drivers
 PORTVERSION=	7.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -13,75 +13,76 @@ INPUTDIR=	${LOCALBASE}/lib/xorg/modules/input
 
 USES=		metaport
 
-INPUT_DRIVERS=		mouse \
-			keyboard \
-			acecad \
+INPUT_DRIVERS=		acecad \
+			egalax \
 			elographics \
+			evdev \
+			fpit \
 			hyperpen \
 			joystick \
+			keyboard \
+			mouse \
 			mutouch \
 			penmount \
 			synaptics \
-			vmmouse \
 			void \
 			wacom
 
-VIDEO_DRIVERS=		mach64 \
-			nv \
-			r128 \
-			vesa \
-			apm \
+VIDEO_DRIVERS=		apm \
 			ark \
 			ast \
 			chips \
+			cirrus \
 			dummy \
 			glint \
 			i128 \
 			i740 \
+			mach64 \
 			mga \
 			neomagic \
+			nv \
+			openchrome \
+			r128 \
 			rendition \
 			s3 \
 			s3virge \
 			savage \
+			scfb \
 			siliconmotion \
 			sis \
 			tdfx \
 			trident \
 			tseng \
-			vmware \
+			vesa \
 			voodoo
 
-OPTIONS_DEFAULT=	MOUSE \
-			KEYBOARD \
-			MACH64 \
-			NV \
-			R128 \
-			VESA
+OPTIONS_DEFAULT=	KEYBOARD \
+			MOUSE \
+			SCFB
 
 .for type in input video
 . for a in ${${type:tu}_DRIVERS}
 OPTIONS_DEFINE+=	${a:tu}
-${a:tu}_DESC=	Install ${a} ${type} driver
+${a:tu}_DESC=		Install ${a} ${type} driver
 . endfor
 .endfor
 
-OPTIONS_DEFINE_i386=	ATI INTEL OPENCHROME
-OPTIONS_DEFAULT_i386=	ATI INTEL OPENCHROME
+OPTIONS_DEFINE_amd64=	AMDGPU ATI INTEL VMMOUSE VMWARE
+OPTIONS_DEFAULT_amd64=	VESA
 
-OPTIONS_DEFINE_amd64:=	${OPTIONS_DEFINE_i386}
-OPTIONS_DEFAULT_amd64:=	${OPTIONS_DEFAULT_i386}
+OPTIONS_DEFINE_i386:=	${OPTIONS_DEFINE_amd64} GEODE
+OPTIONS_DEFAULT_i386:=	${OPTIONS_DEFAULT_amd64}
 
 OPTIONS_DEFINE_sparc64=	SUNFFB
 OPTIONS_DEFAULT_sparc64=SUNFFB
 
-OPTIONS_DEFINE_ia64=	OPENCHROME
-OPTIONS_DEFAULT_ia64=	OPENCHROME
-
-ATI_DESC=		Install ati video driver
+AMDGPU_DESC=		Install amdgpu video driver
+ATI_DESC=		Install ati (radeon) video driver 
+GEODE_DESC=		Install geode video driver
 INTEL_DESC=		Install intel video driver
-OPENCHROME_DESC=	Install openchrome video driver
 SUNFFB_DESC=		Install sunffb video driver
+VMMOUSE_DESC=		Install vmmouse input driver
+VMWARE_DESC=		Install vmware video driver
 
 # these drivers have a different module name compared to the plugin they install
 QUIRKS=		keyboard:kbd
@@ -90,7 +91,12 @@ QUIRKS=		keyboard:kbd
 
 # Manual add arch specific drivers so they be added to depend lines.
 .if ${ARCH}==i386 || ${ARCH}==amd64
-VIDEO_DRIVERS+=	ati intel openchrome
+INPUT_DRIVERS+= vmmouse
+VIDEO_DRIVERS+=	amdgpu ati intel vmware
+.endif
+
+.if ${ARCH}==i386
+VIDEO_DRIVERS+= geode
 .endif
 
 .if ${ARCH}==sparc64