Index: x11-drivers/xorg-drivers/Makefile
===================================================================
--- x11-drivers/xorg-drivers/Makefile	(revision 532747)
+++ x11-drivers/xorg-drivers/Makefile	(working copy)
@@ -57,30 +57,10 @@
 			MOUSE \
 			SCFB
 
-.for type in input video
-. for a in ${${type:tu}_DRIVERS}
-OPTIONS_DEFINE+=	${a:tu}
-${a:tu}_DESC=		Install ${a} ${type} driver
-. endfor
-.endfor
-
-OPTIONS_DEFINE_amd64=	AMDGPU ATI INTEL VMMOUSE VMWARE
 OPTIONS_DEFAULT_amd64=	VESA
-
-OPTIONS_DEFINE_i386:=	${OPTIONS_DEFINE_amd64} GEODE
 OPTIONS_DEFAULT_i386:=	${OPTIONS_DEFAULT_amd64}
-
-OPTIONS_DEFINE_sparc64=	SUNFFB
 OPTIONS_DEFAULT_sparc64=SUNFFB
 
-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
-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
 
@@ -100,8 +80,12 @@
 VIDEO_DRIVERS+=	sunffb
 .endif
 
+
 .for type in input video
-. for i in ${${type:tu}_DRIVERS}
+OPTIONS_GROUP+=		${type:tu}
+. for i in ${${type:tu}_DRIVERS:O}
+OPTIONS_GROUP_${type:tu}+=	${i:tu}
+${i:tu}_DESC!=		${MAKE} -C ../xf86-${type}-${i} -V COMMENT
 .  if ${PORT_OPTIONS:M${i:tu}} != ""
 .   if ${QUIRKS:M${i}\:*:C/.*://} != ""
 RUN_DEPENDS+=	${${type:tu}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:x11-drivers/xf86-${type}-${i}