Prefix all options with "xorg-server-", since they are all package

specific. Add legacy handling for old names.

2 files changed, 97 insertions, 80 deletions

diff --git a/x11/xorg-server/PLIST b/x11/xorg-server/PLIST
index 2bd48ccecd8..89538450474 100644
--- a/x11/xorg-server/PLIST
+++ b/x11/xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/05 00:24:11 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/12/02 17:51:50 wiz Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/Xnest
 ${X11ROOT_PREFIX}/bin/Xprt
@@ -879,73 +879,73 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/Xorg.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xprt.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xserver.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xvfb.${MAN_SUFFIX}
-${CARDDRIVER.apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
-${CARDDRIVER.apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
-${CARDDRIVER.ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
-${CARDDRIVER.chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
-${CARDDRIVER.chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o
-${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX}
-${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o
-${CARDDRIVER.dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
-${CARDDRIVER.glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
-${CARDDRIVER.glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
-${CARDDRIVER.i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
-${CARDDRIVER.i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
-${CARDDRIVER.i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
-${CARDDRIVER.i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
-${CARDDRIVER.i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
-${CARDDRIVER.i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
-${CARDDRIVER.imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
-${CARDDRIVER.imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o
-${CARDDRIVER.mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX}
-${CARDDRIVER.mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
-${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
-${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
-${CARDDRIVER.newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
-${CARDDRIVER.newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o
-${CARDDRIVER.nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
-${CARDDRIVER.nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc
-${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
-${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
-${CARDDRIVER.s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
-${CARDDRIVER.savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
-${CARDDRIVER.savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
-${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
-${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
-${CARDDRIVER.sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
-${CARDDRIVER.sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
-${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
-${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
-${CARDDRIVER.tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
-${CARDDRIVER.trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
-${CARDDRIVER.trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
-${CARDDRIVER.tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
-${CARDDRIVER.tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
-${CARDDRIVER.vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
-${CARDDRIVER.vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
-${CARDDRIVER.vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
-${CARDDRIVER.vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
-${CARDDRIVER.via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
-${CARDDRIVER.via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
-${CARDDRIVER.vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX}
-${CARDDRIVER.vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
+${CARDDRIVER.xorg-server-apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
+${CARDDRIVER.xorg-server-ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
+${CARDDRIVER.xorg-server-chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o
+${CARDDRIVER.xorg-server-cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o
+${CARDDRIVER.xorg-server-dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
+${CARDDRIVER.xorg-server-glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
+${CARDDRIVER.xorg-server-i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
+${CARDDRIVER.xorg-server-i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
+${CARDDRIVER.xorg-server-i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
+${CARDDRIVER.xorg-server-imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o
+${CARDDRIVER.xorg-server-mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
+${CARDDRIVER.xorg-server-neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
+${CARDDRIVER.xorg-server-newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o
+${CARDDRIVER.xorg-server-nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
+${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
+${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
+${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
+${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc
+${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc
+${CARDDRIVER.xorg-server-s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
+${CARDDRIVER.xorg-server-s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
+${CARDDRIVER.xorg-server-savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
+${CARDDRIVER.xorg-server-siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
+${CARDDRIVER.xorg-server-sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
+${CARDDRIVER.xorg-server-tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
+${CARDDRIVER.xorg-server-tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
+${CARDDRIVER.xorg-server-trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
+${CARDDRIVER.xorg-server-tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
+${CARDDRIVER.xorg-server-vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
+${CARDDRIVER.xorg-server-vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
+${CARDDRIVER.xorg-server-via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
+${CARDDRIVER.xorg-server-vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
 ${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${FILEMAN_DIR}/xorg.conf.${FILEMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX}
@@ -1210,9 +1210,9 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/fonts
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/model-config
-${CARDDRIVER.fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o
+${CARDDRIVER.xorg-server-fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o
 ${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
-${CARDDRIVER.v4l}${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o
+${CARDDRIVER.xorg-server-v4l}${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o
 ${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.o
 ${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.o
 ${X11ROOT_PREFIX}/lib/modules/linux/libdrm.a
@@ -1220,7 +1220,7 @@ ${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.a
 ${X11ROOT_PREFIX}/lib/modules/linux/libint10.a
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/aiptek.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/ur98.${KERNMAN_SUFFIX}
-${CARDDRIVER.v4l}${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX}
+${CARDDRIVER.xorg-server-v4l}${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX}
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS
diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk
index 70e6d56ccac..d60ad08c5aa 100644
--- a/x11/xorg-server/options.mk
+++ b/x11/xorg-server/options.mk
@@ -1,10 +1,22 @@
-# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:40 dillo Exp $
-
-_COMMONCARDDRIVERS=	apm ark ati chips cirrus cyrix dummy glint i128 mga \
-			neomagic nv rendition s3 s3virge savage siliconmotion \
-			sis tdfx tga trident tseng vesa vga
-_NOTX86_64CARDDRIVERS=	i740 i810 imstt newport nsc via vmware
-_LINUXCARDDRIVERS=	fbdev v4l
+# $NetBSD: options.mk,v 1.5 2005/12/02 17:51:50 wiz Exp $
+
+_COMMONCARDDRIVERS=	xorg-server-apm xorg-server-ark xorg-server-ati \
+			xorg-server-chips xorg-server-cirrus \
+			xorg-server-cyrix xorg-server-dummy \
+			xorg-server-glint xorg-server-i128 \
+			xorg-server-mga xorg-server-neomagic \
+			xorg-server-nv xorg-server-rendition \
+			xorg-server-s3 xorg-server-s3virge \
+			xorg-server-savage xorg-server-siliconmotion \
+			xorg-server-sis xorg-server-tdfx \
+			xorg-server-tga xorg-server-trident \
+			xorg-server-tseng xorg-server-vesa \
+			xorg-server-vga
+_NOTX86_64CARDDRIVERS=	xorg-server-i740 xorg-server-i810 \
+			xorg-server-imstt xorg-server-newport \
+			xorg-server-nsc xorg-server-via \
+			xorg-server-vmware
+_LINUXCARDDRIVERS=	xorg-server-fbdev xorg-server-v4l
 
 _ALLCARDDRIVERS=	${_COMMONCARDDRIVERS} ${_NOTX86_64CARDDRIVERS} \
 			${_LINUXCARDDRIVERS}
@@ -24,6 +36,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.xorg-server
 PKG_SUPPORTED_OPTIONS=	${_COMMONCARDDRIVERS} ${_OSCARDDRIVERS}
 PKG_SUGGESTED_OPTIONS=	${PKG_SUPPORTED_OPTIONS}
 
+# remove legacy handling after 2005Q4
+.for _drv in ${_ALLCARDDRIVERS}
+PKG_OPTIONS_LEGACY_OPTS+=	${_drv:S/xorg-server-//}:${_drv}
+.endfor
+
 .include "../../mk/bsd.options.mk"
 
 .for _drv in ${PKG_OPTIONS}
@@ -31,9 +48,9 @@ PLIST_SUBST+=		CARDDRIVER.${_drv}=
 .endfor
 
 .for _drv in ${_ALLCARDDRIVERS}
-.  if empty(PLIST_SUBST:MCARDDRIVER\.${_drv}=)
+.  if empty(PKG_OPTIONS:M${_drv})
 PLIST_SUBST+=		CARDDRIVER.${_drv}="@comment "
 .  endif
 .endfor
 
-CARDDRIVERS=		${PKG_OPTIONS}
+CARDDRIVERS=		${PKG_OPTIONS:S/xorg-server-//g}