XFree86 meta-package can be now installed with or without xpkgwedge,

installation prefix is ${X11PREFIX}/X11R6.

Bump PKGREVISION.

3 files changed, 302 insertions, 293 deletions

diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index b374e518004..ada8e0386e1 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/01/31 16:55:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/02 14:16:44 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		X430src-1.tgz X430src-2.tgz \
@@ -24,6 +25,14 @@ XINSTALL_MAN_DIRS=	programs/Xserver
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
+PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_MANNEWSUFFIX}
+.else
+PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
+.endif
+
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
 PLIST_SUBST+=		DRIMODULES=
 USE_PERL5=		yes # Still we need perl (at least for now)
diff --git a/x11/XFree86-server/PLIST b/x11/XFree86-server/PLIST
index 65f77236551..f2e0338ee95 100644
--- a/x11/XFree86-server/PLIST
+++ b/x11/XFree86-server/PLIST
@@ -1,290 +1,290 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/31 16:57:56 xtraeme Exp $
-bin/X
-bin/XFree86
-bin/Xnest
-bin/Xprt
-bin/Xvfb
-bin/gtf
-bin/inb
-bin/inl
-bin/inw
-bin/ioport
-${KBDMODE}bin/kbd_mode
-bin/mmapr
-bin/mmapw
-bin/outb
-bin/outl
-bin/outw
-bin/pcitweak
-bin/scanpci
-bin/xf86cfg
-bin/xf86config
-include/X11/bitmaps/card.xbm
-include/X11/bitmaps/down.xbm
-include/X11/bitmaps/keyboard.xbm
-include/X11/bitmaps/left.xbm
-include/X11/bitmaps/monitor.xbm
-include/X11/bitmaps/mouse.xbm
-include/X11/bitmaps/narrower.xbm
-include/X11/bitmaps/right.xbm
-include/X11/bitmaps/shorter.xbm
-include/X11/bitmaps/taller.xbm
-include/X11/bitmaps/up.xbm
-include/X11/bitmaps/wider.xbm
-include/X11/pixmaps/card.xpm
-include/X11/pixmaps/computer.xpm
-include/X11/pixmaps/keyboard.xpm
-include/X11/pixmaps/monitor.xpm
-include/X11/pixmaps/mouse.xpm
-lib/X11/Cards
-lib/X11/Options
-lib/X11/XF86Config.98
-lib/X11/XF86Config.eg
-lib/X11/app-defaults/XF86Cfg
-lib/X11/doc/BUILD
-lib/X11/doc/BugReport
-lib/X11/doc/DESIGN
-lib/X11/doc/Install
-lib/X11/doc/LICENSE
-lib/X11/doc/README
-lib/X11/doc/README.DECtga
-lib/X11/doc/README.DGA
-lib/X11/doc/README.DRI
-lib/X11/doc/README.DRIcomp
-lib/X11/doc/README.I128
-lib/X11/doc/README.SiS
-lib/X11/doc/README.XKB-Config
-lib/X11/doc/README.XKB-Enhancing
-lib/X11/doc/README.apm
-lib/X11/doc/README.ati
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
-lib/X11/doc/README.dps
-lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
-lib/X11/doc/README.mouse
-lib/X11/doc/README.newport
-lib/X11/doc/README.r128
-lib/X11/doc/README.rapidaccess
-lib/X11/doc/README.rendition
-lib/X11/doc/README.s3virge
-lib/X11/doc/RELNOTES
-lib/X11/doc/ServersOnly
-lib/X11/doc/Status
-lib/X11/doc/Versions
-lib/X11/doc/VideoBoard98
-lib/X11/etc/Xinstall.sh
-lib/X11/etc/xmodmap.std
-lib/X11/xserver/SecurityPolicy
-lib/modules/codeconv/libARABIC.a
-lib/modules/codeconv/libARMSCII8.a
-lib/modules/codeconv/libBIG5.a
-lib/modules/codeconv/libBIG5HKSCS.a
-lib/modules/codeconv/libDOSENCODING.a
-lib/modules/codeconv/libGB2312.a
-lib/modules/codeconv/libGBK.a
-lib/modules/codeconv/libGEORGIAN.a
-lib/modules/codeconv/libISO8859_1.a
-lib/modules/codeconv/libISO8859_10.a
-lib/modules/codeconv/libISO8859_11.a
-lib/modules/codeconv/libISO8859_14.a
-lib/modules/codeconv/libISO8859_15.a
-lib/modules/codeconv/libISO8859_2.a
-lib/modules/codeconv/libISO8859_3.a
-lib/modules/codeconv/libISO8859_4.a
-lib/modules/codeconv/libISO8859_5.a
-lib/modules/codeconv/libISO8859_6.a
-lib/modules/codeconv/libISO8859_7.a
-lib/modules/codeconv/libISO8859_8.a
-lib/modules/codeconv/libISO8859_9.a
-lib/modules/codeconv/libJISX0201.a
-lib/modules/codeconv/libJISX0208.a
-lib/modules/codeconv/libJISX0212.a
-lib/modules/codeconv/libKOI8.a
-lib/modules/codeconv/libKSC5601.a
-lib/modules/codeconv/libKSCJOHAB.a
-lib/modules/codeconv/libMULEENCODING.a
-lib/modules/codeconv/libTCVN.a
-lib/modules/codeconv/libVISCII.a
-${LIBDRI}lib/modules/extensions/libdri.a
-${DRIMODULES}lib/modules/dri/gamma_dri.so
-${DRIMODULES}lib/modules/dri/i810_dri.so
-${DRIMODULES}lib/modules/dri/i830_dri.so
-${DRIMODULES}lib/modules/dri/mga_dri.so
-${DRIMODULES}lib/modules/dri/r128_dri.so
-${DRIMODULES}lib/modules/dri/r200_dri.so
-${DRIMODULES}lib/modules/dri/radeon_dri.so
-${DRIMODULES}lib/modules/dri/tdfx_dri.so
-lib/modules/drivers/apm_drv.o
-lib/modules/drivers/ark_drv.o
-lib/modules/drivers/ati_drv.o
-lib/modules/drivers/atimisc_drv.o
-lib/modules/drivers/chips_drv.o
-lib/modules/drivers/cirrus_alpine.o
-lib/modules/drivers/cirrus_drv.o
-lib/modules/drivers/cirrus_laguna.o
-lib/modules/drivers/cyrix_drv.o
-lib/modules/drivers/glint_drv.o
-lib/modules/drivers/i128_drv.o
-lib/modules/drivers/i740_drv.o
-lib/modules/drivers/i810_drv.o
-lib/modules/drivers/mga_drv.o
-lib/modules/drivers/neomagic_drv.o
-lib/modules/drivers/nsc_drv.o
-lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
-lib/modules/drivers/radeon_drv.o
-lib/modules/drivers/rendition_drv.o
-lib/modules/drivers/s3_drv.o
-lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/savage_drv.o
-lib/modules/drivers/siliconmotion_drv.o
-lib/modules/drivers/sis_drv.o
-lib/modules/drivers/tdfx_drv.o
-lib/modules/drivers/tga_drv.o
-lib/modules/drivers/trident_drv.o
-lib/modules/drivers/tseng_drv.o
-lib/modules/drivers/vesa_drv.o
-lib/modules/drivers/vga_drv.o
-lib/modules/drivers/vmware_drv.o
-lib/modules/extensions/libGLcore.a
-lib/modules/extensions/libdbe.a
-lib/modules/extensions/libextmod.a
-lib/modules/extensions/libglx.a
-lib/modules/extensions/librecord.a
-lib/modules/extensions/libxtrap.a
-lib/modules/fonts/libbitmap.a
-lib/modules/fonts/libfreetype.a
-lib/modules/fonts/libspeedo.a
-lib/modules/fonts/libtype1.a
-lib/modules/fonts/libxtt.a
-lib/modules/input/calcomp_drv.o
-lib/modules/input/citron_drv.o
-lib/modules/input/digitaledge_drv.o
-lib/modules/input/dmc_drv.o
-lib/modules/input/dynapro_drv.o
-lib/modules/input/elographics_drv.o
-lib/modules/input/fpit_drv.o
-lib/modules/input/hyperpen_drv.o
-lib/modules/input/js_x_drv.o
-lib/modules/input/kbd_drv.o
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
-lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/palmax_drv.o
-lib/modules/input/penmount_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/summa_drv.o
-lib/modules/input/tek4957_drv.o
-lib/modules/input/void_drv.o
-lib/modules/input/wacom_drv.o
-lib/modules/libafb.a
-lib/modules/libcfb.a
-lib/modules/libcfb16.a
-lib/modules/libcfb24.a
-lib/modules/libcfb32.a
-lib/modules/libddc.a
-lib/modules/libfb.a
-lib/modules/libi2c.a
-lib/modules/libint10.a
-lib/modules/liblayer.a
-lib/modules/libmfb.a
-lib/modules/libpcidata.a
-lib/modules/librac.a
-lib/modules/libramdac.a
-lib/modules/libscanpci.a
-lib/modules/libshadow.a
-lib/modules/libshadowfb.a
-lib/modules/libvbe.a
-lib/modules/libvgahw.a
-lib/modules/libxaa.a
-lib/modules/libxf1bpp.a
-lib/modules/libxf24_32bpp.a
-lib/modules/libxf4bpp.a
-lib/modules/libxf8_16bpp.a
-lib/modules/libxf8_32bpp.a
-lib/modules/v10002d.uc
-lib/modules/v20002d.uc
-${IMAKE_MAN_DIR}/XFree86.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/Xnest.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/Xserver.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/Xvfb.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/gtf.${IMAKE_MANNEWSUFFIX}
-${KBDMODE}${IMAKE_MAN_DIR}/kbd_mode.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/pcitweak.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/scanpci.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xf86cfg.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xf86config.${IMAKE_MANNEWSUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeDeleteModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetAllModeLines.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetDotClocks.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetGamma.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRamp.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetMonitor.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetPermissions.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeGetViewPort.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeLockModeSwitch.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeModModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeQueryExtension.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeQueryVersion.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetClientVersion.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetGamma.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetGammaRamp.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSetViewPort.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchToMode.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_LIBMAN_DIR}/XF86VidModeValidateModeLine.${IMAKE_LIBMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/apm.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/cirrus.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/citron.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/cyrix.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/chips.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/dmc.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/dynapro.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/elographics.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/fbdevhw.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/fpit.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/glint.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/i128.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/i740.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/i810.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/js_x.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/kbd.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/keyboard.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/mga.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/microtouch.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/mouse.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/mutouch.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/neomagic.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/nsc.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/nv.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/palmax.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/penmount.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/r128.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/radeon.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/rendition.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/s3virge.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/savage.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/siliconmotion.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/sis.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/tdfx.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/tek4957.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/trident.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/tseng.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/vesa.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/vga.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/vmware.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/void.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_KERNMAN_DIR}/wacom.${IMAKE_KERNMAN_SUFFIX}
-${IMAKE_FILEMAN_DIR}/XF86Config.${IMAKE_FILEMAN_SUFFIX}
-@dirrm lib/modules/input
-@dirrm lib/modules/fonts
-@dirrm lib/modules/extensions
-@dirrm lib/modules/drivers
-@dirrm lib/X11/xserver
-@dirrm include/X11/pixmaps
+@comment $NetBSD: PLIST,v 1.3 2004/02/02 14:16:44 xtraeme Exp $
+X11R6/bin/X
+X11R6/bin/XFree86
+X11R6/bin/Xnest
+X11R6/bin/Xprt
+X11R6/bin/Xvfb
+X11R6/bin/gtf
+X11R6/bin/inb
+X11R6/bin/inl
+X11R6/bin/inw
+X11R6/bin/ioport
+${KBDMODE}X11R6/bin/kbd_mode
+X11R6/bin/mmapr
+X11R6/bin/mmapw
+X11R6/bin/outb
+X11R6/bin/outl
+X11R6/bin/outw
+X11R6/bin/pcitweak
+X11R6/bin/scanpci
+X11R6/bin/xf86cfg
+X11R6/bin/xf86config
+X11R6/include/X11/bitmaps/card.xbm
+X11R6/include/X11/bitmaps/down.xbm
+X11R6/include/X11/bitmaps/keyboard.xbm
+X11R6/include/X11/bitmaps/left.xbm
+X11R6/include/X11/bitmaps/monitor.xbm
+X11R6/include/X11/bitmaps/mouse.xbm
+X11R6/include/X11/bitmaps/narrower.xbm
+X11R6/include/X11/bitmaps/right.xbm
+X11R6/include/X11/bitmaps/shorter.xbm
+X11R6/include/X11/bitmaps/taller.xbm
+X11R6/include/X11/bitmaps/up.xbm
+X11R6/include/X11/bitmaps/wider.xbm
+X11R6/include/X11/pixmaps/card.xpm
+X11R6/include/X11/pixmaps/computer.xpm
+X11R6/include/X11/pixmaps/keyboard.xpm
+X11R6/include/X11/pixmaps/monitor.xpm
+X11R6/include/X11/pixmaps/mouse.xpm
+X11R6/lib/X11/Cards
+X11R6/lib/X11/Options
+X11R6/lib/X11/XF86Config.98
+X11R6/lib/X11/XF86Config.eg
+X11R6/lib/X11/app-defaults/XF86Cfg
+X11R6/lib/X11/doc/BUILD
+X11R6/lib/X11/doc/BugReport
+X11R6/lib/X11/doc/DESIGN
+X11R6/lib/X11/doc/Install
+X11R6/lib/X11/doc/LICENSE
+X11R6/lib/X11/doc/README
+X11R6/lib/X11/doc/README.DECtga
+X11R6/lib/X11/doc/README.DGA
+X11R6/lib/X11/doc/README.DRI
+X11R6/lib/X11/doc/README.DRIcomp
+X11R6/lib/X11/doc/README.I128
+X11R6/lib/X11/doc/README.SiS
+X11R6/lib/X11/doc/README.XKB-Config
+X11R6/lib/X11/doc/README.XKB-Enhancing
+X11R6/lib/X11/doc/README.apm
+X11R6/lib/X11/doc/README.ati
+X11R6/lib/X11/doc/README.chips
+X11R6/lib/X11/doc/README.cyrix
+X11R6/lib/X11/doc/README.dps
+X11R6/lib/X11/doc/README.fonts
+X11R6/lib/X11/doc/README.i740
+X11R6/lib/X11/doc/README.i810
+X11R6/lib/X11/doc/README.mouse
+X11R6/lib/X11/doc/README.newport
+X11R6/lib/X11/doc/README.r128
+X11R6/lib/X11/doc/README.rapidaccess
+X11R6/lib/X11/doc/README.rendition
+X11R6/lib/X11/doc/README.s3virge
+X11R6/lib/X11/doc/RELNOTES
+X11R6/lib/X11/doc/ServersOnly
+X11R6/lib/X11/doc/Status
+X11R6/lib/X11/doc/Versions
+X11R6/lib/X11/doc/VideoBoard98
+X11R6/lib/X11/etc/Xinstall.sh
+X11R6/lib/X11/etc/xmodmap.std
+X11R6/lib/X11/xserver/SecurityPolicy
+X11R6/lib/modules/codeconv/libARABIC.a
+X11R6/lib/modules/codeconv/libARMSCII8.a
+X11R6/lib/modules/codeconv/libBIG5.a
+X11R6/lib/modules/codeconv/libBIG5HKSCS.a
+X11R6/lib/modules/codeconv/libDOSENCODING.a
+X11R6/lib/modules/codeconv/libGB2312.a
+X11R6/lib/modules/codeconv/libGBK.a
+X11R6/lib/modules/codeconv/libGEORGIAN.a
+X11R6/lib/modules/codeconv/libISO8859_1.a
+X11R6/lib/modules/codeconv/libISO8859_10.a
+X11R6/lib/modules/codeconv/libISO8859_11.a
+X11R6/lib/modules/codeconv/libISO8859_14.a
+X11R6/lib/modules/codeconv/libISO8859_15.a
+X11R6/lib/modules/codeconv/libISO8859_2.a
+X11R6/lib/modules/codeconv/libISO8859_3.a
+X11R6/lib/modules/codeconv/libISO8859_4.a
+X11R6/lib/modules/codeconv/libISO8859_5.a
+X11R6/lib/modules/codeconv/libISO8859_6.a
+X11R6/lib/modules/codeconv/libISO8859_7.a
+X11R6/lib/modules/codeconv/libISO8859_8.a
+X11R6/lib/modules/codeconv/libISO8859_9.a
+X11R6/lib/modules/codeconv/libJISX0201.a
+X11R6/lib/modules/codeconv/libJISX0208.a
+X11R6/lib/modules/codeconv/libJISX0212.a
+X11R6/lib/modules/codeconv/libKOI8.a
+X11R6/lib/modules/codeconv/libKSC5601.a
+X11R6/lib/modules/codeconv/libKSCJOHAB.a
+X11R6/lib/modules/codeconv/libMULEENCODING.a
+X11R6/lib/modules/codeconv/libTCVN.a
+X11R6/lib/modules/codeconv/libVISCII.a
+${LIBDRI}X11R6/lib/modules/extensions/libdri.a
+${DRIMODULES}X11R6/lib/modules/dri/gamma_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/i810_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/i830_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/mga_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/r128_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/r200_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/radeon_dri.so
+${DRIMODULES}X11R6/lib/modules/dri/tdfx_dri.so
+X11R6/lib/modules/drivers/apm_drv.o
+X11R6/lib/modules/drivers/ark_drv.o
+X11R6/lib/modules/drivers/ati_drv.o
+X11R6/lib/modules/drivers/atimisc_drv.o
+X11R6/lib/modules/drivers/chips_drv.o
+X11R6/lib/modules/drivers/cirrus_alpine.o
+X11R6/lib/modules/drivers/cirrus_drv.o
+X11R6/lib/modules/drivers/cirrus_laguna.o
+X11R6/lib/modules/drivers/cyrix_drv.o
+X11R6/lib/modules/drivers/glint_drv.o
+X11R6/lib/modules/drivers/i128_drv.o
+X11R6/lib/modules/drivers/i740_drv.o
+X11R6/lib/modules/drivers/i810_drv.o
+X11R6/lib/modules/drivers/mga_drv.o
+X11R6/lib/modules/drivers/neomagic_drv.o
+X11R6/lib/modules/drivers/nsc_drv.o
+X11R6/lib/modules/drivers/nv_drv.o
+X11R6/lib/modules/drivers/r128_drv.o
+X11R6/lib/modules/drivers/radeon_drv.o
+X11R6/lib/modules/drivers/rendition_drv.o
+X11R6/lib/modules/drivers/s3_drv.o
+X11R6/lib/modules/drivers/s3virge_drv.o
+X11R6/lib/modules/drivers/savage_drv.o
+X11R6/lib/modules/drivers/siliconmotion_drv.o
+X11R6/lib/modules/drivers/sis_drv.o
+X11R6/lib/modules/drivers/tdfx_drv.o
+X11R6/lib/modules/drivers/tga_drv.o
+X11R6/lib/modules/drivers/trident_drv.o
+X11R6/lib/modules/drivers/tseng_drv.o
+X11R6/lib/modules/drivers/vesa_drv.o
+X11R6/lib/modules/drivers/vga_drv.o
+X11R6/lib/modules/drivers/vmware_drv.o
+X11R6/lib/modules/extensions/libGLcore.a
+X11R6/lib/modules/extensions/libdbe.a
+X11R6/lib/modules/extensions/libextmod.a
+X11R6/lib/modules/extensions/libglx.a
+X11R6/lib/modules/extensions/librecord.a
+X11R6/lib/modules/extensions/libxtrap.a
+X11R6/lib/modules/fonts/libbitmap.a
+X11R6/lib/modules/fonts/libfreetype.a
+X11R6/lib/modules/fonts/libspeedo.a
+X11R6/lib/modules/fonts/libtype1.a
+X11R6/lib/modules/fonts/libxtt.a
+X11R6/lib/modules/input/calcomp_drv.o
+X11R6/lib/modules/input/citron_drv.o
+X11R6/lib/modules/input/digitaledge_drv.o
+X11R6/lib/modules/input/dmc_drv.o
+X11R6/lib/modules/input/dynapro_drv.o
+X11R6/lib/modules/input/elographics_drv.o
+X11R6/lib/modules/input/fpit_drv.o
+X11R6/lib/modules/input/hyperpen_drv.o
+X11R6/lib/modules/input/js_x_drv.o
+X11R6/lib/modules/input/kbd_drv.o
+X11R6/lib/modules/input/magellan_drv.o
+X11R6/lib/modules/input/microtouch_drv.o
+X11R6/lib/modules/input/mouse_drv.o
+X11R6/lib/modules/input/mutouch_drv.o
+X11R6/lib/modules/input/palmax_drv.o
+X11R6/lib/modules/input/penmount_drv.o
+X11R6/lib/modules/input/spaceorb_drv.o
+X11R6/lib/modules/input/summa_drv.o
+X11R6/lib/modules/input/tek4957_drv.o
+X11R6/lib/modules/input/void_drv.o
+X11R6/lib/modules/input/wacom_drv.o
+X11R6/lib/modules/libafb.a
+X11R6/lib/modules/libcfb.a
+X11R6/lib/modules/libcfb16.a
+X11R6/lib/modules/libcfb24.a
+X11R6/lib/modules/libcfb32.a
+X11R6/lib/modules/libddc.a
+X11R6/lib/modules/libfb.a
+X11R6/lib/modules/libi2c.a
+X11R6/lib/modules/libint10.a
+X11R6/lib/modules/liblayer.a
+X11R6/lib/modules/libmfb.a
+X11R6/lib/modules/libpcidata.a
+X11R6/lib/modules/librac.a
+X11R6/lib/modules/libramdac.a
+X11R6/lib/modules/libscanpci.a
+X11R6/lib/modules/libshadow.a
+X11R6/lib/modules/libshadowfb.a
+X11R6/lib/modules/libvbe.a
+X11R6/lib/modules/libvgahw.a
+X11R6/lib/modules/libxaa.a
+X11R6/lib/modules/libxf1bpp.a
+X11R6/lib/modules/libxf24_32bpp.a
+X11R6/lib/modules/libxf4bpp.a
+X11R6/lib/modules/libxf8_16bpp.a
+X11R6/lib/modules/libxf8_32bpp.a
+X11R6/lib/modules/v10002d.uc
+X11R6/lib/modules/v20002d.uc
+X11R6/${IMAKE_MAN_DIR}/XFree86.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xnest.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xserver.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xvfb.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/gtf.${IMAKE_MANNEWSUFFIX}
+${KBDMODE}X11R6/${IMAKE_MAN_DIR}/kbd_mode.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/pcitweak.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/scanpci.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xf86cfg.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xf86config.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidMode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeDeleteModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetAllModeLines.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetDotClocks.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGamma.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRamp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetMonitor.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetPermissions.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetViewPort.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeLockModeSwitch.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeModModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeQueryExtension.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeQueryVersion.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetClientVersion.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetGamma.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetGammaRamp.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetViewPort.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchMode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchToMode.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeValidateModeLine.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/apm.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/cirrus.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/citron.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/cyrix.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/chips.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/dmc.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/dynapro.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/elographics.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/fbdevhw.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/fpit.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/glint.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/i128.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/i740.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/i810.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/js_x.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/kbd.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/keyboard.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/mga.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/microtouch.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/mouse.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/mutouch.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/neomagic.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/nsc.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/nv.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/palmax.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/penmount.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/r128.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/radeon.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/rendition.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/s3virge.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/savage.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/siliconmotion.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/sis.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/tdfx.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/tek4957.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/trident.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/tseng.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/vesa.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/vga.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/vmware.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/void.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_KERNMAN_DIR}/wacom.${IMAKE_KERNMAN_SUFFIX}
+X11R6/${IMAKE_FILEMAN_DIR}/XF86Config.${MANPAGE_LIB_SUFFIX}
+@dirrm X11R6/lib/modules/input
+@dirrm X11R6/lib/modules/fonts
+@dirrm X11R6/lib/modules/extensions
+@dirrm X11R6/lib/modules/drivers
+@dirrm X11R6/lib/X11/xserver
+@dirrm X11R6/include/X11/pixmaps
diff --git a/x11/XFree86-server/files/host.def b/x11/XFree86-server/files/host.def
index ecee67f5e8f..8e186d7e25c 100644
--- a/x11/XFree86-server/files/host.def
+++ b/x11/XFree86-server/files/host.def
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:49:00 xtraeme Exp $
+ * $NetBSD: host.def,v 1.2 2004/02/02 14:16:44 xtraeme Exp $
  *
  * XFree86 packages for pkgsrc system
  */
@@ -28,7 +28,7 @@
 #define BuildGLXLibrary YES
 #define BuildXFree86ConfigTools YES
 #define UseInstalledPrograms YES
-#define StandardIncludes -I@BLNK@/include
+#define StandardIncludes -I@BLNK@/include -I@PREFIX@/include
 
 #ifdef LinuxArchitecture
 #define InstallAppDefFiles YES