diff options
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 3 | ||||
| -rw-r--r-- | x11/xorg-server/Makefile | 9 | ||||
| -rw-r--r-- | x11/xorg-server/PLIST.Linux | 8 | ||||
| -rw-r--r-- | x11/xorg-server/PLIST.common | 136 | ||||
| -rw-r--r-- | x11/xorg-server/files/Imakefile.drivers | 3 | ||||
| -rw-r--r-- | x11/xorg-server/files/host.def | 4 | ||||
| -rw-r--r-- | x11/xorg-server/options.mk | 26 |
7 files changed, 109 insertions, 80 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index 4f83d99ff45..80bf25db014 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2004/12/27 17:26:19 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.15 2005/01/24 10:57:27 hira Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -203,6 +203,7 @@ post-extract: -e "s|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g" \ -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ -e "s|@EGDIR@|${EGDIR}|g" \ + -e "s|@CARDDRIVERS@|${CARDDRIVERS}|g" \ ${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def @${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util @${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile index dc055460ca7..4bd6dc8ffaa 100644 --- a/x11/xorg-server/Makefile +++ b/x11/xorg-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/01/07 16:57:36 reed Exp $ +# $NetBSD: Makefile,v 1.14 2005/01/24 10:57:27 hira Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-server-${XORG_VER} @@ -49,11 +49,8 @@ SUBST_MESSAGE.stubs= "Fixing stubs Makefile." USE_PERL5= build # Yeah, we need this :-) .endif -.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) -PLIST_SUBST+= NOT_X86_64="@comment " -.else -PLIST_SUBST+= NOT_X86_64="" -.endif +BUILDLINK_FILES.xorg-libs+= ${X11ROOT_PREFIX}/lib/X11/config/* +.include "options.mk" post-install: ${CHMOD} a+r ${X11ROOT}/bin/Xorg diff --git a/x11/xorg-server/PLIST.Linux b/x11/xorg-server/PLIST.Linux index 1ba1237ead7..e47abf357fb 100644 --- a/x11/xorg-server/PLIST.Linux +++ b/x11/xorg-server/PLIST.Linux @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.Linux,v 1.3 2004/10/08 03:35:25 xtraeme Exp $ +@comment $NetBSD: PLIST.Linux,v 1.4 2005/01/24 10:57:27 hira Exp $ ${X11ROOT_PREFIX}/etc/init.d/xprint ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/fonts ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config @@ -7,9 +7,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 -${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o +${DRIVER.fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o ${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a -${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o +${DRIVER.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 @@ -17,7 +17,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} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX} +${DRIVER.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/PLIST.common b/x11/xorg-server/PLIST.common index 31922626967..fbac83c6722 100644 --- a/x11/xorg-server/PLIST.common +++ b/x11/xorg-server/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.5 2004/11/15 11:15:55 hira Exp $ +@comment $NetBSD: PLIST.common,v 1.6 2005/01/24 10:57:27 hira Exp $ ${X11ROOT_PREFIX}/bin/X ${X11ROOT_PREFIX}/bin/XFree86 ${X11ROOT_PREFIX}/bin/Xnest @@ -946,43 +946,43 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8@zhuyin ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.big5 ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.euctw ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.utf8 -${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o -${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o -${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o -${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o -${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o -${NOT_X86_64}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o +${DRIVER.apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o +${DRIVER.ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o +${DRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o +${DRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o +${DRIVER.chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o +${DRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o +${DRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o +${DRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o +${DRIVER.cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o +${DRIVER.dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o +${DRIVER.glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o +${DRIVER.i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o +${DRIVER.i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o +${DRIVER.i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o +${DRIVER.imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o +${DRIVER.mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o +${DRIVER.neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o +${DRIVER.newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o +${DRIVER.nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o +${DRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o +${DRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o +${DRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o +${DRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o +${DRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o +${DRIVER.s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o +${DRIVER.s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o +${DRIVER.savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o +${DRIVER.siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o +${DRIVER.sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o +${DRIVER.tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o +${DRIVER.tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o +${DRIVER.trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o +${DRIVER.tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o +${DRIVER.vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o +${DRIVER.vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o +${DRIVER.via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o +${DRIVER.vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o ${X11ROOT_PREFIX}/lib/modules/extensions/libGLcore.a ${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.a ${X11ROOT_PREFIX}/lib/modules/extensions/libextmod.a @@ -1042,8 +1042,8 @@ ${X11ROOT_PREFIX}/lib/modules/libxf24_32bpp.a ${X11ROOT_PREFIX}/lib/modules/libxf4bpp.a ${X11ROOT_PREFIX}/lib/modules/libxf8_16bpp.a ${X11ROOT_PREFIX}/lib/modules/libxf8_32bpp.a -${X11ROOT_PREFIX}/lib/modules/v10002d.uc -${X11ROOT_PREFIX}/lib/modules/v20002d.uc +${DRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc +${DRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc ${X11ROOT_PREFIX}/${MAN_DIR}/Xnest.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/Xorg.${MAN_SUFFIX} ${X11ROOT_PREFIX}/${MAN_DIR}/Xserver.${MAN_SUFFIX} @@ -1076,49 +1076,49 @@ ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetViewPort.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchMode.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchToMode.${LIBMAN_SUFFIX} ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeValidateModeLine.${LIBMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX} +${DRIVER.apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX} +${DRIVER.chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX} +${DRIVER.cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX} +${DRIVER.cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/dmc.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/dynapro.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/elographics.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdevhw.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/fpit.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX} +${DRIVER.glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX} +${DRIVER.i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX} +${DRIVER.i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX} +${DRIVER.i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX} +${DRIVER.imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/js_x.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/kbd.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/keyboard.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX} +${DRIVER.mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/microtouch.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/mouse.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/mutouch.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX} +${DRIVER.neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX} +${DRIVER.newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX} +${DRIVER.nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX} +${DRIVER.nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/penmount.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX} +${DRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX} +${DRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX} +${DRIVER.rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX} +${DRIVER.s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX} +${DRIVER.savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX} +${DRIVER.siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX} +${DRIVER.sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX} +${DRIVER.tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/tek4957.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX} -${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX} -${NOT_X86_64}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX} +${DRIVER.trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX} +${DRIVER.tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX} +${DRIVER.vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX} +${DRIVER.vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX} +${DRIVER.via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX} +${DRIVER.vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/void.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${KERNMAN_DIR}/wacom.${KERNMAN_SUFFIX} ${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX} diff --git a/x11/xorg-server/files/Imakefile.drivers b/x11/xorg-server/files/Imakefile.drivers new file mode 100644 index 00000000000..fe84eaac8b3 --- /dev/null +++ b/x11/xorg-server/files/Imakefile.drivers @@ -0,0 +1,3 @@ +/* $NetBSD: Imakefile.drivers,v 1.1 2005/01/24 10:57:27 hira Exp $ */ + +CARDDRIVERS= XF86CardDrivers diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def index 40acdd623a2..18dd9e6279c 100644 --- a/x11/xorg-server/files/host.def +++ b/x11/xorg-server/files/host.def @@ -1,4 +1,4 @@ -/* $NetBSD: host.def,v 1.6 2004/12/23 12:39:10 reed Exp $ */ +/* $NetBSD: host.def,v 1.7 2005/01/24 10:57:27 hira Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO @@ -57,3 +57,5 @@ #define HasFontconfig YES #define FontconfigDir @BLNK@ + +#define XF86CardDrivers @CARDDRIVERS@ diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk new file mode 100644 index 00000000000..3b22bdc3175 --- /dev/null +++ b/x11/xorg-server/options.mk @@ -0,0 +1,26 @@ +# $NetBSD: options.mk,v 1.1 2005/01/24 10:57:27 hira Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.xorg-server +PKG_SUPPORTED_OPTIONS!= ${X11BASE}/bin/imake -I${X11BASE}/lib/X11/config \ + -f ${FILESDIR}/Imakefile.drivers -s - | \ + ${EGREP} "^CARDDRIVERS=" | \ + ${AWK} '{$$1=""; print $$0}' +PKG_DEFAULT_OPTIONS= ${PKG_SUPPORTED_OPTIONS} +.include "../../mk/bsd.options.mk" + +ALLCARDDRIVERS= apm ark ati chips cirrus cyrix dummy fbdev glint i128 \ + i740 i810 imstt mga neomagic newport nsc nv rendition \ + rendition s3 s3virge savage siliconmotion sis tdfx tga \ + trident tseng v4l vesa vga via vmware + +.for _drv in ${PKG_OPTIONS} +PLIST_SUBST+= CARDDRIVER.${_drv}= +.endfor + +.for _drv in ${ALLCARDDRIVERS} +. if empty(PLIST_SUBST:MCARDDRIVER\.${_drv}=) +PLIST_SUBST+= CARDDRIVER.${_drv}="@comment " +. endif +.endfor + +CARDDRIVERS= ${PKG_OPTIONS} |